matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Revert "isisd: Make work under new regime"

Browse source 
This reverts commit 38c2499873.
This commit is contained in:
Daniel Walton 2016-09-22 18:21:30 +00:00
parent afec25d911
commit 66c1ec097e
5 changed files with 99 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
isisd/isis_redist.c
View file

@ -563,7 +563,7 @@ DEFUN (isis_redistribute,
if (argc < 5)
return CMD_WARNING;
family = str2family(argv[0]->arg);
family = str2family(argv[0]);
if (family < 0)
return CMD_WARNING;
@ -571,13 +571,13 @@ DEFUN (isis_redistribute,
if (!afi)
return CMD_WARNING;
type = proto_redistnum(afi, argv[1]->arg);
type = proto_redistnum(afi, argv[1]);
if (type < 0 || type == ZEBRA_ROUTE_ISIS)
return CMD_WARNING;
if (!strcmp("level-1", argv[2]->arg))
if (!strcmp("level-1", argv[2]))
level = 1;
else if (!strcmp("level-2", argv[2]->arg))
else if (!strcmp("level-2", argv[2]))
level = 2;
else
return CMD_WARNING;
@ -588,11 +588,11 @@ DEFUN (isis_redistribute,
return CMD_WARNING;
}
if (argv[3]->arg)
if (argv[3])
{
char *endp;
metric = strtoul(argv[3]->arg, &endp, 10);
if (argv[3]->arg[0] == '\0' || *endp != '\0')
metric = strtoul(argv[3], &endp, 10);
if (argv[3][0] == '\0' || *endp != '\0')
return CMD_WARNING;
}
else
@ -600,7 +600,7 @@ DEFUN (isis_redistribute,
metric = 0xffffffff;
}
routemap = argv[4]->arg;
routemap = argv[4];
isis_redist_set(area, level, family, type, metric, routemap, 0);
return 0;
@ -627,7 +627,7 @@ DEFUN (no_isis_redistribute,
if (argc < 3)
return CMD_WARNING;
family = str2family(argv[0]->arg);
family = str2family(argv[0]);
if (family < 0)
return CMD_WARNING;
@ -635,13 +635,13 @@ DEFUN (no_isis_redistribute,
if (!afi)
return CMD_WARNING;
type = proto_redistnum(afi, argv[1]->arg);
type = proto_redistnum(afi, argv[1]);
if (type < 0 || type == ZEBRA_ROUTE_ISIS)
return CMD_WARNING;
if (!strcmp("level-1", argv[2]->arg))
if (!strcmp("level-1", argv[2]))
level = 1;
else if (!strcmp("level-2", argv[2]->arg))
else if (!strcmp("level-2", argv[2]))
level = 2;
else
return CMD_WARNING;
@ -676,13 +676,13 @@ DEFUN (isis_default_originate,
if (argc < 5)
return CMD_WARNING;
family = str2family(argv[0]->arg);
family = str2family(argv[0]);
if (family < 0)
return CMD_WARNING;
if (!strcmp("level-1", argv[1]->arg))
if (!strcmp("level-1", argv[1]))
level = 1;
else if (!strcmp("level-2", argv[1]->arg))
else if (!strcmp("level-2", argv[1]))
level = 2;
else
return CMD_WARNING;
@ -693,7 +693,7 @@ DEFUN (isis_default_originate,
return CMD_WARNING;
}
if (argv[2]->arg && *argv[2]->arg != '\0')
if (argv[2] && *argv[2] != '\0')
originate_type = DEFAULT_ORIGINATE_ALWAYS;
else
originate_type = DEFAULT_ORIGINATE;
@ -704,11 +704,11 @@ DEFUN (isis_default_originate,
vty_out(vty, "so use with care or use default-originate always.%s", VTY_NEWLINE);
}
if (argv[3]->arg)
if (argv[3])
{
char *endp;
metric = strtoul(argv[3]->arg, &endp, 10);
if (argv[3]->arg[0] == '\0' || *endp != '\0')
metric = strtoul(argv[3], &endp, 10);
if (argv[3][0] == '\0' || *endp != '\0')
return CMD_WARNING;
}
else
@ -716,7 +716,7 @@ DEFUN (isis_default_originate,
metric = 0xffffffff;
}
routemap = argv[4]->arg;
routemap = argv[4];
isis_redist_set(area, level, family, DEFAULT_ROUTE, metric, routemap, originate_type);
return 0;
@ -741,13 +741,13 @@ DEFUN (no_isis_default_originate,
if (argc < 2)
return CMD_WARNING;
family = str2family(argv[0]->arg);
family = str2family(argv[0]);
if (family < 0)
return CMD_WARNING;
if (!strcmp("level-1", argv[1]->arg))
if (!strcmp("level-1", argv[1]))
level = 1;
else if (!strcmp("level-2", argv[1]->arg))
else if (!strcmp("level-2", argv[1]))
level = 2;
else
return CMD_WARNING;

20
isisd/isis_routemap.c
View file

@ -354,7 +354,7 @@ DEFUN (match_ip_address,
"IP access-list number (expanded range)\n"
"IP Access-list name\n")
{
return isis_route_match_add(vty, vty->index, "ip address", argv[0]->arg);
return isis_route_match_add(vty, vty->index, "ip address", argv[0]);
}
DEFUN (no_match_ip_address,
@ -370,7 +370,7 @@ DEFUN (no_match_ip_address,
{
if (argc == 0)
return isis_route_match_delete(vty, vty->index, "ip address", NULL);
return isis_route_match_delete(vty, vty->index, "ip address", argv[0]->arg);
return isis_route_match_delete(vty, vty->index, "ip address", argv[0]);
}
ALIAS (no_match_ip_address,
@ -392,7 +392,7 @@ DEFUN (match_ip_address_prefix_list,
"Match entries of prefix-lists\n"
"IP prefix-list name\n")
{
return isis_route_match_add(vty, vty->index, "ip address prefix-list", argv[0]->arg);
return isis_route_match_add(vty, vty->index, "ip address prefix-list", argv[0]);
}
DEFUN (no_match_ip_address_prefix_list,
@ -406,7 +406,7 @@ DEFUN (no_match_ip_address_prefix_list,
{
if (argc == 0)
return isis_route_match_delete (vty, vty->index, "ip address prefix-list", NULL);
return isis_route_match_delete (vty, vty->index, "ip address prefix-list", argv[0]->arg);
return isis_route_match_delete (vty, vty->index, "ip address prefix-list", argv[0]);
}
ALIAS (no_match_ip_address_prefix_list,
@ -429,7 +429,7 @@ DEFUN (match_ipv6_address,
"Match IPv6 address of route\n"
"IPv6 access-list name\n")
{
return isis_route_match_add(vty, vty->index, "ipv6 address", argv[0]->arg);
return isis_route_match_add(vty, vty->index, "ipv6 address", argv[0]);
}
DEFUN (no_match_ipv6_address,
@ -443,7 +443,7 @@ DEFUN (no_match_ipv6_address,
{
if (argc == 0)
return isis_route_match_delete(vty, vty->index, "ipv6 address", NULL);
return isis_route_match_delete(vty, vty->index, "ipv6 address", argv[0]->arg);
return isis_route_match_delete(vty, vty->index, "ipv6 address", argv[0]);
}
ALIAS (no_match_ipv6_address,
@ -465,7 +465,7 @@ DEFUN (match_ipv6_address_prefix_list,
"Match entries of prefix-lists\n"
"IP prefix-list name\n")
{
return isis_route_match_add(vty, vty->index, "ipv6 address prefix-list", argv[0]->arg);
return isis_route_match_add(vty, vty->index, "ipv6 address prefix-list", argv[0]);
}
DEFUN (no_match_ipv6_address_prefix_list,
@ -479,7 +479,7 @@ DEFUN (no_match_ipv6_address_prefix_list,
{
if (argc == 0)
return isis_route_match_delete (vty, vty->index, "ipv6 address prefix-list", NULL);
return isis_route_match_delete (vty, vty->index, "ipv6 address prefix-list", argv[0]->arg);
return isis_route_match_delete (vty, vty->index, "ipv6 address prefix-list", argv[0]);
}
ALIAS (no_match_ipv6_address_prefix_list,
@ -504,7 +504,7 @@ DEFUN (set_metric,
"Metric vale for destination routing protocol\n"
"Metric value\n")
{
return isis_route_set_add(vty, vty->index, "metric", argv[0]->arg);
return isis_route_set_add(vty, vty->index, "metric", argv[0]);
}
DEFUN (no_set_metric,
@ -517,7 +517,7 @@ DEFUN (no_set_metric,
{
if (argc == 0)
return isis_route_set_delete(vty, vty->index, "metric", NULL);
return isis_route_set_delete(vty, vty->index, "metric", argv[0]->arg);
return isis_route_set_delete(vty, vty->index, "metric", argv[0]);
}
ALIAS (no_set_metric,

4
isisd/isis_te.c
View file

@ -1167,7 +1167,7 @@ DEFUN (isis_mpls_te_router_addr,
struct listnode *node;
struct isis_area *area;
if (! inet_aton (argv[0]->arg, &value))
if (! inet_aton (argv[0], &value))
{
vty_out (vty, "Please specify Router-Addr by A.B.C.D%s", VTY_NEWLINE);
return CMD_WARNING;
@ -1329,7 +1329,7 @@ DEFUN (show_isis_mpls_te_interface,
/* Interface name is specified. */
else
{
if ((ifp = if_lookup_by_name (argv[0]->arg)) == NULL)
if ((ifp = if_lookup_by_name (argv[0])) == NULL)
vty_out (vty, "No such interface name%s", VTY_NEWLINE);
else
show_mpls_te_sub (vty, ifp);

102
isisd/isis_vty.c
View file

@ -64,8 +64,8 @@ DEFUN (ip_router_isis,
struct interface *ifp;
struct isis_circuit *circuit;
struct isis_area *area;
const char *af = argv[0]->arg;
const char *area_tag = argv[1]->arg;
const char *af = argv[0];
const char *area_tag = argv[1];
ifp = (struct interface *) vty->index;
assert (ifp);
@ -118,8 +118,8 @@ DEFUN (no_ip_router_isis,
struct interface *ifp;
struct isis_area *area;
struct isis_circuit *circuit;
const char *af = argv[0]->arg;
const char *area_tag = argv[1]->arg;
const char *af = argv[0];
const char *area_tag = argv[1];
ifp = (struct interface *) vty->index;
if (!ifp)
@ -132,7 +132,7 @@ DEFUN (no_ip_router_isis,
if (!area)
{
vty_out (vty, "Can't find ISIS instance %s%s",
argv[0]->arg, VTY_NEWLINE);
argv[0], VTY_NEWLINE);
return CMD_ERR_NO_MATCH;
}
@ -204,7 +204,7 @@ DEFUN (isis_circuit_type,
if (!circuit)
return CMD_ERR_NO_MATCH;
is_type = string2circuit_t (argv[0]->arg);
is_type = string2circuit_t (argv[0]);
if (!is_type)
{
vty_out (vty, "Unknown circuit-type %s", VTY_NEWLINE);
@ -310,10 +310,10 @@ DEFUN (isis_passwd,
if (!circuit)
return CMD_ERR_NO_MATCH;
if (argv[0]->arg[0] == 'm')
rv = isis_circuit_passwd_hmac_md5_set(circuit, argv[1]->arg);
if (argv[0][0] == 'm')
rv = isis_circuit_passwd_hmac_md5_set(circuit, argv[1]);
else
rv = isis_circuit_passwd_cleartext_set(circuit, argv[1]->arg);
rv = isis_circuit_passwd_cleartext_set(circuit, argv[1]);
if (rv)
{
vty_out (vty, "Too long circuit password (>254)%s", VTY_NEWLINE);
@ -361,7 +361,7 @@ DEFUN (isis_priority,
if (!circuit)
return CMD_ERR_NO_MATCH;
prio = atoi (argv[0]->arg);
prio = atoi (argv[0]);
if (prio < MIN_PRIORITY || prio > MAX_PRIORITY)
{
vty_out (vty, "Invalid priority %d - should be <0-127>%s",
@ -413,7 +413,7 @@ DEFUN (isis_priority_l1,
if (!circuit)
return CMD_ERR_NO_MATCH;
prio = atoi (argv[0]->arg);
prio = atoi (argv[0]);
if (prio < MIN_PRIORITY || prio > MAX_PRIORITY)
{
vty_out (vty, "Invalid priority %d - should be <0-127>%s",
@ -465,7 +465,7 @@ DEFUN (isis_priority_l2,
if (!circuit)
return CMD_ERR_NO_MATCH;
prio = atoi (argv[0]->arg);
prio = atoi (argv[0]);
if (prio < MIN_PRIORITY || prio > MAX_PRIORITY)
{
vty_out (vty, "Invalid priority %d - should be <0-127>%s",
@ -517,7 +517,7 @@ DEFUN (isis_metric,
if (!circuit)
return CMD_ERR_NO_MATCH;
met = atoi (argv[0]->arg);
met = atoi (argv[0]);
/* RFC3787 section 5.1 */
if (circuit->area && circuit->area->oldmetric == 1 &&
@ -581,7 +581,7 @@ DEFUN (isis_metric_l1,
if (!circuit)
return CMD_ERR_NO_MATCH;
met = atoi (argv[0]->arg);
met = atoi (argv[0]);
/* RFC3787 section 5.1 */
if (circuit->area && circuit->area->oldmetric == 1 &&
@ -645,7 +645,7 @@ DEFUN (isis_metric_l2,
if (!circuit)
return CMD_ERR_NO_MATCH;
met = atoi (argv[0]->arg);
met = atoi (argv[0]);
/* RFC3787 section 5.1 */
if (circuit->area && circuit->area->oldmetric == 1 &&
@ -710,7 +710,7 @@ DEFUN (isis_hello_interval,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
if (interval < MIN_HELLO_INTERVAL || interval > MAX_HELLO_INTERVAL)
{
vty_out (vty, "Invalid hello-interval %d - should be <1-600>%s",
@ -764,7 +764,7 @@ DEFUN (isis_hello_interval_l1,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
if (interval < MIN_HELLO_INTERVAL || interval > MAX_HELLO_INTERVAL)
{
vty_out (vty, "Invalid hello-interval %ld - should be <1-600>%s",
@ -818,7 +818,7 @@ DEFUN (isis_hello_interval_l2,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
if (interval < MIN_HELLO_INTERVAL || interval > MAX_HELLO_INTERVAL)
{
vty_out (vty, "Invalid hello-interval %ld - should be <1-600>%s",
@ -870,7 +870,7 @@ DEFUN (isis_hello_multiplier,
if (!circuit)
return CMD_ERR_NO_MATCH;
mult = atoi (argv[0]->arg);
mult = atoi (argv[0]);
if (mult < MIN_HELLO_MULTIPLIER || mult > MAX_HELLO_MULTIPLIER)
{
vty_out (vty, "Invalid hello-multiplier %d - should be <2-100>%s",
@ -922,7 +922,7 @@ DEFUN (isis_hello_multiplier_l1,
if (!circuit)
return CMD_ERR_NO_MATCH;
mult = atoi (argv[0]->arg);
mult = atoi (argv[0]);
if (mult < MIN_HELLO_MULTIPLIER || mult > MAX_HELLO_MULTIPLIER)
{
vty_out (vty, "Invalid hello-multiplier %d - should be <2-100>%s",
@ -974,7 +974,7 @@ DEFUN (isis_hello_multiplier_l2,
if (!circuit)
return CMD_ERR_NO_MATCH;
mult = atoi (argv[0]->arg);
mult = atoi (argv[0]);
if (mult < MIN_HELLO_MULTIPLIER || mult > MAX_HELLO_MULTIPLIER)
{
vty_out (vty, "Invalid hello-multiplier %d - should be <2-100>%s",
@ -1060,7 +1060,7 @@ DEFUN (csnp_interval,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atol (argv[0]->arg);
interval = atol (argv[0]);
if (interval < MIN_CSNP_INTERVAL || interval > MAX_CSNP_INTERVAL)
{
vty_out (vty, "Invalid csnp-interval %lu - should be <1-600>%s",
@ -1112,7 +1112,7 @@ DEFUN (csnp_interval_l1,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atol (argv[0]->arg);
interval = atol (argv[0]);
if (interval < MIN_CSNP_INTERVAL || interval > MAX_CSNP_INTERVAL)
{
vty_out (vty, "Invalid csnp-interval %lu - should be <1-600>%s",
@ -1164,7 +1164,7 @@ DEFUN (csnp_interval_l2,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atol (argv[0]->arg);
interval = atol (argv[0]);
if (interval < MIN_CSNP_INTERVAL || interval > MAX_CSNP_INTERVAL)
{
vty_out (vty, "Invalid csnp-interval %lu - should be <1-600>%s",
@ -1215,7 +1215,7 @@ DEFUN (psnp_interval,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atol (argv[0]->arg);
interval = atol (argv[0]);
if (interval < MIN_PSNP_INTERVAL || interval > MAX_PSNP_INTERVAL)
{
vty_out (vty, "Invalid psnp-interval %lu - should be <1-120>%s",
@ -1267,7 +1267,7 @@ DEFUN (psnp_interval_l1,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atol (argv[0]->arg);
interval = atol (argv[0]);
if (interval < MIN_PSNP_INTERVAL || interval > MAX_PSNP_INTERVAL)
{
vty_out (vty, "Invalid psnp-interval %lu - should be <1-120>%s",
@ -1319,7 +1319,7 @@ DEFUN (psnp_interval_l2,
if (!circuit)
return CMD_ERR_NO_MATCH;
interval = atol (argv[0]->arg);
interval = atol (argv[0]);
if (interval < MIN_PSNP_INTERVAL || interval > MAX_PSNP_INTERVAL)
{
vty_out (vty, "Invalid psnp-interval %lu - should be <1-120>%s",
@ -1409,7 +1409,7 @@ DEFUN (metric_style,
assert(area);
if (strncmp (argv[0]->arg, "w", 1) == 0)
if (strncmp (argv[0], "w", 1) == 0)
{
isis_area_metricstyle_set(area, false, true);
return CMD_SUCCESS;
@ -1419,9 +1419,9 @@ DEFUN (metric_style,
if (ret != CMD_SUCCESS)
return ret;
if (strncmp (argv[0]->arg, "t", 1) == 0)
if (strncmp (argv[0], "t", 1) == 0)
isis_area_metricstyle_set(area, true, true);
else if (strncmp (argv[0]->arg, "n", 1) == 0)
else if (strncmp (argv[0], "n", 1) == 0)
isis_area_metricstyle_set(area, true, false);
return CMD_SUCCESS;
@ -1561,7 +1561,7 @@ DEFUN (area_lsp_mtu,
{
unsigned int lsp_mtu;
VTY_GET_INTEGER_RANGE("lsp-mtu", lsp_mtu, argv[0]->arg, 128, 4352);
VTY_GET_INTEGER_RANGE("lsp-mtu", lsp_mtu, argv[0], 128, 4352);
return area_lsp_mtu_set(vty, lsp_mtu);
}
@ -1601,7 +1601,7 @@ DEFUN (is_type,
return CMD_ERR_NO_MATCH;
}
type = string2circuit_t (argv[0]->arg);
type = string2circuit_t (argv[0]);
if (!type)
{
vty_out (vty, "Unknown IS level %s", VTY_NEWLINE);
@ -1684,7 +1684,7 @@ DEFUN (lsp_gen_interval,
int level;
area = vty->index;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
level = IS_LEVEL_1 | IS_LEVEL_2;
return set_lsp_gen_interval (vty, area, interval, level);
}
@ -1724,7 +1724,7 @@ DEFUN (lsp_gen_interval_l1,
int level;
area = vty->index;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
level = IS_LEVEL_1;
return set_lsp_gen_interval (vty, area, interval, level);
}
@ -1766,7 +1766,7 @@ DEFUN (lsp_gen_interval_l2,
int level;
area = vty->index;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
level = IS_LEVEL_2;
return set_lsp_gen_interval (vty, area, interval, level);
}
@ -1806,7 +1806,7 @@ DEFUN (spf_interval,
u_int16_t interval;
area = vty->index;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
area->min_spf_interval[0] = interval;
area->min_spf_interval[1] = interval;
@ -1847,7 +1847,7 @@ DEFUN (spf_interval_l1,
u_int16_t interval;
area = vty->index;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
area->min_spf_interval[0] = interval;
return CMD_SUCCESS;
@ -1888,7 +1888,7 @@ DEFUN (spf_interval_l2,
u_int16_t interval;
area = vty->index;
interval = atoi (argv[0]->arg);
interval = atoi (argv[0]);
area->min_spf_interval[1] = interval;
return CMD_SUCCESS;
@ -1976,7 +1976,7 @@ DEFUN (max_lsp_lifetime,
"Maximum LSP lifetime\n"
"LSP lifetime in seconds\n")
{
return area_max_lsp_lifetime_set(vty, IS_LEVEL_1_AND_2, atoi(argv[0]->arg));
return area_max_lsp_lifetime_set(vty, IS_LEVEL_1_AND_2, atoi(argv[0]));
}
DEFUN (no_max_lsp_lifetime,
@ -2002,7 +2002,7 @@ DEFUN (max_lsp_lifetime_l1,
"Maximum LSP lifetime for Level 1 only\n"
"LSP lifetime for Level 1 only in seconds\n")
{
return area_max_lsp_lifetime_set(vty, IS_LEVEL_1, atoi(argv[0]->arg));
return area_max_lsp_lifetime_set(vty, IS_LEVEL_1, atoi(argv[0]));
}
DEFUN (no_max_lsp_lifetime_l1,
@ -2027,7 +2027,7 @@ DEFUN (max_lsp_lifetime_l2,
"Maximum LSP lifetime for Level 2 only\n"
"LSP lifetime for Level 2 only in seconds\n")
{
return area_max_lsp_lifetime_set(vty, IS_LEVEL_2, atoi(argv[0]->arg));
return area_max_lsp_lifetime_set(vty, IS_LEVEL_2, atoi(argv[0]));
}
DEFUN (no_max_lsp_lifetime_l2,
@ -2096,7 +2096,7 @@ DEFUN (lsp_refresh_interval,
"LSP refresh interval\n"
"LSP refresh interval in seconds\n")
{
return area_lsp_refresh_interval_set(vty, IS_LEVEL_1_AND_2, atoi(argv[0]->arg));
return area_lsp_refresh_interval_set(vty, IS_LEVEL_1_AND_2, atoi(argv[0]));
}
DEFUN (no_lsp_refresh_interval,
@ -2122,7 +2122,7 @@ DEFUN (lsp_refresh_interval_l1,
"LSP refresh interval for Level 1 only\n"
"LSP refresh interval for Level 1 only in seconds\n")
{
return area_lsp_refresh_interval_set(vty, IS_LEVEL_1, atoi(argv[0]->arg));
return area_lsp_refresh_interval_set(vty, IS_LEVEL_1, atoi(argv[0]));
}
DEFUN (no_lsp_refresh_interval_l1,
@ -2148,7 +2148,7 @@ DEFUN (lsp_refresh_interval_l2,
"LSP refresh interval for Level 2 only\n"
"LSP refresh interval for Level 2 only in seconds\n")
{
return area_lsp_refresh_interval_set(vty, IS_LEVEL_2, atoi(argv[0]->arg));
return area_lsp_refresh_interval_set(vty, IS_LEVEL_2, atoi(argv[0]));
}
DEFUN (no_lsp_refresh_interval_l2,
@ -2201,17 +2201,17 @@ DEFUN (area_passwd_md5,
"Level-wide password\n")
{
u_char snp_auth = 0;
int level = (argv[0]->arg[0] == 'd') ? IS_LEVEL_2 : IS_LEVEL_1;
int level = (argv[0][0] == 'd') ? IS_LEVEL_2 : IS_LEVEL_1;
if (argc > 2)
{
snp_auth = SNP_AUTH_SEND;
if (strncmp(argv[2]->arg, "v", 1) == 0)
if (strncmp(argv[2], "v", 1) == 0)
snp_auth |= SNP_AUTH_RECV;
}
return area_passwd_set(vty, level, isis_area_passwd_hmac_md5_set,
argv[1]->arg, snp_auth);
argv[1], snp_auth);
}
ALIAS (area_passwd_md5,
@ -2235,17 +2235,17 @@ DEFUN (area_passwd_clear,
"Area password\n")
{
u_char snp_auth = 0;
int level = (argv[0]->arg[0] == 'd') ? IS_LEVEL_2 : IS_LEVEL_1;
int level = (argv[0][0] == 'd') ? IS_LEVEL_2 : IS_LEVEL_1;
if (argc > 2)
{
snp_auth = SNP_AUTH_SEND;
if (strncmp(argv[2]->arg, "v", 1) == 0)
if (strncmp(argv[2], "v", 1) == 0)
snp_auth |= SNP_AUTH_RECV;
}
return area_passwd_set(vty, level, isis_area_passwd_cleartext_set,
argv[1]->arg, snp_auth);
argv[1], snp_auth);
}
ALIAS (area_passwd_clear,
@ -2267,7 +2267,7 @@ DEFUN (no_area_passwd,
"Configure the authentication password for an area\n"
"Set the authentication password for a routing domain\n")
{
int level = (argv[0]->arg[0] == 'd') ? IS_LEVEL_2 : IS_LEVEL_1;
int level = (argv[0][0] == 'd') ? IS_LEVEL_2 : IS_LEVEL_1;
struct isis_area *area = vty->index;
if (!area)

26
isisd/isisd.c
View file

@ -533,7 +533,7 @@ DEFUN (show_isis_interface_arg,
"ISIS interface\n"
"ISIS interface name\n")
{
return show_isis_interface_common (vty, argv[0]->arg, ISIS_UI_LEVEL_DETAIL);
return show_isis_interface_common (vty, argv[0], ISIS_UI_LEVEL_DETAIL);
}
/*
@ -707,7 +707,7 @@ DEFUN (show_isis_neighbor_arg,
"ISIS neighbor adjacencies\n"
"System id\n")
{
return show_isis_neighbor_common (vty, argv[0]->arg, ISIS_UI_LEVEL_DETAIL);
return show_isis_neighbor_common (vty, argv[0], ISIS_UI_LEVEL_DETAIL);
}
DEFUN (clear_isis_neighbor,
@ -728,7 +728,7 @@ DEFUN (clear_isis_neighbor_arg,
"ISIS neighbor adjacencies\n"
"System id\n")
{
return clear_isis_neighbor_common (vty, argv[0]->arg);
return clear_isis_neighbor_common (vty, argv[0]);
}
/*
@ -1530,7 +1530,7 @@ DEFUN (show_database_lsp_brief,
"IS-IS link state database\n"
"LSP ID\n")
{
return show_isis_database (vty, argv[0]->arg, ISIS_UI_LEVEL_BRIEF);
return show_isis_database (vty, argv[0], ISIS_UI_LEVEL_BRIEF);
}
DEFUN (show_database_lsp_detail,
@ -1542,7 +1542,7 @@ DEFUN (show_database_lsp_detail,
"LSP ID\n"
"Detailed information\n")
{
return show_isis_database (vty, argv[0]->arg, ISIS_UI_LEVEL_DETAIL);
return show_isis_database (vty, argv[0], ISIS_UI_LEVEL_DETAIL);
}
DEFUN (show_database_detail,
@ -1564,7 +1564,7 @@ DEFUN (show_database_detail_lsp,
"Detailed information\n"
"LSP ID\n")
{
return show_isis_database (vty, argv[0]->arg, ISIS_UI_LEVEL_DETAIL);
return show_isis_database (vty, argv[0], ISIS_UI_LEVEL_DETAIL);
}
/*
@ -1577,7 +1577,7 @@ DEFUN (router_isis,
"ISO IS-IS\n"
"ISO Routing area tag")
{
return isis_area_get (vty, argv[0]->arg);
return isis_area_get (vty, argv[0]);
}
/*
@ -1588,7 +1588,7 @@ DEFUN (no_router_isis,
"no router isis WORD",
"no\n" ROUTER_STR "ISO IS-IS\n" "ISO Routing area tag")
{
return isis_area_destroy (vty, argv[0]->arg);
return isis_area_destroy (vty, argv[0]);
}
/*
@ -1600,7 +1600,7 @@ DEFUN (net,
"A Network Entity Title for this process (OSI only)\n"
"XX.XXXX. ... .XXX.XX Network entity title (NET)\n")
{
return area_net_title (vty, argv[0]->arg);
return area_net_title (vty, argv[0]);
}
/*
@ -1613,7 +1613,7 @@ DEFUN (no_net,
"A Network Entity Title for this process (OSI only)\n"
"XX.XXXX. ... .XXX.XX Network entity title (NET)\n")
{
return area_clear_net_title (vty, argv[0]->arg);
return area_clear_net_title (vty, argv[0]);
}
void isis_area_lsp_mtu_set(struct isis_area *area, unsigned int lsp_mtu)
@ -1973,8 +1973,8 @@ DEFUN (topology_baseis,
area = vty->index;
assert (area);
if (sysid2buff (buff, argv[0]->arg))
sysid2buff (area->topology_baseis, argv[0]->arg);
if (sysid2buff (buff, argv[0]))
sysid2buff (area->topology_baseis, argv[0]);
return CMD_SUCCESS;
}
@ -2016,7 +2016,7 @@ DEFUN (topology_basedynh,
assert (area);
/* I hope that it's enough. */
area->topology_basedynh = strndup (argv[0]->arg, 16);
area->topology_basedynh = strndup (argv[0], 16);
return CMD_SUCCESS;
}