]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
6 years agopimd: Convert channel_oil_hash and list into 'struct pim_instance *'
Donald Sharp [Sun, 21 May 2017 12:45:46 +0000 (08:45 -0400)]
pimd: Convert channel_oil_hash and list into 'struct pim_instance *'

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Convert vif and ifindex lookups to use 'struct pim_instance *'
Donald Sharp [Sun, 21 May 2017 12:29:56 +0000 (08:29 -0400)]
pimd: Convert vif and ifindex lookups to use 'struct pim_instance *'

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Move pim_ifchannel_list and vif array into 'struct pim_instance *'
Donald Sharp [Sat, 20 May 2017 18:17:48 +0000 (14:17 -0400)]
pimd: Move pim_ifchannel_list and vif array into 'struct pim_instance *'

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Remove pimg from pim_iface.c
Donald Sharp [Sat, 20 May 2017 17:57:34 +0000 (13:57 -0400)]
pimd: Remove pimg from pim_iface.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Remove pimg from pim_register.c
Donald Sharp [Sat, 20 May 2017 17:54:31 +0000 (13:54 -0400)]
pimd: Remove pimg from pim_register.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Cleanup pim_jp_agg_upstream_verification function
Donald Sharp [Sat, 20 May 2017 17:48:26 +0000 (13:48 -0400)]
pimd: Cleanup pim_jp_agg_upstream_verification function

Do not use pimg, figure out which instance we are in and use that.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Convert pim_rp.c to use 'struct pim_instance *'
Donald Sharp [Sat, 20 May 2017 17:43:58 +0000 (13:43 -0400)]
pimd: Convert pim_rp.c to use 'struct pim_instance *'

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Remove pimg from pim_upstream.c
Donald Sharp [Fri, 19 May 2017 23:36:53 +0000 (19:36 -0400)]
pimd: Remove pimg from pim_upstream.c

Move the upstream_list, hash and wheel into 'struct pim_instance'
Remove all pimg to pim in pim_upstream

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: pim_rp.c -> convert pimg to pim
Donald Sharp [Fri, 19 May 2017 20:41:25 +0000 (16:41 -0400)]
pimd: pim_rp.c -> convert pimg to pim

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Remove pimg from pim_nht.c in totality
Donald Sharp [Fri, 19 May 2017 20:00:00 +0000 (16:00 -0400)]
pimd: Remove pimg from pim_nht.c in totality

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: More refactor for 'struct pim_instance *' for pim_nht.c
Donald Sharp [Fri, 19 May 2017 19:45:51 +0000 (15:45 -0400)]
pimd: More refactor for 'struct pim_instance *' for pim_nht.c

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Add 'struct pim_instance' to find_or_track_nexthop
Donald Sharp [Fri, 19 May 2017 19:40:34 +0000 (15:40 -0400)]
pimd: Add 'struct pim_instance' to find_or_track_nexthop

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Make nexthop cache pim instance aware
Donald Sharp [Fri, 19 May 2017 19:34:40 +0000 (15:34 -0400)]
pimd: Make nexthop cache pim instance aware

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Fix mistake in uplifting to new thread model
Donald Sharp [Fri, 19 May 2017 15:14:28 +0000 (11:14 -0400)]
pimd: Fix mistake in uplifting to new thread model

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Refactor some functions
Donald Sharp [Fri, 19 May 2017 02:53:50 +0000 (22:53 -0400)]
pimd: Refactor some functions

A bunch of functions had return values that were never
checked for ( and not needed ) and opposite return values
for proper calling function boolean logic.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Have pim_if_find_by_vif_index iterate over all vrf's
Donald Sharp [Fri, 19 May 2017 00:11:24 +0000 (20:11 -0400)]
pimd: Have pim_if_find_by_vif_index iterate over all vrf's

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Refactore qpim_static_route_list into pim->static_routes
Donald Sharp [Thu, 18 May 2017 23:56:10 +0000 (19:56 -0400)]
pimd: Refactore qpim_static_route_list into pim->static_routes

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Fix c_oil->pim set spot
Donald Sharp [Thu, 18 May 2017 23:26:49 +0000 (19:26 -0400)]
pimd: Fix c_oil->pim set spot

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Refactor code to be in better spots
Donald Sharp [Thu, 18 May 2017 22:51:31 +0000 (18:51 -0400)]
pimd: Refactor code to be in better spots

1) Create pim_instance.[ch] to allow us to handle the instance information there
2) Refactor some pim_rpf_ and some pim_rp commands into appropriate files and
appropriate includes.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Set c_oil->pim for static routes
Donald Sharp [Thu, 18 May 2017 22:00:49 +0000 (18:00 -0400)]
pimd: Set c_oil->pim for static routes

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: If c_oil->pim is set use that pim instance in pim_mroute.c
Donald Sharp [Thu, 18 May 2017 21:58:40 +0000 (17:58 -0400)]
pimd: If c_oil->pim is set use that pim instance in pim_mroute.c

As a transitory mechanism, if c_oil->pim is set, use that particular
pim instance, else use the default pimg.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Add vrf output to 'interface ...' write command
Donald Sharp [Thu, 18 May 2017 21:25:52 +0000 (17:25 -0400)]
pimd: Add vrf output to 'interface ...' write command

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Fix 'show ip multicast'
Donald Sharp [Thu, 18 May 2017 21:21:18 +0000 (17:21 -0400)]
pimd: Fix 'show ip multicast'

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Modify 'show ip multicast' to be VRF aware
Donald Sharp [Wed, 17 May 2017 19:08:39 +0000 (15:08 -0400)]
pimd: Modify 'show ip multicast' to be VRF aware

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Create the pimreg device name correctly
Donald Sharp [Fri, 19 May 2017 13:14:06 +0000 (09:14 -0400)]
pimd: Create the pimreg device name correctly

The pimreg device name should be based upon the
tableid we create( as that this is what the kernel does )

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Use actual vrf table_id for pim vrf creation
Donald Sharp [Wed, 17 May 2017 20:01:31 +0000 (16:01 -0400)]
pimd: Use actual vrf table_id for pim vrf creation

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Create the pimreg per vrf
Donald Sharp [Wed, 17 May 2017 20:21:33 +0000 (16:21 -0400)]
pimd: Create the pimreg per vrf

6 years agopimd: Create pim_get_pim_instance
Donald Sharp [Mon, 15 May 2017 15:16:14 +0000 (11:16 -0400)]
pimd: Create pim_get_pim_instance

Create function to get the pim instance from the vrf_id

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: pim_mroute_[add|del]_vif become VRF aware
Donald Sharp [Sun, 14 May 2017 18:33:53 +0000 (14:33 -0400)]
pimd: pim_mroute_[add|del]_vif become VRF aware

Make the pim_mroute_[add|del]_vif functions be vrf aware.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Store the pim instance off of the pim interface
Donald Sharp [Sun, 14 May 2017 18:20:17 +0000 (14:20 -0400)]
pimd: Store the pim instance off of the pim interface

Storing the pim instance off of the pim interface will allow
us to easily keep track of vrf information.  This is because
pretty much is everything is interface based.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimg: Actually properly create the pim socket per vrf
Donald Sharp [Thu, 11 May 2017 13:53:45 +0000 (09:53 -0400)]
pimg: Actually properly create the pim socket per vrf

Create the actual pim socket per vrf.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Start cleanup of documentation
Donald Sharp [Thu, 11 May 2017 01:47:26 +0000 (21:47 -0400)]
pimd: Start cleanup of documentation

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Convert upcalls from kernel to use appropriate pim instance
Donald Sharp [Thu, 11 May 2017 01:44:25 +0000 (21:44 -0400)]
pimd: Convert upcalls from kernel to use appropriate pim instance

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Move thread read to struct pim_instance
Donald Sharp [Thu, 11 May 2017 01:34:27 +0000 (21:34 -0400)]
pimd: Move thread read to struct pim_instance

When we are handling the thread read/writes for
a pim mroute socket, make it so that it can
be appropriately handled by the 'struct pim_instance'
instead of defaulting to the default VRF's

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Call code to create appropriate MRT_TABLE
Donald Sharp [Thu, 11 May 2017 00:52:20 +0000 (20:52 -0400)]
pimd: Call code to create appropriate MRT_TABLE

When dealing with vrf's we need to create a table within
the linux kernel to handle the vrf.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Remove unnecessary NULL check
Donald Sharp [Thu, 11 May 2017 00:06:17 +0000 (20:06 -0400)]
pimd: Remove unnecessary NULL check

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Ensure a 0 read fails cleanly
Donald Sharp [Thu, 11 May 2017 00:04:02 +0000 (20:04 -0400)]
pimd: Ensure a 0 read fails cleanly

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Prevent NULL dereference
Donald Sharp [Thu, 11 May 2017 00:00:07 +0000 (20:00 -0400)]
pimd: Prevent NULL dereference

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Error check str2prefix
Donald Sharp [Wed, 10 May 2017 23:54:26 +0000 (19:54 -0400)]
pimd: Error check str2prefix

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Fix unchecked return value
Donald Sharp [Wed, 10 May 2017 23:48:12 +0000 (19:48 -0400)]
pimd: Fix unchecked return value

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Save pim instance on vrf pointer
Donald Sharp [Wed, 10 May 2017 12:50:16 +0000 (08:50 -0400)]
pimd: Save pim instance on vrf pointer

This commit does these things:

1) Saves the pim instance created on the vrf pointer
2) Moves some initialization to the proper spot.
3) Remove vrf_id from 'struct pim_ssm' it is not needed
4) Removes some checks to prevent non-default vrf's from
being created.
5) When creating the pim instance, save default vrf in pimg to allow backwards compatibility

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Modify pim_mroute_socket_[enable|disable] to be vrf aware
Donald Sharp [Wed, 10 May 2017 12:45:25 +0000 (08:45 -0400)]
pimd: Modify pim_mroute_socket_[enable|disable] to be vrf aware

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Use setsockopt_so_recvbuf instead of doing it ourselves
Donald Sharp [Wed, 10 May 2017 12:36:20 +0000 (08:36 -0400)]
pimd: Use setsockopt_so_recvbuf instead of doing it ourselves

This change allows other non-linux platforms to be a bit
more forgiving if we ask for a very very large size.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Start conversion of socket and counters for VRF
Donald Sharp [Wed, 10 May 2017 12:29:52 +0000 (08:29 -0400)]
pimd: Start conversion of socket and counters for VRF

Convert the socket fd to be owned by the pimg pointer as
well as the counters associated with the fd.  This will
allow us to future proof our code.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agopimd: Cleanup use of VRF_DEFAULT to pimg->vrf_id
Donald Sharp [Thu, 4 May 2017 14:59:45 +0000 (10:59 -0400)]
pimd: Cleanup use of VRF_DEFAULT to pimg->vrf_id

Use the appropriate vrf_id instead of always defaulting
to VRF_DEFAULT

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agovtysh: Allow vtysh to pass through vrf commands to pim
Donald Sharp [Mon, 22 May 2017 18:55:47 +0000 (14:55 -0400)]
vtysh: Allow vtysh to pass through vrf commands to pim

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years ago*: fix git-reindent-branch.py reversing order
David Lamparter [Sat, 22 Jul 2017 16:00:44 +0000 (18:00 +0200)]
*: fix git-reindent-branch.py reversing order

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoRevert "*: reindent pt. 2"
David Lamparter [Sat, 22 Jul 2017 12:52:33 +0000 (14:52 +0200)]
Revert "*: reindent pt. 2"

This reverts commit c14777c6bfd0a446c85243d3a9835054a259c276.

clang 5 is not widely available enough for people to indent with.  This
is particularly problematic when rebasing/adjusting branches.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years ago*: add git-reindent-branch.py
David Lamparter [Thu, 20 Jul 2017 17:09:40 +0000 (19:09 +0200)]
*: add git-reindent-branch.py

This tries to heave a branch over the reindentation step.  Somewhat
tested, don't trust it blindly...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #834 from dwalton76/ospf6d-show-crash
David Lamparter [Wed, 19 Jul 2017 20:05:23 +0000 (22:05 +0200)]
Merge pull request #834 from dwalton76/ospf6d-show-crash

ospf6d: crash in ospf6_lsdb_show

6 years agoMerge pull request #835 from dwalton76/lib-route-node-lookup
David Lamparter [Wed, 19 Jul 2017 20:03:36 +0000 (22:03 +0200)]
Merge pull request #835 from dwalton76/lib-route-node-lookup

lib: route_node_lookup() needs to apply_mask() to prefix

6 years agolib: route_node_lookup() needs to apply_mask() to prefix
Daniel Walton [Wed, 19 Jul 2017 16:54:24 +0000 (16:54 +0000)]
lib: route_node_lookup() needs to apply_mask() to prefix

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #828 from tigranmartirosyan/master
Quentin Young [Tue, 18 Jul 2017 16:11:35 +0000 (12:11 -0400)]
Merge pull request #828 from tigranmartirosyan/master

#752 ARP is not updating if mac address changed on remote side

6 years agoAdd 1 more identation to correspond to kernel style multi-line comment
tmartiro [Tue, 18 Jul 2017 16:06:57 +0000 (19:06 +0300)]
Add 1 more identation to correspond to kernel style multi-line comment

6 years agoMerge pull request #833 from dslicenc/cm16779-bgp-startup-ll
Jafar Al-Gharaibeh [Tue, 18 Jul 2017 15:46:03 +0000 (10:46 -0500)]
Merge pull request #833 from dslicenc/cm16779-bgp-startup-ll

bgpd: fix peer startup for labeled-unicast if linklocal address not f…

6 years agoMerge pull request #827 from devicenull/patch-1
Quentin Young [Tue, 18 Jul 2017 15:41:12 +0000 (11:41 -0400)]
Merge pull request #827 from devicenull/patch-1

Add note about bridge limitations

6 years agoMerge pull request #805 from Orange-OpenSource/master
Quentin Young [Tue, 18 Jul 2017 15:34:25 +0000 (11:34 -0400)]
Merge pull request #805 from Orange-OpenSource/master

Add OSPF API and FRR Hacking documents

6 years agoospf6d: crash in ospf6_lsdb_show
Daniel Walton [Tue, 18 Jul 2017 13:19:47 +0000 (13:19 +0000)]
ospf6d: crash in ospf6_lsdb_show

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agobgpd: fix peer startup for labeled-unicast if linklocal address not found
Don Slice [Tue, 18 Jul 2017 12:54:50 +0000 (12:54 +0000)]
bgpd: fix peer startup for labeled-unicast if linklocal address not found

Problem found in testing where ipv6 labeled-unicast prefixes were not received
on the peers if a "service networking restart" was issued.  Same problem would
happen with an ifdown/ifup on the link to the peer.  Found the problem to be
that peers would establish for labeled-unicast even if a link-local address was
not yet available on the interface toward the peer, causing updates to be sent
without a nexthop value. These were then rejected by the peer. Fix is to delay
peer establishment until after the link-local addresses are available.

Ticket: CM-16779
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed By: Donald Sharp <sharpd@cumulusnetworks.com>
Testing Done: Manual testing successful.  Bgp-smoke completed with no new failures

6 years agoreplace space to tabs, add kernel styles multiline, remove trailing whitespaces.
tmartiro [Tue, 18 Jul 2017 07:34:21 +0000 (10:34 +0300)]
replace space to tabs, add kernel styles multiline, remove trailing whitespaces.

6 years ago*: reindent pt. 2
whitespace / reindent [Mon, 17 Jul 2017 19:26:02 +0000 (15:26 -0400)]
*: reindent pt. 2

w/ clang 5

* reflow comments
* struct members go 1 per line
* binpack algo was adjusted

6 years agoAdd note about bridge limitations
devicenull [Mon, 17 Jul 2017 17:04:55 +0000 (13:04 -0400)]
Add note about bridge limitations

Add note that Zebra will never be able to detect the master interface for any interface due to IFLA_INFO_SLAVE_KIND not being defined

6 years agoMerge pull request #826 from qlyoung/rm-vtyoutln
David Lamparter [Mon, 17 Jul 2017 16:37:46 +0000 (18:37 +0200)]
Merge pull request #826 from qlyoung/rm-vtyoutln

eigrpd: remove last vty_outln

6 years agoeigrpd: remove last vty_outln
Quentin Young [Mon, 17 Jul 2017 15:16:03 +0000 (11:16 -0400)]
eigrpd: remove last vty_outln

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agomerge with upstream
tmartiro [Mon, 17 Jul 2017 14:23:20 +0000 (17:23 +0300)]
merge with upstream

6 years ago*: reindent reindent-master-after
whitespace / reindent [Mon, 17 Jul 2017 12:03:14 +0000 (14:03 +0200)]
*: reindent

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years ago*: add indent control files reindent-master-before
David Lamparter [Mon, 17 Jul 2017 12:00:23 +0000 (14:00 +0200)]
*: add indent control files

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #818 from donaldsharp/eigrp_afi
Jafar Al-Gharaibeh [Fri, 14 Jul 2017 17:55:28 +0000 (12:55 -0500)]
Merge pull request #818 from donaldsharp/eigrp_afi

Eigrp afi

6 years agoMerge pull request #820 from opensourcerouting/gcc7
Donald Sharp [Fri, 14 Jul 2017 16:54:40 +0000 (12:54 -0400)]
Merge pull request #820 from opensourcerouting/gcc7

fix new warnings emitted by GCC 7

6 years agoMerge pull request #794 from opensourcerouting/table-hash-ospf6-lsdb-refactor
Donald Sharp [Fri, 14 Jul 2017 16:18:06 +0000 (12:18 -0400)]
Merge pull request #794 from opensourcerouting/table-hash-ospf6-lsdb-refactor

use hash in lib/table, also refactor ospf6 lsdb code

6 years agolib: parser: remove incorrect assert
David Lamparter [Fri, 14 Jul 2017 15:53:59 +0000 (17:53 +0200)]
lib: parser: remove incorrect assert

A {foo|bar|baz} graph node will have more than 1/2 incoming links even
if no other references are left to it (which is what the assert was
previously trying to ensure.)

I don't see a good way to "fix" the assert so I'm just removing it.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #806 from dwalton76/bgpd-set-ipv4-vpn-nexthop
David Lamparter [Fri, 14 Jul 2017 15:37:04 +0000 (17:37 +0200)]
Merge pull request #806 from dwalton76/bgpd-set-ipv4-vpn-nexthop

bgpd: "set ipv4 vpn next-hop 1.1.1.1" is saved/displayed as "set ip vpn next-hop 1.1.1.1"

6 years agotests/ospf6d/test_lsdb: remove vty_outln
David Lamparter [Fri, 14 Jul 2017 15:32:22 +0000 (17:32 +0200)]
tests/ospf6d/test_lsdb: remove vty_outln

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge remote-tracking branch 'frr/master' into table-hash-ospf6-lsdb-refactor
David Lamparter [Fri, 14 Jul 2017 15:30:56 +0000 (17:30 +0200)]
Merge remote-tracking branch 'frr/master' into table-hash-ospf6-lsdb-refactor

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agonhrpd: enable -Werror
David Lamparter [Fri, 14 Jul 2017 14:58:29 +0000 (16:58 +0200)]
nhrpd: enable -Werror

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years ago*: fix GCC 7 warnings/issues
David Lamparter [Fri, 14 Jul 2017 14:48:41 +0000 (16:48 +0200)]
*: fix GCC 7 warnings/issues

The label initializer & nhrpd variable are just to shut up GCC 7,
the other two are actual bugs.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years ago*: fix GCC 7 switch/case fallthrough warnings
David Lamparter [Fri, 14 Jul 2017 14:48:01 +0000 (16:48 +0200)]
*: fix GCC 7 switch/case fallthrough warnings

Need a comment on these.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #803 from opensourcerouting/redhat-doc-fixes-master
Donald Sharp [Fri, 14 Jul 2017 14:59:31 +0000 (10:59 -0400)]
Merge pull request #803 from opensourcerouting/redhat-doc-fixes-master

Redhat doc fixes for master branch

6 years agoMerge pull request #809 from donaldsharp/evpn_plus_struct_attr
Russ White [Fri, 14 Jul 2017 13:36:31 +0000 (09:36 -0400)]
Merge pull request #809 from donaldsharp/evpn_plus_struct_attr

Evpn plus struct attr

6 years agobgpd, zebra: Cleanup warnings from new code
Donald Sharp [Fri, 14 Jul 2017 12:52:45 +0000 (08:52 -0400)]
bgpd, zebra: Cleanup warnings from new code

1) Clean up VTY_NEWLINE -> \n
2) Remove usages of VTY_GET_INTEGER

Signed-off-by: Donald Sharp
6 years agoMerge remote-tracking branch 'origin/master' into evpn_plus_struct_attr
Donald Sharp [Fri, 14 Jul 2017 12:24:46 +0000 (08:24 -0400)]
Merge remote-tracking branch 'origin/master' into evpn_plus_struct_attr

6 years agoMerge remote-tracking branch 'origin/master' into evpn_plus_struct_attr
Donald Sharp [Fri, 14 Jul 2017 12:11:05 +0000 (08:11 -0400)]
Merge remote-tracking branch 'origin/master' into evpn_plus_struct_attr

6 years agobgpd: Disable new EVPN CLI
Donald Sharp [Fri, 14 Jul 2017 12:08:52 +0000 (08:08 -0400)]
bgpd: Disable new EVPN CLI

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #813 from opensourcerouting/newline-redux
Russ White [Fri, 14 Jul 2017 12:00:43 +0000 (08:00 -0400)]
Merge pull request #813 from opensourcerouting/newline-redux

newline redux

6 years agoMerge pull request #762 from bingen/mutiple_nh_recursive_levels
Donald Sharp [Fri, 14 Jul 2017 11:44:02 +0000 (07:44 -0400)]
Merge pull request #762 from bingen/mutiple_nh_recursive_levels

Allow for more than 1 NH recursion level

6 years agoMerge pull request #804 from opensourcerouting/fixes/tests/prng
Donald Sharp [Fri, 14 Jul 2017 11:43:40 +0000 (07:43 -0400)]
Merge pull request #804 from opensourcerouting/fixes/tests/prng

tests: update prng to return better pseudo random numbers

6 years agolib, vtysh: remove now-useless newline arg
David Lamparter [Fri, 14 Jul 2017 11:18:14 +0000 (13:18 +0200)]
lib, vtysh: remove now-useless newline arg

It's always \n now, hooray.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge remote-tracking branch 'frr/master' into newline-redux
David Lamparter [Fri, 14 Jul 2017 11:15:55 +0000 (13:15 +0200)]
Merge remote-tracking branch 'frr/master' into newline-redux

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #799 from dwalton76/bgpd-show-labeled-unicast
Russ White [Fri, 14 Jul 2017 11:12:02 +0000 (07:12 -0400)]
Merge pull request #799 from dwalton76/bgpd-show-labeled-unicast

bgpd: show bgp ipv4 label-unicast does not provide any output

6 years agoMerge pull request #808 from qlyoung/vtysh-termcols
Russ White [Fri, 14 Jul 2017 11:10:13 +0000 (07:10 -0400)]
Merge pull request #808 from qlyoung/vtysh-termcols

lib, vtysh: pretty-print variable autocompletions

6 years ago*: remove vty_outln again
David Lamparter [Fri, 14 Jul 2017 11:09:47 +0000 (13:09 +0200)]
*: remove vty_outln again

(PRs merged to master added another few vty_outln() calls)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge remote-tracking branch 'frr/master' into newline-redux
David Lamparter [Fri, 14 Jul 2017 11:07:30 +0000 (13:07 +0200)]
Merge remote-tracking branch 'frr/master' into newline-redux

Lots of conflicts from CMD_WARNING_CONFIG_FAILED...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #800 from qlyoung/fix-old-vpn-commands
Russ White [Fri, 14 Jul 2017 10:53:34 +0000 (06:53 -0400)]
Merge pull request #800 from qlyoung/fix-old-vpn-commands

bgpd: fix old-style vpn commands

6 years agoMerge pull request #815 from dwalton76/CMD_WARNING_take2
Russ White [Fri, 14 Jul 2017 10:24:01 +0000 (06:24 -0400)]
Merge pull request #815 from dwalton76/CMD_WARNING_take2

vtysh: return non-zero for configuration failures

6 years agoMerge pull request #817 from donaldsharp/babel_redist
Russ White [Fri, 14 Jul 2017 10:20:54 +0000 (06:20 -0400)]
Merge pull request #817 from donaldsharp/babel_redist

babeld: Allow babel to redistribute v6 routes

6 years agoMerge pull request #814 from qlyoung/vtysh-password-commands
David Lamparter [Fri, 14 Jul 2017 08:24:22 +0000 (10:24 +0200)]
Merge pull request #814 from qlyoung/vtysh-password-commands

vtysh: fixup password commands

6 years ago*: remove VTYNL, part 6 of 6
David Lamparter [Thu, 13 Jul 2017 18:17:06 +0000 (20:17 +0200)]
*: remove VTYNL, part 6 of 6

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years ago*: remove VTYNL, part 5 of 6
David Lamparter [Thu, 13 Jul 2017 17:50:33 +0000 (19:50 +0200)]
*: remove VTYNL, part 5 of 6

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years ago*: remove VTYNL, part 4 of 6
David Lamparter [Thu, 13 Jul 2017 17:42:42 +0000 (19:42 +0200)]
*: remove VTYNL, part 4 of 6

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years ago*: remove VTYNL, part 3 of 6
David Lamparter [Thu, 13 Jul 2017 17:20:20 +0000 (19:20 +0200)]
*: remove VTYNL, part 3 of 6

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>