1 files changed, 130 insertions, 108 deletions

diff --git a/zebra/debug.c b/zebra/debug.c
index 67c9d16746..25f47bc51a 100644
--- a/zebra/debug.c
+++ b/zebra/debug.c
@@ -14,10 +14,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>
@@ -32,6 +31,7 @@ unsigned long zebra_debug_rib;
 unsigned long zebra_debug_fpm;
 unsigned long zebra_debug_nht;
 unsigned long zebra_debug_mpls;
+unsigned long zebra_debug_vxlan;
 unsigned long zebra_debug_pw;
 
 DEFUN (show_debugging_zebra,
@@ -41,58 +41,50 @@ DEFUN (show_debugging_zebra,
        "Debugging information\n"
        "Zebra configuration\n")
 {
-	vty_out(vty, "Zebra debugging status:%s", VTY_NEWLINE);
+	vty_out(vty, "Zebra debugging status:\n");
 
 	if (IS_ZEBRA_DEBUG_EVENT)
-		vty_out(vty, "  Zebra event debugging is on%s", VTY_NEWLINE);
+		vty_out(vty, "  Zebra event debugging is on\n");
 
 	if (IS_ZEBRA_DEBUG_PACKET) {
 		if (IS_ZEBRA_DEBUG_SEND && IS_ZEBRA_DEBUG_RECV) {
-			vty_out(vty, "  Zebra packet%s debugging is on%s",
-				IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-				VTY_NEWLINE);
+			vty_out(vty, "  Zebra packet%s debugging is on\n",
+				IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 		} else {
 			if (IS_ZEBRA_DEBUG_SEND)
 				vty_out(vty,
-					"  Zebra packet send%s debugging is on%s",
-					IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-					VTY_NEWLINE);
+					"  Zebra packet send%s debugging is on\n",
+					IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 			else
 				vty_out(vty,
-					"  Zebra packet receive%s debugging is on%s",
-					IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-					VTY_NEWLINE);
+					"  Zebra packet receive%s debugging is on\n",
+					IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 		}
 	}
 
 	if (IS_ZEBRA_DEBUG_KERNEL)
-		vty_out(vty, "  Zebra kernel debugging is on%s", VTY_NEWLINE);
+		vty_out(vty, "  Zebra kernel debugging is on\n");
 	if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND)
 		vty_out(vty,
-			"  Zebra kernel netlink message dumps (send) are on%s",
-			VTY_NEWLINE);
+			"  Zebra kernel netlink message dumps (send) are on\n");
 	if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV)
 		vty_out(vty,
-			"  Zebra kernel netlink message dumps (recv) are on%s",
-			VTY_NEWLINE);
+			"  Zebra kernel netlink message dumps (recv) are on\n");
 
 	/* Check here using flags as the 'macro' does an OR */
-	if (CHECK_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB))
-		vty_out(vty, "  Zebra RIB debugging is on%s", VTY_NEWLINE);
 	if (CHECK_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED))
-		vty_out(vty, "  Zebra RIB detailed debugging is on%s",
-			VTY_NEWLINE);
+		vty_out(vty, "  Zebra RIB detailed debugging is on\n");
+	else if (CHECK_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB))
+		vty_out(vty, "  Zebra RIB debugging is on\n");
 
 	if (IS_ZEBRA_DEBUG_FPM)
-		vty_out(vty, "  Zebra FPM debugging is on%s", VTY_NEWLINE);
+		vty_out(vty, "  Zebra FPM debugging is on\n");
 	if (IS_ZEBRA_DEBUG_NHT)
-		vty_out(vty, "  Zebra next-hop tracking debugging is on%s",
-			VTY_NEWLINE);
+		vty_out(vty, "  Zebra next-hop tracking debugging is on\n");
 	if (IS_ZEBRA_DEBUG_MPLS)
-		vty_out(vty, "  Zebra MPLS debugging is on%s", VTY_NEWLINE);
+		vty_out(vty, "  Zebra MPLS debugging is on\n");
 	if (IS_ZEBRA_DEBUG_PW)
-		vty_out(vty, "  Zebra pseudowire debugging is on%s",
-			VTY_NEWLINE);
+		vty_out(vty, "  Zebra pseudowire debugging is on\n");
 
 	return CMD_SUCCESS;
 }
@@ -105,7 +97,7 @@ DEFUN (debug_zebra_events,
        "Debug option set for zebra events\n")
 {
 	zebra_debug_event = ZEBRA_DEBUG_EVENT;
-	return CMD_WARNING;
+	return CMD_WARNING_CONFIG_FAILED;
 }
 
 DEFUN (debug_zebra_nht,
@@ -116,7 +108,7 @@ DEFUN (debug_zebra_nht,
        "Debug option set for zebra next hop tracking\n")
 {
 	zebra_debug_nht = ZEBRA_DEBUG_NHT;
-	return CMD_WARNING;
+	return CMD_WARNING_CONFIG_FAILED;
 }
 
 DEFUN (debug_zebra_mpls,
@@ -127,6 +119,17 @@ DEFUN (debug_zebra_mpls,
        "Debug option set for zebra MPLS LSPs\n")
 {
 	zebra_debug_mpls = ZEBRA_DEBUG_MPLS;
+	return CMD_WARNING_CONFIG_FAILED;
+}
+
+DEFUN (debug_zebra_vxlan,
+       debug_zebra_vxlan_cmd,
+       "debug zebra vxlan",
+       DEBUG_STR
+       "Zebra configuration\n"
+       "Debug option set for zebra VxLAN (EVPN)\n")
+{
+	zebra_debug_vxlan = ZEBRA_DEBUG_VXLAN;
 	return CMD_WARNING;
 }
 
@@ -160,17 +163,16 @@ DEFUN (debug_zebra_packet,
 
 	if (argv_find(argv, argc, "send", &idx))
 		SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
-	idx = 0;
-	if (argv_find(argv, argc, "recv", &idx))
+	else if (argv_find(argv, argc, "recv", &idx))
 		SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
-	idx = 0;
-	if (argv_find(argv, argc, "detail", &idx))
-		SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_DETAIL);
-
-	if (!(zebra_debug_packet & ZEBRA_DEBUG_SEND & ZEBRA_DEBUG_RECV)) {
+	else {
 		SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
 		SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
 	}
+
+	if (argv_find(argv, argc, "detail", &idx))
+		SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_DETAIL);
+
 	return CMD_SUCCESS;
 }
 
@@ -182,6 +184,13 @@ DEFUN (debug_zebra_kernel,
        "Debug option set for zebra between kernel interface\n")
 {
 	SET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL);
+
+	if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV)
+		UNSET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV);
+
+	if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND)
+		UNSET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND);
+
 	return CMD_SUCCESS;
 }
 
@@ -196,34 +205,41 @@ DEFUN (debug_zebra_kernel_msgdump,
        "Dump raw netlink messages sent\n")
 {
 	int idx = 0;
-	if (argc == 4 || argv_find(argv, argc, "recv", &idx))
+
+	if (argv_find(argv, argc, "recv", &idx)) {
+		SET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV);
+
+		if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND)
+			UNSET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND);
+
+	} else if (argv_find(argv, argc, "send", &idx)) {
+		SET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND);
+
+		if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV)
+			UNSET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV);
+
+	} else {
 		SET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV);
-	if (argc == 4 || argv_find(argv, argc, "send", &idx))
 		SET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND);
+	}
 
 	return CMD_SUCCESS;
 }
 
 DEFUN (debug_zebra_rib,
        debug_zebra_rib_cmd,
-       "debug zebra rib",
-       DEBUG_STR
-       "Zebra configuration\n"
-       "Debug RIB events\n")
-{
-	SET_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB);
-	return CMD_SUCCESS;
-}
-
-DEFUN (debug_zebra_rib_detailed,
-       debug_zebra_rib_detailed_cmd,
-       "debug zebra rib detailed",
+       "debug zebra rib [detailed]",
        DEBUG_STR
        "Zebra configuration\n"
        "Debug RIB events\n"
        "Detailed debugs\n")
 {
-	SET_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED);
+	int idx = 0;
+	SET_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB);
+
+	if (argv_find(argv, argc, "detailed", &idx))
+		SET_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED);
+
 	return CMD_SUCCESS;
 }
 
@@ -274,21 +290,30 @@ DEFUN (no_debug_zebra_mpls,
 	return CMD_SUCCESS;
 }
 
+DEFUN (no_debug_zebra_vxlan,
+       no_debug_zebra_vxlan_cmd,
+       "no debug zebra vxlan",
+       NO_STR
+       DEBUG_STR
+       "Zebra configuration\n"
+       "Debug option set for zebra VxLAN (EVPN)\n")
+{
+	zebra_debug_vxlan = 0;
+	return CMD_SUCCESS;
+}
+
 DEFUN (no_debug_zebra_packet,
        no_debug_zebra_packet_cmd,
-       "no debug zebra packet [<recv|send>]",
+       "no debug zebra packet [<recv|send>] [detail]",
        NO_STR
        DEBUG_STR
        "Zebra configuration\n"
        "Debug option set for zebra packet\n"
        "Debug option set for receive packet\n"
-       "Debug option set for send packet\n")
+       "Debug option set for send packet\n"
+       "Debug option set for detailed info\n")
 {
-	int idx = 0;
-	if (argc == 4 || argv_find(argv, argc, "send", &idx))
-		UNSET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
-	if (argc == 4 || argv_find(argv, argc, "recv", &idx))
-		UNSET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
+	zebra_debug_packet = 0;
 	return CMD_SUCCESS;
 }
 
@@ -300,7 +325,7 @@ DEFUN (no_debug_zebra_kernel,
        "Zebra configuration\n"
        "Debug option set for zebra between kernel interface\n")
 {
-	UNSET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL);
+	zebra_debug_kernel = 0;
 	return CMD_SUCCESS;
 }
 
@@ -315,37 +340,20 @@ DEFUN (no_debug_zebra_kernel_msgdump,
        "Dump raw netlink messages received\n"
        "Dump raw netlink messages sent\n")
 {
-	int idx = 0;
-	if (argc == 5 || argv_find(argv, argc, "recv", &idx))
-		UNSET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV);
-	if (argc == 5 || argv_find(argv, argc, "send", &idx))
-		UNSET_FLAG(zebra_debug_kernel, ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND);
-
+	zebra_debug_kernel = 0;
 	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_zebra_rib,
        no_debug_zebra_rib_cmd,
-       "no debug zebra rib",
-       NO_STR
-       DEBUG_STR
-       "Zebra configuration\n"
-       "Debug zebra RIB\n")
-{
-	zebra_debug_rib = 0;
-	return CMD_SUCCESS;
-}
-
-DEFUN (no_debug_zebra_rib_detailed,
-       no_debug_zebra_rib_detailed_cmd,
-       "no debug zebra rib detailed",
+       "no debug zebra rib [detailed]",
        NO_STR
        DEBUG_STR
        "Zebra configuration\n"
        "Debug zebra RIB\n"
        "Detailed debugs\n")
 {
-	UNSET_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED);
+	zebra_debug_rib = 0;
 	return CMD_SUCCESS;
 }
 
@@ -370,54 +378,67 @@ static int config_write_debug(struct vty *vty)
 	int write = 0;
 
 	if (IS_ZEBRA_DEBUG_EVENT) {
-		vty_out(vty, "debug zebra events%s", VTY_NEWLINE);
+		vty_out(vty, "debug zebra events\n");
 		write++;
 	}
 	if (IS_ZEBRA_DEBUG_PACKET) {
 		if (IS_ZEBRA_DEBUG_SEND && IS_ZEBRA_DEBUG_RECV) {
-			vty_out(vty, "debug zebra packet%s%s",
-				IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-				VTY_NEWLINE);
+			vty_out(vty, "debug zebra packet%s\n",
+				IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 			write++;
 		} else {
 			if (IS_ZEBRA_DEBUG_SEND)
-				vty_out(vty, "debug zebra packet send%s%s",
-					IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-					VTY_NEWLINE);
+				vty_out(vty, "debug zebra packet send%s\n",
+					IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 			else
-				vty_out(vty, "debug zebra packet recv%s%s",
-					IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-					VTY_NEWLINE);
+				vty_out(vty, "debug zebra packet recv%s\n",
+					IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 			write++;
 		}
 	}
+
 	if (IS_ZEBRA_DEBUG_KERNEL) {
-		vty_out(vty, "debug zebra kernel%s", VTY_NEWLINE);
-		write++;
-	}
-	/* Check here using flags as the 'macro' does an OR */
-	if (CHECK_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB)) {
-		vty_out(vty, "debug zebra rib%s", VTY_NEWLINE);
-		write++;
+		if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND && IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV) {
+			vty_out(vty, "debug zebra kernel msgdump\n");
+			write++;
+		} else if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_RECV) {
+			vty_out(vty, "debug zebra kernel msgdump recv\n");
+			write++;
+		} else if (IS_ZEBRA_DEBUG_KERNEL_MSGDUMP_SEND) {
+			vty_out(vty, "debug zebra kernel msgdump send\n");
+			write++;
+		} else {
+			vty_out(vty, "debug zebra kernel\n");
+			write++;
+		}
 	}
+
 	if (CHECK_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB_DETAILED)) {
-		vty_out(vty, "debug zebra rib detailed%s", VTY_NEWLINE);
+		vty_out(vty, "debug zebra rib detailed\n");
+		write++;
+	} else if (CHECK_FLAG(zebra_debug_rib, ZEBRA_DEBUG_RIB)) {
+		vty_out(vty, "debug zebra rib\n");
 		write++;
 	}
+
 	if (IS_ZEBRA_DEBUG_FPM) {
-		vty_out(vty, "debug zebra fpm%s", VTY_NEWLINE);
+		vty_out(vty, "debug zebra fpm\n");
 		write++;
 	}
 	if (IS_ZEBRA_DEBUG_NHT) {
-		vty_out(vty, "debug zebra nht%s", VTY_NEWLINE);
+		vty_out(vty, "debug zebra nht\n");
 		write++;
 	}
 	if (IS_ZEBRA_DEBUG_MPLS) {
-		vty_out(vty, "debug zebra mpls%s", VTY_NEWLINE);
+		vty_out(vty, "debug zebra mpls\n");
+		write++;
+	}
+	if (IS_ZEBRA_DEBUG_VXLAN) {
+		vty_out(vty, "debug zebra vxlan\n");
 		write++;
 	}
 	if (IS_ZEBRA_DEBUG_PW) {
-		vty_out(vty, "debug zebra pseudowires%s", VTY_NEWLINE);
+		vty_out(vty, "debug zebra pseudowires\n");
 		write++;
 	}
 	return write;
@@ -431,6 +452,7 @@ void zebra_debug_init(void)
 	zebra_debug_rib = 0;
 	zebra_debug_fpm = 0;
 	zebra_debug_mpls = 0;
+	zebra_debug_vxlan = 0;
 	zebra_debug_pw = 0;
 
 	install_node(&debug_node, config_write_debug);
@@ -440,40 +462,40 @@ void zebra_debug_init(void)
 	install_element(ENABLE_NODE, &debug_zebra_events_cmd);
 	install_element(ENABLE_NODE, &debug_zebra_nht_cmd);
 	install_element(ENABLE_NODE, &debug_zebra_mpls_cmd);
+	install_element(ENABLE_NODE, &debug_zebra_vxlan_cmd);
 	install_element(ENABLE_NODE, &debug_zebra_pw_cmd);
 	install_element(ENABLE_NODE, &debug_zebra_packet_cmd);
 	install_element(ENABLE_NODE, &debug_zebra_kernel_cmd);
 	install_element(ENABLE_NODE, &debug_zebra_kernel_msgdump_cmd);
 	install_element(ENABLE_NODE, &debug_zebra_rib_cmd);
-	install_element(ENABLE_NODE, &debug_zebra_rib_detailed_cmd);
 	install_element(ENABLE_NODE, &debug_zebra_fpm_cmd);
 	install_element(ENABLE_NODE, &no_debug_zebra_events_cmd);
 	install_element(ENABLE_NODE, &no_debug_zebra_nht_cmd);
 	install_element(ENABLE_NODE, &no_debug_zebra_mpls_cmd);
+	install_element(ENABLE_NODE, &no_debug_zebra_vxlan_cmd);
 	install_element(ENABLE_NODE, &no_debug_zebra_packet_cmd);
 	install_element(ENABLE_NODE, &no_debug_zebra_kernel_cmd);
 	install_element(ENABLE_NODE, &no_debug_zebra_kernel_msgdump_cmd);
 	install_element(ENABLE_NODE, &no_debug_zebra_rib_cmd);
-	install_element(ENABLE_NODE, &no_debug_zebra_rib_detailed_cmd);
 	install_element(ENABLE_NODE, &no_debug_zebra_fpm_cmd);
 
 	install_element(CONFIG_NODE, &debug_zebra_events_cmd);
 	install_element(CONFIG_NODE, &debug_zebra_nht_cmd);
 	install_element(CONFIG_NODE, &debug_zebra_mpls_cmd);
+	install_element(CONFIG_NODE, &debug_zebra_vxlan_cmd);
 	install_element(CONFIG_NODE, &debug_zebra_pw_cmd);
 	install_element(CONFIG_NODE, &debug_zebra_packet_cmd);
 	install_element(CONFIG_NODE, &debug_zebra_kernel_cmd);
 	install_element(CONFIG_NODE, &debug_zebra_kernel_msgdump_cmd);
 	install_element(CONFIG_NODE, &debug_zebra_rib_cmd);
-	install_element(CONFIG_NODE, &debug_zebra_rib_detailed_cmd);
 	install_element(CONFIG_NODE, &debug_zebra_fpm_cmd);
 	install_element(CONFIG_NODE, &no_debug_zebra_events_cmd);
 	install_element(CONFIG_NODE, &no_debug_zebra_nht_cmd);
 	install_element(CONFIG_NODE, &no_debug_zebra_mpls_cmd);
+	install_element(CONFIG_NODE, &no_debug_zebra_vxlan_cmd);
 	install_element(CONFIG_NODE, &no_debug_zebra_packet_cmd);
 	install_element(CONFIG_NODE, &no_debug_zebra_kernel_cmd);
 	install_element(CONFIG_NODE, &no_debug_zebra_kernel_msgdump_cmd);
 	install_element(CONFIG_NODE, &no_debug_zebra_rib_cmd);
-	install_element(CONFIG_NODE, &no_debug_zebra_rib_detailed_cmd);
 	install_element(CONFIG_NODE, &no_debug_zebra_fpm_cmd);
 }