Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

configure.ac

@@ -837,12 +837,7 @@ dnl Determine routing get and set method
 dnl ------------------------------------
 AC_MSG_CHECKING(zebra between kernel interface method)
 if test x"$opsys" = x"gnu-linux"; then
-  if test "${enable_netlink}" = "yes";then
+  if test "${enable_netlink}" = "no"; then
-    AC_MSG_RESULT(netlink)
-    RT_METHOD=rt_netlink.o
-    AC_DEFINE(HAVE_NETLINK,,netlink)
-    netlink=yes
-  elif test "${enable_netlink}" = "no"; then
     AC_MSG_RESULT(ioctl)
     RT_METHOD=rt_ioctl.o
     netlink=no
@@ -851,6 +846,7 @@ if test x"$opsys" = x"gnu-linux"; then
     RT_METHOD=rt_netlink.o
     AC_DEFINE(HAVE_NETLINK,,netlink)
     netlink=yes
+    AC_CHECK_DECLS([IFLA_INFO_SLAVE_KIND], [], [], [#include <linux/if_link.h>])
   fi
 elif test x"$opsys" = x"sol2-6";then
   AC_MSG_RESULT(Route socket)

debian/bgpd.service

@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/bgpd $BGPD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/bgpd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/bgpd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/bgpd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

debian/isisd.service

@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/isisd $ISISD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/bin/touch /var/run/quagga/isisd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/isisd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/isisd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

debian/ospf6d.service

@@ -16,7 +16,6 @@ RestartSec=5
 Restart=on-abnormal
 ExecStart=/usr/lib/quagga/ospf6d $OSPF6D_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b  -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/ospf6d.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospf6d.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospf6d.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

debian/ospfd.service

@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b  -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/ospfd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospfd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospfd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

debian/ospfd@.service

@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ospfd $OSPFD_OPTIONS -n %I
 ExecStartPost=/usr/bin/vtysh -b  -n
-ExecStopPost=-/bin/touch /var/run/quagga/ospfd@%I.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospfd@%I.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ospfd@%I.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

debian/quagga.install

@@ -3,7 +3,6 @@ usr/bin/vtysh
 usr/include/quagga/
 usr/lib/
 tools/quagga-reload.py usr/lib/quagga/
-tools/quagga usr/bin
 usr/share/doc/quagga/
 usr/share/man/man1/vtysh.1
 usr/share/man/man1/quagga.1

debian/ripd.service

@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ripd $RIPD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/ripd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ripd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ripd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

debian/ripngd.service

@@ -17,7 +17,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/ripngd $RIPNGD_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/bin/touch /var/run/quagga/ripngd.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/ripngd.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/ripngd.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

debian/zebra.service

@@ -16,7 +16,6 @@ Restart=on-abnormal
 LimitNOFILE=1024
 ExecStart=/usr/lib/quagga/zebra $ZEBRA_OPTIONS
 ExecStartPost=/usr/bin/vtysh -b -n
-ExecStopPost=-/usr/bin/touch /var/run/quagga/zebra.was_running
 ExecStopPost=-/bin/rm -f /var/run/quagga/zebra.pid
 ExecStopPost=-/bin/rm -f /var/run/quagga/zebra.vty
 ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf

vtysh/vtysh.c

@@ -723,7 +723,15 @@ vtysh_config_from_file (struct vty *vty, FILE *fp)
 		  {
 		    cmd_stat = vtysh_client_execute (&vtysh_client[i],
 						     vty->buf, stdout);
-		    if (cmd_stat != CMD_SUCCESS)
+		    /*
+		     * CMD_WARNING - Can mean that the command was
+		     * parsed successfully but it was already entered
+		     * in a few spots.  As such if we receive a
+		     * CMD_WARNING from a daemon we shouldn't stop
+		     * talking to the other daemons for the particular
+		     * command.
+		     */
+		    if (cmd_stat != CMD_SUCCESS && cmd_stat != CMD_WARNING)
                       {
                         fprintf (stderr, "line %d: Failure to communicate[%d] to %s, line: %s\n",
                                  lineno, cmd_stat, vtysh_client[i].name, vty->buf);

zebra/rt_netlink.c

@@ -654,8 +654,10 @@ netlink_interface (struct sockaddr_nl *snl, struct nlmsghdr *h,
       if (linkinfo[IFLA_INFO_KIND])
         kind = RTA_DATA(linkinfo[IFLA_INFO_KIND]);
 
+#if HAVE_DECL_IFLA_INFO_SLAVE_KIND
       if (linkinfo[IFLA_INFO_SLAVE_KIND])
          slave_kind = RTA_DATA(linkinfo[IFLA_INFO_SLAVE_KIND]);
+#endif
 
       if (kind && strcmp(kind, "vrf") == 0)
         {
@@ -1304,8 +1306,10 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h,
       if (linkinfo[IFLA_INFO_KIND])
         kind = RTA_DATA(linkinfo[IFLA_INFO_KIND]);
 
+#if HAVE_DECL_IFLA_INFO_SLAVE_KIND
       if (linkinfo[IFLA_INFO_SLAVE_KIND])
           slave_kind = RTA_DATA(linkinfo[IFLA_INFO_SLAVE_KIND]);
+#endif
 
       if (kind && strcmp(kind, "vrf") == 0)
         {