From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 18 Oct 2018 12:13:38 +0000 (-0400)
Subject: eigrpd: Convert keychain authentication to DEFPY
X-Git-Tag: frr-7.1-dev~237^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=085fc3446d5c3325b26674344484ae754f9545c1;p=matthieu%2Ffrr.git

eigrpd: Convert keychain authentication to DEFPY

The keychain authentication code under eigrp was
using the wrong argv numbers for keychain lookup.  Convert
to DEFPY.

I do not actually know if this allows eigrp authentication to
work.  But this connects up a bit more of the pieces if it does.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c
index 311fbce4ab..44b6254b31 100644
--- a/eigrpd/eigrp_vty.c
+++ b/eigrpd/eigrp_vty.c
@@ -55,6 +55,10 @@
 #include "eigrpd/eigrp_dump.h"
 #include "eigrpd/eigrp_const.h"
 
+#ifndef VTYSH_EXTRACT_PL
+#include "eigrpd/eigrp_vty_clippy.c"
+#endif
+
 static int config_write_network(struct vty *vty, struct eigrp *eigrp)
 {
 	struct route_node *rn;
@@ -975,9 +979,10 @@ DEFUN (no_eigrp_authentication_mode,
 	return CMD_SUCCESS;
 }
 
-DEFUN (eigrp_authentication_keychain,
+DEFPY (eigrp_authentication_keychain,
        eigrp_authentication_keychain_cmd,
-       "ip authentication key-chain eigrp (1-65535) WORD",
+       "[no] ip authentication key-chain eigrp (1-65535)$as WORD$name",
+       NO_STR
        "Interface Internet Protocol config commands\n"
        "Authentication subcommands\n"
        "Key-chain\n"
@@ -1001,52 +1006,29 @@ DEFUN (eigrp_authentication_keychain,
 		return CMD_SUCCESS;
 	}
 
-	keychain = keychain_lookup(argv[4]->arg);
+	if (no) {
+		if ((ei->params.auth_keychain != NULL)
+		    && (strcmp(ei->params.auth_keychain, name) == 0)) {
+			free(ei->params.auth_keychain);
+			ei->params.auth_keychain = NULL;
+		} else
+			vty_out(vty,
+				"Key chain with specified name not configured on interface\n");
+		return CMD_SUCCESS;
+	}
+
+	keychain = keychain_lookup(name);
 	if (keychain != NULL) {
 		if (ei->params.auth_keychain) {
 			free(ei->params.auth_keychain);
 			ei->params.auth_keychain = strdup(keychain->name);
 		} else
 			ei->params.auth_keychain = strdup(keychain->name);
-	} else
-		vty_out(vty, "Key chain with specified name not found\n");
-
-	return CMD_SUCCESS;
-}
-
-DEFUN (no_eigrp_authentication_keychain,
-       no_eigrp_authentication_keychain_cmd,
-       "no ip authentication key-chain eigrp (1-65535) WORD",
-       "Disable\n"
-       "Interface Internet Protocol config commands\n"
-       "Authentication subcommands\n"
-       "Key-chain\n"
-       "Enhanced Interior Gateway Routing Protocol (EIGRP)\n"
-       "Autonomous system number\n"
-       "Name of key-chain\n")
-{
-	VTY_DECLVAR_CONTEXT(interface, ifp);
-	struct eigrp_interface *ei = ifp->info;
-	struct eigrp *eigrp;
-
-	eigrp = eigrp_lookup();
-	if (eigrp == NULL) {
-		vty_out(vty, "EIGRP Routing Process not enabled\n");
-		return CMD_SUCCESS;
-	}
-
-	if (!ei) {
-		vty_out(vty, " EIGRP not configured on this interface\n");
-		return CMD_SUCCESS;
-	}
-
-	if ((ei->params.auth_keychain != NULL)
-	    && (strcmp(ei->params.auth_keychain, argv[5]->arg) == 0)) {
-		free(ei->params.auth_keychain);
-		ei->params.auth_keychain = NULL;
-	} else
+	} else {
 		vty_out(vty,
-			"Key chain with specified name not configured on interface\n");
+			"Key chain with specified name not found\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
 	return CMD_SUCCESS;
 }
@@ -1538,7 +1520,6 @@ void eigrp_vty_if_init(void)
 	install_element(INTERFACE_NODE, &eigrp_authentication_mode_cmd);
 	install_element(INTERFACE_NODE, &no_eigrp_authentication_mode_cmd);
 	install_element(INTERFACE_NODE, &eigrp_authentication_keychain_cmd);
-	install_element(INTERFACE_NODE, &no_eigrp_authentication_keychain_cmd);
 
 	/*EIGRP Summarization commands*/
 	install_element(INTERFACE_NODE, &eigrp_ip_summary_address_cmd);
diff --git a/eigrpd/subdir.am b/eigrpd/subdir.am
index bc48173bba..86061b3ae3 100644
--- a/eigrpd/subdir.am
+++ b/eigrpd/subdir.am
@@ -44,6 +44,9 @@ eigrpdheader_HEADERS = \
 	eigrpd/eigrpd.h \
 	# end
 
+eigrpd/eigrp_vty_clippy.c: $(CLIPPY_DEPS)
+eigrpd/eigrp_vty.$(OBJEXT): eigrpd/eigrp_vty_clippy.c
+
 noinst_HEADERS += \
 	eigrpd/eigrp_const.h \
 	eigrpd/eigrp_errors.h \