Merge branch 'master' into pim-ssm

bgpd/bgp_vty.c

@@ -806,7 +806,7 @@ DEFUN (no_auto_summary,
 }
 
 /* "router bgp" commands. */
-DEFUN (router_bgp,
+DEFUN_NOSH (router_bgp,
        router_bgp_cmd,
        "router bgp [(1-4294967295) [<view|vrf> WORD]]",
        ROUTER_STR
@@ -5647,7 +5647,7 @@ DEFUN (no_neighbor_addpath_tx_bestpath_per_as,
 				 PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS);
 }
 
-DEFUN (address_family_ipv4_safi,
+DEFUN_NOSH (address_family_ipv4_safi,
        address_family_ipv4_safi_cmd,
        "address-family ipv4 [<unicast|multicast|vpn|encap>]",
        "Enter Address Family command mode\n"
@@ -5680,7 +5680,7 @@ DEFUN (address_family_ipv4_safi,
   return CMD_SUCCESS;
 }
 
-DEFUN (address_family_ipv6_safi,
+DEFUN_NOSH (address_family_ipv6_safi,
        address_family_ipv6_safi_cmd,
        "address-family ipv6 [<unicast|multicast|vpn|encap>]",
        "Enter Address Family command mode\n"
@@ -5714,7 +5714,7 @@ DEFUN (address_family_ipv6_safi,
 }
 
 #ifdef KEEP_OLD_VPN_COMMANDS
-DEFUN (address_family_vpnv4,
+DEFUN_NOSH (address_family_vpnv4,
        address_family_vpnv4_cmd,
        "address-family vpnv4 [unicast]",
        "Enter Address Family command mode\n"
@@ -5725,7 +5725,7 @@ DEFUN (address_family_vpnv4,
   return CMD_SUCCESS;
 }
 
-DEFUN (address_family_vpnv6,
+DEFUN_NOSH (address_family_vpnv6,
        address_family_vpnv6_cmd,
        "address-family vpnv6 [unicast]",
        "Enter Address Family command mode\n"
@@ -5737,7 +5737,7 @@ DEFUN (address_family_vpnv6,
 }
 #endif
 
-DEFUN (address_family_encap,
+DEFUN_NOSH (address_family_encap,
        address_family_encap_cmd,
        "address-family <encap|encapv4>",
        "Enter Address Family command mode\n"
@@ -5749,7 +5749,7 @@ DEFUN (address_family_encap,
 }
 
 
-DEFUN (address_family_encapv6,
+DEFUN_NOSH (address_family_encapv6,
        address_family_encapv6_cmd,
        "address-family encapv6",
        "Enter Address Family command mode\n"
@@ -5759,7 +5759,7 @@ DEFUN (address_family_encapv6,
   return CMD_SUCCESS;
 }
 
-DEFUN (address_family_evpn,
+DEFUN_NOSH (address_family_evpn,
        address_family_evpn_cmd,
        "address-family <l2vpn evpn>",
        "Enter Address Family command mode\n"
@@ -5771,7 +5771,7 @@ DEFUN (address_family_evpn,
   return CMD_SUCCESS;
 }
 
-DEFUN (exit_address_family,
+DEFUN_NOSH (exit_address_family,
        exit_address_family_cmd,
        "exit-address-family",
        "Exit from Address Family configuration mode\n")

bgpd/rfapi/bgp_rfapi_cfg.c

@@ -323,7 +323,7 @@ DEFUN (vnc_advertise_un_method,
  *-----------------------------------------------------------------------*/
 
 
-DEFUN (vnc_defaults,
+DEFUN_NOSH (vnc_defaults,
        vnc_defaults_cmd,
        "vnc defaults", VNC_CONFIG_STR "Configure default NVE group\n")
 {
@@ -2419,7 +2419,7 @@ vnc_routemap_event (route_map_event_t type,     /* ignored */
  *-----------------------------------------------------------------------*/
 
 
-DEFUN (vnc_nve_group,
+DEFUN_NOSH (vnc_nve_group,
        vnc_nve_group_cmd,
        "vnc nve-group NAME",
        VNC_CONFIG_STR "Configure a NVE group\n" "Group name\n")
@@ -3223,7 +3223,7 @@ DEFUN (vnc_nve_group_responselifetime,
  * with the lack of rigorous level control in the command handler. 
  * TBD fix command handler.
  */
-DEFUN (exit_vnc,
+DEFUN_NOSH (exit_vnc,
        exit_vnc_cmd,
        "exit-vnc",
        "Exit VNC configuration mode\n")
@@ -3255,7 +3255,7 @@ static struct cmd_node bgp_vnc_nve_group_node = {
  * Note there are two types of NVEs, one for VPNs one for RFP NVEs
  *-----------------------------------------------------------------------*/
 
-DEFUN (vnc_vrf_policy,
+DEFUN_NOSH (vnc_vrf_policy,
        vnc_vrf_policy_cmd,
        "vrf-policy NAME",
        "Configure a VRF policy group\n"
@@ -3720,7 +3720,7 @@ DEFUN (vnc_vrf_policy_rd,
   return CMD_SUCCESS;
 }
 
-DEFUN (exit_vrf_policy,
+DEFUN_NOSH (exit_vrf_policy,
        exit_vrf_policy_cmd,
        "exit-vrf-policy",
        "Exit VRF policy configuration mode\n")
@@ -3743,7 +3743,7 @@ static struct cmd_node bgp_vrf_policy_node = {
  *-----------------------------------------------------------------------*/
 
 
-DEFUN (vnc_l2_group,
+DEFUN_NOSH (vnc_l2_group,
        vnc_l2_group_cmd,
        "vnc l2-group NAME",
        VNC_CONFIG_STR "Configure a L2 group\n" "Group name\n")

doc/Building_FRR_on_CentOS6.md

@@ -18,7 +18,7 @@ Add packages:
 
     sudo yum install git autoconf automake libtool make gawk readline-devel \
       texinfo net-snmp-devel groff pkgconfig json-c-devel pam-devel \
-      flex pytest
+      flex c-ares-devel epel-release
 
 Install newer version of bison (CentOS 6 package source is too old) from 
 CentOS 7
@@ -48,16 +48,16 @@ Install newer version of autoconf and automake (Package versions are too old)
 
 Install `Python 2.7` in parallel to default 2.6 (needed for `make check` to 
 run unittests). 
-Pick correct EPEL based on CentOS version used. Then install current `pytest`
+Make sure you've install EPEL (`epel-release` as above). Then install current 
+`python2.7` and `pytest`
 
-    rpm -ivh http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
     rpm -ivh https://centos6.iuscommunity.org/ius-release.rpm
-    yum install python27 python27-pip
+    yum install python27 python27-devel python27-pip 
     pip2.7 install pytest
 
 Please note that `CentOS 6` needs to keep python pointing to version 2.6 
 for `yum` to keep working, so don't create a symlink for python2.7 to python
-    
+
 Get FRR, compile it and install it (from Git)
 ---------------------------------------------
 
@@ -80,7 +80,6 @@ them if you are not building on a x86_64 architecture
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     ./configure \
         --sysconfdir=/etc/frr \

doc/Building_FRR_on_CentOS7.md

@@ -10,12 +10,16 @@ CentOS 7 restrictions:
 
 Install required packages
 -------------------------
-        
+
 Add packages:
 
     sudo yum install git autoconf automake libtool make gawk readline-devel \
       texinfo net-snmp-devel groff pkgconfig json-c-devel pam-devel \
-      bison flex pytest
+      bison flex pytest c-ares-devel python-devel
+
+To build from git (in difference to building from distribution tar.gz as created by `make dist`), the python development libraries are needed. (Make sure you've installed EPEL libraries as shown above for this to work)
+
+    yum install python34-devel
 
 Get FRR, compile it and install it (from Git)
 ---------------------------------------------
@@ -39,7 +43,6 @@ them if you are not building on a x86_64 architecture
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     ./configure \
         --sysconfdir=/etc/frr \

doc/Building_FRR_on_Debian8.md

@@ -10,12 +10,12 @@ Debian 8 restrictions:
 
 Install required packages
 -------------------------
-        
+
 Add packages:
 
     sudo apt-get install git autoconf automake libtool make gawk \
        libreadline-dev texinfo libjson-c-dev pkg-config bison flex \
-       python-pip
+       python-pip libc-ares-dev python3-dev
 
 Install newer pytest (>3.0) from pip    
 
@@ -41,7 +41,6 @@ an example.)
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     ./configure \
         --enable-exampledir=/usr/share/doc/frr/examples/ \

doc/Building_FRR_on_Fedora24.md

@@ -8,7 +8,8 @@ Add packages:
 
     sudo dnf install git autoconf automake libtool make gawk \
        readline-devel texinfo net-snmp-devel groff pkgconfig \
-       json-c-devel pam-devel perl-XML-LibXML pytest
+       json-c-devel pam-devel perl-XML-LibXML c-ares-devel \
+       python3-devel
 
 Get FRR, compile it and install it (from Git)
 ---------------------------------------------
@@ -32,7 +33,6 @@ them if you are not building on a x86_64 architecture
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     ./configure \
         --sysconfdir=/etc/frr \

doc/Building_FRR_on_FreeBSD10.md

@@ -16,7 +16,7 @@ Add packages:
 install and asked)  
 
     pkg install git autoconf automake libtool gmake gawk json-c pkgconf \
-        bison flex py27-pytest
+        bison flex py27-pytest c-ares python3
 
 Make sure there is no /usr/bin/flex preinstalled (and use the newly 
 installed in /usr/local/bin):
@@ -43,7 +43,6 @@ an example)
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     export MAKE=gmake
     export LDFLAGS="-L/usr/local/lib"

doc/Building_FRR_on_FreeBSD11.md

@@ -16,7 +16,7 @@ Add packages:
 install and asked)  
 
     pkg install git autoconf automake libtool gmake gawk json-c pkgconf \
-        bison flex py27-pytest
+        bison flex py27-pytest c-ares python3
 
 Make sure there is no /usr/bin/flex preinstalled (and use the newly 
 installed in /usr/local/bin):
@@ -43,7 +43,6 @@ an example)
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     export MAKE=gmake
     export LDFLAGS="-L/usr/local/lib"

doc/Building_FRR_on_FreeBSD9.md

@@ -16,7 +16,8 @@ Add packages:
 install and asked)  
 
     pkg install -y git autoconf automake libtool gmake gawk \
-        pkgconf texinfo json-c bison flex py27-pytest
+        pkgconf texinfo json-c bison flex py27-pytest c-ares \
+        python3
 
 Make sure there is no /usr/bin/flex preinstalled (and use the newly
 installed in /usr/local/bin):
@@ -25,6 +26,13 @@ takes preference in path)
 
     rm -f /usr/bin/flex
 
+For building with clang (instead of gcc), upgrade clang from 3.4 default to 3.6 *This is needed to build FreeBSD packages as well - for packages clang is default* (Clang 3.4 as shipped with FreeBSD 9 crashes during compile)
+
+    pkg install clang36
+    pkg delete clang34
+    mv /usr/bin/clang /usr/bin/clang34
+    ln -s /usr/local/bin/clang36 /usr/bin/clang
+
 Get FRR, compile it and install it (from Git)
 ---------------------------------------------
 
@@ -43,7 +51,6 @@ an example)
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     export MAKE=gmake
     export LDFLAGS="-L/usr/local/lib"

doc/Building_FRR_on_NetBSD6.md

@@ -18,7 +18,7 @@ Configure Package location:
 Add packages:
 
     sudo pkg_add git autoconf automake libtool gmake gawk openssl \
-       pkg-config json-c p5-XML-LibXML python27 py27-test
+       pkg-config json-c p5-XML-LibXML python27 py27-test python35
 
 Install SSL Root Certificates (for git https access):
 
@@ -47,7 +47,6 @@ an example)
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     MAKE=gmake
     export LDFLAGS="-L/usr/pkg/lib -R/usr/pkg/lib"

doc/Building_FRR_on_NetBSD7.md

@@ -12,7 +12,7 @@ Install required packages
 -------------------------
 
     sudo pkgin install git autoconf automake libtool gmake gawk openssl \
-       pkg-config json-c p5-XML-LibXML python27 py27-test
+       pkg-config json-c p5-XML-LibXML python27 py27-test python35
 
 Install SSL Root Certificates (for git https access):
 
@@ -41,7 +41,6 @@ an example)
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     MAKE=gmake
     export LDFLAGS="-L/usr/pkg/lib -R/usr/pkg/lib"

doc/Building_FRR_on_OmniOS.md

@@ -41,7 +41,7 @@ Add additional Solaris packages:
     /opt/csw/bin/pkgutil -y -i texinfo
     /opt/csw/bin/pkgutil -y -i perl
     /opt/csw/bin/pkgutil -y -i libjson_c_dev
-    /opt/csw/bin/pkgutil -y -i python27 py_pip
+    /opt/csw/bin/pkgutil -y -i python27 py_pip python27_dev
 
 Add libjson to Solaris equivalent of ld.so.conf
 
@@ -61,7 +61,7 @@ Select Python 2.7 as default (required for pytest)
 
     rm -f /usr/bin/python
     ln -s /opt/csw/bin/python2.7 /usr/bin/python
-        
+
 Fix PATH for all users and non-interactive sessions. Edit `/etc/default/login`
 and add the following default PATH:
 
@@ -89,11 +89,11 @@ an example)
 
     git clone https://github.com/freerangerouting/frr.git frr
     cd frr
-    git checkout stable/2.0
     ./bootstrap.sh
     export MAKE=gmake
     export LDFLAGS="-L/opt/csw/lib"
     export CPPFLAGS="-I/opt/csw/include"
+    export PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig
     ./configure \
         --sysconfdir=/etc/frr \
         --enable-exampledir=/usr/share/doc/frr/examples/ \