diff options
Diffstat (limited to 'ripd/rip_debug.c')
| -rw-r--r-- | ripd/rip_debug.c | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/ripd/rip_debug.c b/ripd/rip_debug.c index a267874ade..35d5d9b825 100644 --- a/ripd/rip_debug.c +++ b/ripd/rip_debug.c @@ -13,10 +13,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with GNU Zebra; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; see the file COPYING; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <zebra.h> @@ -90,37 +89,18 @@ DEFUN (debug_rip_packet, DEFUN (debug_rip_packet_direct, debug_rip_packet_direct_cmd, - "debug rip packet (recv|send)", + "debug rip packet <recv|send>", DEBUG_STR RIP_STR "RIP packet\n" "RIP receive packet\n" "RIP send packet\n") { + int idx_recv_send = 3; rip_debug_packet |= RIP_DEBUG_PACKET; - if (strncmp ("send", argv[0], strlen (argv[0])) == 0) + if (strncmp ("send", argv[idx_recv_send]->arg, strlen (argv[idx_recv_send]->arg)) == 0) rip_debug_packet |= RIP_DEBUG_SEND; - if (strncmp ("recv", argv[0], strlen (argv[0])) == 0) - rip_debug_packet |= RIP_DEBUG_RECV; - return CMD_SUCCESS; -} - -/* N.B. the "detail" modifier is a no-op. we leave this command - for legacy compatibility. */ -DEFUN_DEPRECATED (debug_rip_packet_detail, - debug_rip_packet_detail_cmd, - "debug rip packet (recv|send) detail", - DEBUG_STR - RIP_STR - "RIP packet\n" - "RIP receive packet\n" - "RIP send packet\n" - "Detailed information display\n") -{ - rip_debug_packet |= RIP_DEBUG_PACKET; - if (strncmp ("send", argv[0], strlen (argv[0])) == 0) - rip_debug_packet |= RIP_DEBUG_SEND; - if (strncmp ("recv", argv[0], strlen (argv[0])) == 0) + if (strncmp ("recv", argv[idx_recv_send]->arg, strlen (argv[idx_recv_send]->arg)) == 0) rip_debug_packet |= RIP_DEBUG_RECV; return CMD_SUCCESS; } @@ -162,7 +142,7 @@ DEFUN (no_debug_rip_packet, DEFUN (no_debug_rip_packet_direct, no_debug_rip_packet_direct_cmd, - "no debug rip packet (recv|send)", + "no debug rip packet <recv|send>", NO_STR DEBUG_STR RIP_STR @@ -170,14 +150,15 @@ DEFUN (no_debug_rip_packet_direct, "RIP option set for receive packet\n" "RIP option set for send packet\n") { - if (strncmp ("send", argv[0], strlen (argv[0])) == 0) + int idx_recv_send = 4; + if (strncmp ("send", argv[idx_recv_send]->arg, strlen (argv[idx_recv_send]->arg)) == 0) { if (IS_RIP_DEBUG_RECV) rip_debug_packet &= ~RIP_DEBUG_SEND; else rip_debug_packet = 0; } - else if (strncmp ("recv", argv[0], strlen (argv[0])) == 0) + else if (strncmp ("recv", argv[idx_recv_send]->arg, strlen (argv[idx_recv_send]->arg)) == 0) { if (IS_RIP_DEBUG_SEND) rip_debug_packet &= ~RIP_DEBUG_RECV; @@ -265,7 +246,6 @@ rip_debug_init (void) install_element (ENABLE_NODE, &debug_rip_events_cmd); install_element (ENABLE_NODE, &debug_rip_packet_cmd); install_element (ENABLE_NODE, &debug_rip_packet_direct_cmd); - install_element (ENABLE_NODE, &debug_rip_packet_detail_cmd); install_element (ENABLE_NODE, &debug_rip_zebra_cmd); install_element (ENABLE_NODE, &no_debug_rip_events_cmd); install_element (ENABLE_NODE, &no_debug_rip_packet_cmd); @@ -275,7 +255,6 @@ rip_debug_init (void) install_element (CONFIG_NODE, &debug_rip_events_cmd); install_element (CONFIG_NODE, &debug_rip_packet_cmd); install_element (CONFIG_NODE, &debug_rip_packet_direct_cmd); - install_element (CONFIG_NODE, &debug_rip_packet_detail_cmd); install_element (CONFIG_NODE, &debug_rip_zebra_cmd); install_element (CONFIG_NODE, &no_debug_rip_events_cmd); install_element (CONFIG_NODE, &no_debug_rip_packet_cmd); |