From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 6 Apr 2017 00:52:32 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into EIGRP
X-Git-Tag: reindent-master-before~197^2~17
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=97133f79155933685f6f839072d9d92a804a37dd;p=matthieu%2Ffrr.git

Merge remote-tracking branch 'origin/master' into EIGRP
---

97133f79155933685f6f839072d9d92a804a37dd
diff --cc lib/Makefile.am
index 55b1eb8044,75947e6146..c4989c73c9
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -32,7 -32,9 +32,10 @@@ libfrr_la_SOURCES = 
  	libfrr.c \
  	strlcpy.c \
  	strlcat.c \
 +	sha256.c
+ 	module.c \
+ 	hook.c \
+ 	# end
  
  BUILT_SOURCES = route_types.h gitversion.h command_parse.h command_lex.h
  
@@@ -55,8 -71,9 +72,10 @@@ pkginclude_HEADERS = 
  	monotime.h \
  	spf_backoff.h \
  	srcdest_table.h \
+ 	module.h \
+ 	hook.h \
  	libfrr.h \
 +	sha256.h \
  	# end
  
  noinst_HEADERS = \
diff --cc vtysh/extract.pl.in
index 4dddb809a0,5510482485..169220c772
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@@ -139,10 -82,10 +82,10 @@@ foreach (@ARGV) 
              $protocol = "VTYSH_RIPD";
          }
          elsif ($file =~ /lib\/routemap\.c$/) {
--            $protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD";
++            $protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_EIGRPD";
          }
          elsif ($file =~ /lib\/vrf\.c$/) {
--            $protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA";
++            $protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_EIGRPD";
          }
          elsif ($file =~ /lib\/filter\.c$/) {
              $protocol = "VTYSH_ALL";
@@@ -154,7 -97,7 +97,7 @@@
              if ($defun_array[1] =~ m/ipv6/) {
                  $protocol = "VTYSH_RIPNGD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA";
              } else {
--                $protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD";
++                $protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_EIGRPD";
              }
          }
          elsif ($file =~ /lib\/distribute\.c$/) {
diff --cc vtysh/vtysh.c
index afb742d903,d0038ea3cf..0473b244a7
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@@ -1837,7 -1799,7 +1837,7 @@@ DEFUNSH (VTYSH_INTERFACE
  }
  
  /* TODO Implement "no interface command in isisd. */
- DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_EIGRPD|VTYSH_LDPD,
 -DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D,
++DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_EIGRPD,
         vtysh_no_interface_cmd,
         "no interface IFNAME",
         NO_STR
@@@ -1921,8 -1883,8 +1921,8 @@@ DEFUNSH (VTYSH_VRF
  
  /* TODO Implement interface description commands in ripngd, ospf6d
   * and isisd. */
- DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD|VTYSH_EIGRPD|VTYSH_LDPD,
 -DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD,
--       vtysh_interface_desc_cmd,
++DEFSH (VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_OSPFD|VTYSH_EIGRPD,
++      vtysh_interface_desc_cmd,
         "description LINE...",
         "Interface specific description\n"
         "Characters describing this interface\n")
diff --cc vtysh/vtysh.h
index 11b678fe4d,6d9e21d8a0..ad45abcdf3
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@@ -43,9 -42,9 +43,9 @@@ DECLARE_MGROUP(MVTYSH
  /* watchfrr is not in ALL since library CLI functions should not be
   * run on it (logging & co. should stay in a fixed/frozen config, and
   * things like prefix lists are not even initialised) */
 -#define VTYSH_ALL	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD
 +#define VTYSH_ALL	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD
  #define VTYSH_RMAP	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_PIMD
- #define VTYSH_INTERFACE	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD
 -#define VTYSH_INTERFACE	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD
++#define VTYSH_INTERFACE	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD
  #define VTYSH_NS          VTYSH_ZEBRA
  #define VTYSH_VRF	  VTYSH_ZEBRA