Skip to content

Commit

Permalink
*: use argv[]->text instead of argv[]->arg when appropriate
Browse files Browse the repository at this point in the history 
Incomplete commands like "debug ospf6 route mem" were being ignored. The
changes in ripd and ripngd are intended to make the code easier to read,
no bugs were fixed in these two daemons.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
  • Loading branch information
@rwestphal
rwestphal committed Oct 6, 2017
1 parent 993bab8 commit 8034bef
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 40 deletions.
16 changes: 8 additions & 8 deletions bgpd/bgp_evpn_vty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3102,11 +3102,11 @@ DEFUN (bgp_evpn_vni_rt,
if (!bgp || !vpn)
return CMD_WARNING;

if (!strcmp(argv[1]->arg, "import"))
if (!strcmp(argv[1]->text, "import"))
rt_type = RT_TYPE_IMPORT;
else if (!strcmp(argv[1]->arg, "export"))
else if (!strcmp(argv[1]->text, "export"))
rt_type = RT_TYPE_EXPORT;
else if (!strcmp(argv[1]->arg, "both"))
else if (!strcmp(argv[1]->text, "both"))
rt_type = RT_TYPE_BOTH;
else {
vty_out(vty, "%% Invalid Route Target type\n");
Expand Down Expand Up @@ -3164,11 +3164,11 @@ DEFUN (no_bgp_evpn_vni_rt,
if (!bgp || !vpn)
return CMD_WARNING;

if (!strcmp(argv[2]->arg, "import"))
if (!strcmp(argv[2]->text, "import"))
rt_type = RT_TYPE_IMPORT;
else if (!strcmp(argv[2]->arg, "export"))
else if (!strcmp(argv[2]->text, "export"))
rt_type = RT_TYPE_EXPORT;
else if (!strcmp(argv[2]->arg, "both"))
else if (!strcmp(argv[2]->text, "both"))
rt_type = RT_TYPE_BOTH;
else {
vty_out(vty, "%% Invalid Route Target type\n");
Expand Down Expand Up @@ -3257,9 +3257,9 @@ DEFUN (no_bgp_evpn_vni_rt_without_val,
if (!bgp || !vpn)
return CMD_WARNING;

if (!strcmp(argv[2]->arg, "import")) {
if (!strcmp(argv[2]->text, "import")) {
rt_type = RT_TYPE_IMPORT;
} else if (!strcmp(argv[2]->arg, "export")) {
} else if (!strcmp(argv[2]->text, "export")) {
rt_type = RT_TYPE_EXPORT;
} else {
vty_out(vty, "%% Invalid Route Target type\n");
Expand Down
16 changes: 8 additions & 8 deletions ospf6d/ospf6_route.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1469,13 +1469,13 @@ DEFUN (debug_ospf6_route,
int idx_type = 3;
unsigned char level = 0;

if (!strncmp(argv[idx_type]->arg, "table", 5))
if (!strcmp(argv[idx_type]->text, "table"))
level = OSPF6_DEBUG_ROUTE_TABLE;
else if (!strncmp(argv[idx_type]->arg, "intra", 5))
else if (!strcmp(argv[idx_type]->text, "intra-area"))
level = OSPF6_DEBUG_ROUTE_INTRA;
else if (!strncmp(argv[idx_type]->arg, "inter", 5))
else if (!strcmp(argv[idx_type]->text, "inter-area"))
level = OSPF6_DEBUG_ROUTE_INTER;
else if (!strncmp(argv[idx_type]->arg, "memor", 5))
else if (!strcmp(argv[idx_type]->text, "memory"))
level = OSPF6_DEBUG_ROUTE_MEMORY;
OSPF6_DEBUG_ROUTE_ON(level);
return CMD_SUCCESS;
Expand All @@ -1496,13 +1496,13 @@ DEFUN (no_debug_ospf6_route,
int idx_type = 4;
unsigned char level = 0;

if (!strncmp(argv[idx_type]->arg, "table", 5))
if (!strcmp(argv[idx_type]->text, "table"))
level = OSPF6_DEBUG_ROUTE_TABLE;
else if (!strncmp(argv[idx_type]->arg, "intra", 5))
else if (!strcmp(argv[idx_type]->text, "intra-area"))
level = OSPF6_DEBUG_ROUTE_INTRA;
else if (!strncmp(argv[idx_type]->arg, "inter", 5))
else if (!strcmp(argv[idx_type]->text, "inter-area"))
level = OSPF6_DEBUG_ROUTE_INTER;
else if (!strncmp(argv[idx_type]->arg, "memor", 5))
else if (!strcmp(argv[idx_type]->text, "memory"))
level = OSPF6_DEBUG_ROUTE_MEMORY;
OSPF6_DEBUG_ROUTE_OFF(level);
return CMD_SUCCESS;
Expand Down
16 changes: 4 additions & 12 deletions ripd/rip_debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,9 @@ DEFUN (debug_rip_packet_direct,
{
int idx_recv_send = 3;
rip_debug_packet |= RIP_DEBUG_PACKET;
if (strncmp("send", argv[idx_recv_send]->arg,
strlen(argv[idx_recv_send]->arg))
== 0)
if (strcmp("send", argv[idx_recv_send]->text) == 0)
rip_debug_packet |= RIP_DEBUG_SEND;
if (strncmp("recv", argv[idx_recv_send]->arg,
strlen(argv[idx_recv_send]->arg))
== 0)
if (strcmp("recv", argv[idx_recv_send]->text) == 0)
rip_debug_packet |= RIP_DEBUG_RECV;
return CMD_SUCCESS;
}
Expand Down Expand Up @@ -150,16 +146,12 @@ DEFUN (no_debug_rip_packet_direct,
"RIP option set for send packet\n")
{
int idx_recv_send = 4;
if (strncmp("send", argv[idx_recv_send]->arg,
strlen(argv[idx_recv_send]->arg))
== 0) {
if (strcmp("send", argv[idx_recv_send]->text) == 0) {
if (IS_RIP_DEBUG_RECV)
rip_debug_packet &= ~RIP_DEBUG_SEND;
else
rip_debug_packet = 0;
} else if (strncmp("recv", argv[idx_recv_send]->arg,
strlen(argv[idx_recv_send]->arg))
== 0) {
} else if (strcmp("recv", argv[idx_recv_send]->text) == 0) {
if (IS_RIP_DEBUG_SEND)
rip_debug_packet &= ~RIP_DEBUG_RECV;
else
Expand Down
16 changes: 4 additions & 12 deletions ripngd/ripng_debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,9 @@ DEFUN (debug_ripng_packet_direct,
{
int idx_recv_send = 3;
ripng_debug_packet |= RIPNG_DEBUG_PACKET;
if (strncmp("send", argv[idx_recv_send]->arg,
strlen(argv[idx_recv_send]->arg))
== 0)
if (strcmp("send", argv[idx_recv_send]->text) == 0)
ripng_debug_packet |= RIPNG_DEBUG_SEND;
if (strncmp("recv", argv[idx_recv_send]->arg,
strlen(argv[idx_recv_send]->arg))
== 0)
if (strcmp("recv", argv[idx_recv_send]->text) == 0)
ripng_debug_packet |= RIPNG_DEBUG_RECV;

return CMD_SUCCESS;
Expand Down Expand Up @@ -152,16 +148,12 @@ DEFUN (no_debug_ripng_packet_direct,
"Debug option set for send packet\n")
{
int idx_recv_send = 4;
if (strncmp("send", argv[idx_recv_send]->arg,
strlen(argv[idx_recv_send]->arg))
== 0) {
if (strcmp("send", argv[idx_recv_send]->text) == 0) {
if (IS_RIPNG_DEBUG_RECV)
ripng_debug_packet &= ~RIPNG_DEBUG_SEND;
else
ripng_debug_packet = 0;
} else if (strncmp("recv", argv[idx_recv_send]->arg,
strlen(argv[idx_recv_send]->arg))
== 0) {
} else if (strcmp("recv", argv[idx_recv_send]->text) == 0) {
if (IS_RIPNG_DEBUG_SEND)
ripng_debug_packet &= ~RIPNG_DEBUG_RECV;
else
Expand Down

0 comments on commit 8034bef

Please sign in to comment.