From: Abhinay Ramesh <rabhinay@vmware.com>
Date: Tue, 11 May 2021 12:50:05 +0000 (+0000)
Subject: ospf6d: support keychain for ospf6 authentication
X-Git-Tag: pim6-testing-20220430~332^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b25bd2ad6e1a5eb087bc1a12dfb1f6eb50a762f6;p=matthieu%2Ffrr.git

ospf6d: support keychain for ospf6 authentication

Problem Statement:
==================
As of now there is no support for ospf6 authentication.
To support ospf6 authentication need to have keychain support for
managing the auth key. 
 
RCA:
====
New support
 
Fix:
====
Enabling keychain for ospf6 authentication feature.
 
Risk:
=====
Low risk
 
Tests Executed:
===============
Have verified the support for ospf6 auth trailer feature.

Signed-off-by: Abhinay Ramesh <rabhinay@vmware.com>
---

diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 165a764c38..120f307adc 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -20,6 +20,7 @@
 
 #include <zebra.h>
 #include <lib/version.h>
+#include <lib/keychain.h>
 #include <stdlib.h>
 
 #include "getopt.h"
@@ -223,6 +224,7 @@ int main(int argc, char *argv[], char *envp[])
 	/* thread master */
 	master = om6->master;
 
+	keychain_init();
 	ospf6_vrf_init();
 	access_list_init();
 	prefix_list_init();
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 334bd7affa..c2b4e779de 100755
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -91,7 +91,7 @@ sub scan_file {
 
         # $protocol is VTYSH_PROTO format for redirection of user input
         if ($file =~ /lib\/keychain\.c$/) {
-            $protocol = "VTYSH_RIPD|VTYSH_EIGRPD";
+            $protocol = "VTYSH_RIPD|VTYSH_EIGRPD|VTYSH_OSPF6D";
         }
         elsif ($file =~ /lib\/routemap\.c$/ || $file =~ /lib\/routemap_cli\.c$/) {
             $protocol = "VTYSH_RMAP";
diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h
index e56d482da2..66af248354 100644
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@ -57,7 +57,7 @@ DECLARE_MGROUP(MVTYSH);
 #define VTYSH_RMAP	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_FABRICD
 #define VTYSH_INTERFACE	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_PBRD|VTYSH_FABRICD|VTYSH_VRRPD
 #define VTYSH_VRF	  VTYSH_INTERFACE|VTYSH_STATICD
-#define VTYSH_KEYS        VTYSH_RIPD|VTYSH_EIGRPD
+#define VTYSH_KEYS VTYSH_RIPD | VTYSH_EIGRPD | VTYSH_OSPF6D
 /* Daemons who can process nexthop-group configs */
 #define VTYSH_NH_GROUP    VTYSH_PBRD|VTYSH_SHARPD
 #define VTYSH_SR          VTYSH_ZEBRA|VTYSH_PATHD