]>
git.puffer.fish Git - matthieu/frr.git/log
vivek [Mon, 15 May 2017 21:28:38 +0000 (14:28 -0700)]
bgpd: Fixes related to use of L2VPN/EVPN
Add checks related to AFI_L2VPN/SAFI_EVPN that were missing in some parts
of the code. Fix incorrect check skipping EVPN when sending End of RIB.
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
vivek [Wed, 24 May 2017 06:08:09 +0000 (23:08 -0700)]
bgpd: Fix route handling for 2-level routing tables
For certain (sub) address families such as EVPN or L3VPN, the routing
table is organized as a 2-level tree. Ensure that code walking the
routing table does the correct handling in such cases.
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
vivek [Wed, 24 May 2017 05:52:53 +0000 (22:52 -0700)]
bgpd: Fix route detailed show for EVPN
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:28:32 +0000 (22:28 -0700)]
zebra: Format netlink requests correctly
When zebra issues read (GET) requests to the kernel using the netlink
interface, it is incorrect to format all of them in a generic manner
using 'struct ifinfomsg' or 'struct rtgenmsg'. Rather, messages for a
particular entity (e.g., routes) should use the corresponding structure
for encoding (e.g., 'struct rtmsg'). Of course, this has to correlate
with what the kernel expects.
In the absence of this, there is the possibility of sending extraneous
information in the request which the kernel wouldn't like.
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: David Ahern <dsa@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:27:55 +0000 (22:27 -0700)]
zebra: Set nlmsg_pid in netlink_talk()
While it is not essential to set this, it seems a good thing to do.
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:27:10 +0000 (22:27 -0700)]
zebra: New API for filling netlink attribute
Define addattr16().
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:20:33 +0000 (22:20 -0700)]
lib: Refine EVPN prefix definition
Modify EVPN prefix to use the generic IP address structure. Add support
for EVPN type-2 and type-3 prefix dump. Fix references to modified fields
as needed.
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:19:43 +0000 (22:19 -0700)]
lib: Define generic IP address structure
Define an IP address structure which is a union of an IPv4 and IPv6
address. This is for subsequent use in EVPN.
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:18:26 +0000 (22:18 -0700)]
lib: Additional APIs in bitfield library
Added APIs to:
a) pre-assign 0th bit in the bitfield
b) free 0th bit in the bitfield
c) free the allocated bitfield data
Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:17:45 +0000 (22:17 -0700)]
lib: Macro for number of entries in hash table
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:16:55 +0000 (22:16 -0700)]
lib: VxLAN Network Identifier definition
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
vivek [Mon, 15 May 2017 05:15:26 +0000 (22:15 -0700)]
lib: VLAN definition
Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Jafar Al-Gharaibeh [Thu, 25 May 2017 04:10:19 +0000 (22:10 -0600)]
Merge pull request #610 from donaldsharp/rpprefixlen
pimd: Allow secondary address comparisons to work
Donald Sharp [Wed, 24 May 2017 15:22:35 +0000 (11:22 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'
Donald Sharp [Wed, 24 May 2017 15:04:53 +0000 (11:04 -0400)]
Merge pull request #612 from LabNConsulting/working/master/patch-set/deprecateEncap
master: remove support for config & show of encap safi
Donald Sharp [Wed, 24 May 2017 15:04:36 +0000 (11:04 -0400)]
Merge pull request #611 from LabNConsulting/working/3.0/patch-set/deprecateEncap
3.0: remove support for config & show of encap safi
Lou Berger [Tue, 23 May 2017 19:34:43 +0000 (15:34 -0400)]
bgpd: remove encap safi vty related files bgp_encap.h|c
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:15:45 +0000 (15:15 -0400)]
bgpd: remove encap_safi rx processing
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:11:30 +0000 (15:11 -0400)]
bgpd: remove encap safi show commands
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:58:10 +0000 (15:58 -0400)]
bgpd: remove additional instance of BGP_ENCAP(v6)_NODE
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:02:31 +0000 (15:02 -0400)]
bgpd rfapi: remove ability to configure use of encap-safi (continue to use encap attribute)
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:01:54 +0000 (15:01 -0400)]
bgpd: remove support for ipv4|6 encap safi config
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:01:09 +0000 (15:01 -0400)]
vtysh: remove BGP_ENCAP(V6)_NODE
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:00:53 +0000 (15:00 -0400)]
lib: remove BGP_ENCAP(V6)_NODE
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:34:43 +0000 (15:34 -0400)]
bgpd: remove encap safi vty related files bgp_encap.h|c
Signed-off-by: Lou Berger <lberger@labn.net>
Donald Sharp [Tue, 23 May 2017 18:50:45 +0000 (14:50 -0400)]
pimd: Allow secondary address comparisons to work
The secondary address comparison done to determine if we are
an RP for a specified address was comparing A.B.C.D/32 to A.B.C.D/0
because when we created the rp_info we were not setting the prefixlen
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Lou Berger [Tue, 23 May 2017 19:15:45 +0000 (15:15 -0400)]
bgpd: remove encap_safi rx processing
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:11:30 +0000 (15:11 -0400)]
bgpd: remove encap safi show commands
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:02:31 +0000 (15:02 -0400)]
bgpd rfapi: remove ability to configure use of encap-safi (continue to use encap attribute)
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:01:54 +0000 (15:01 -0400)]
bgpd: remove support for ipv4|6 encap safi config
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:01:09 +0000 (15:01 -0400)]
vtysh: remove BGP_ENCAP(V6)_NODE
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Tue, 23 May 2017 19:00:53 +0000 (15:00 -0400)]
lib: remove BGP_ENCAP(V6)_NODE
Signed-off-by: Lou Berger <lberger@labn.net>
Donald Sharp [Tue, 23 May 2017 15:42:11 +0000 (11:42 -0400)]
Merge pull request #598 from donaldsharp/to_3.0
To 3.0
David Lamparter [Mon, 22 May 2017 15:46:48 +0000 (17:46 +0200)]
Merge pull request #593 from qlyoung/fix-nhrpd-acl-3.0
nhrpd: install access-list commands
David Lamparter [Mon, 22 May 2017 15:45:55 +0000 (17:45 +0200)]
Merge pull request #591 from qlyoung/ospf-df-areaid-3.0
ospfd: remember format for ospf area id
David Lamparter [Mon, 22 May 2017 15:45:29 +0000 (17:45 +0200)]
Merge pull request #582 from qlyoung/ospf6-df-areaid
ospf6d: remember format for ospf6 area id
David Lamparter [Mon, 22 May 2017 15:44:33 +0000 (17:44 +0200)]
Merge pull request #581 from donaldsharp/zebra
Zebra
David Lamparter [Mon, 22 May 2017 15:40:26 +0000 (17:40 +0200)]
Merge pull request #596 from donaldsharp/bgp_vrf_terminate
bgpd: Fix crash when going down
David Lamparter [Mon, 22 May 2017 15:39:40 +0000 (17:39 +0200)]
Merge pull request #600 from qlyoung/fix-privs-obo
lib: fix array sizes for capability map
David Lamparter [Mon, 22 May 2017 15:39:03 +0000 (17:39 +0200)]
Merge pull request #599 from qlyoung/fix-ospf6-uaf-3.0
ospf6d: fix use-after-free
Quentin Young [Mon, 22 May 2017 02:26:16 +0000 (02:26 +0000)]
lib: fix array sizes for capability map
incorrect array sizes causing out of bounds read and potentially
incorrect capability settings
introduced in
1b322039
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Quentin Young [Mon, 22 May 2017 02:12:05 +0000 (02:12 +0000)]
ospf6d: fix use-after-free
ospf6_route_remove may free the ospf6_route passed to it if the refcount
reaches zero, in which case zeroing the ->flag field constitutes a uaf
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
David Lamparter [Sat, 20 May 2017 14:50:52 +0000 (16:50 +0200)]
vtysh: fix autocompletion API misuse
I forgot to update this call when I changed
cmd_variable_handler_register to take an array...
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Renato Westphal [Fri, 19 May 2017 13:51:00 +0000 (10:51 -0300)]
bgpd: fix sending of invalid nexthops on the wire
The bpacket_reformat_for_peer() function rewrites the nexthop of outgoing
route updates on a per-peer basis in order to handle route-maps ("set
ip next-hop") and locally-originated routes missing a nexthop.
In the latter case, RFC 4271 says the following: "When announcing a
locally-originated route to an internal peer, the BGP speaker SHOULD use
the interface address of the router through which the announced network
is reachable for the speaker as the NEXT_HOP".
We were doing this for regular IPv4/IPv6 routes, but not for
VPN/EVPN/ENCAP routes, which were being announced with invalid nexthops
(0.0.0.0 or ::).
This patch fixes this problem.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Fri, 19 May 2017 19:51:46 +0000 (16:51 -0300)]
bgpd: fix display of encap routes in the running configuration
Static encap routes don't have an MPLS label. Also, use %u instead of
%d to print the label.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Fri, 19 May 2017 15:34:26 +0000 (12:34 -0300)]
bgpd: add network commands for encapv6
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Fri, 19 May 2017 13:49:24 +0000 (10:49 -0300)]
bgpd: remove unused str2tag() function
This function is not used anymore since commit
fb1d2a2d9 .
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Donald Sharp [Sat, 20 May 2017 16:56:17 +0000 (12:56 -0400)]
Merge pull request #592 from opensourcerouting/bgpd-invalid-nexthops
Bgpd invalid nexthops
Donald Sharp [Sat, 20 May 2017 13:04:22 +0000 (09:04 -0400)]
Merge pull request #594 from opensourcerouting/fix-mpls-build
zebra: build mpls sources the right way
Donald Sharp [Sat, 20 May 2017 12:22:23 +0000 (08:22 -0400)]
bgpd: Fix crash when going down
When bgp is sent a SIGINT signal with vrf's configured
bgp proceeds to crash on the way down. This is because
the bm->bgp list was deleted( but the pointer was kept around)
and then later in the going down process vrf_terminate is called
which attempts to find any associated processes. Since memory
has been freed and subsuquently used for something else
we get a corrupt bgp pointer and bgp crashes.
Here is the trace:
(gdb) bt
at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
at sigevent.c:255
at thread.c:1315
(gdb)
Multiple protocols besides bgp and zebra running are needed to make
this happen as well. So a weird timing related issue?
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Renato Westphal [Fri, 19 May 2017 22:10:42 +0000 (19:10 -0300)]
zebra: build mpls sources the right way
zebra_mpls_null.c should contain only dummy replacements for
platform-specific functions that may not be available on some systems
(e.g. add/delete LSPs in the kernel).
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Quentin Young [Fri, 19 May 2017 20:06:43 +0000 (20:06 +0000)]
nhrpd: install access-list commands
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Renato Westphal [Fri, 19 May 2017 13:51:00 +0000 (10:51 -0300)]
bgpd: fix sending of invalid nexthops on the wire
The bpacket_reformat_for_peer() function rewrites the nexthop of outgoing
route updates on a per-peer basis in order to handle route-maps ("set
ip next-hop") and locally-originated routes missing a nexthop.
In the latter case, RFC 4271 says the following: "When announcing a
locally-originated route to an internal peer, the BGP speaker SHOULD use
the interface address of the router through which the announced network
is reachable for the speaker as the NEXT_HOP".
We were doing this for regular IPv4/IPv6 routes, but not for
VPN/EVPN/ENCAP routes, which were being announced with invalid nexthops
(0.0.0.0 or ::).
This patch fixes this problem.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Fri, 19 May 2017 19:51:46 +0000 (16:51 -0300)]
bgpd: fix display of encap routes in the running configuration
Static encap routes don't have an MPLS label. Also, use %u instead of
%d to print the label.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Fri, 19 May 2017 15:34:26 +0000 (12:34 -0300)]
bgpd: add network commands for encapv6
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Quentin Young [Fri, 19 May 2017 18:38:02 +0000 (18:38 +0000)]
ospfd: remember format for ospf area id
If the user enters a decimal, display a decimal.
If the user enters a dotted quad, display a dotted quad.
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Quentin Young [Thu, 18 May 2017 17:27:09 +0000 (17:27 +0000)]
ospf6d: remember format for ospf6 area id
If the user enters a decimal, display a decimal.
If the user enters a dotted quad, display a dotted quad.
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Renato Westphal [Fri, 19 May 2017 13:49:24 +0000 (10:49 -0300)]
bgpd: remove unused str2tag() function
This function is not used anymore since commit
fb1d2a2d9 .
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Renato Westphal [Fri, 19 May 2017 13:48:16 +0000 (10:48 -0300)]
bgpd: add missing white space in debug message
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Donald Sharp [Fri, 19 May 2017 13:41:15 +0000 (09:41 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'
Renato Westphal [Fri, 19 May 2017 13:38:03 +0000 (10:38 -0300)]
Merge pull request #584 from LabNConsulting/working/3.0/patch/configVpnTags-v2
bgpd: Address some issues seen while encoding VPN static routes (Issue #572) -- V2
Donald Sharp [Fri, 19 May 2017 12:33:07 +0000 (08:33 -0400)]
Merge pull request #588 from opensourcerouting/nhrpd-
20170519
nhrpd: configure mgre ipv6 nd for nhrp
Donald Sharp [Fri, 19 May 2017 12:09:42 +0000 (08:09 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'
Lou Berger [Fri, 19 May 2017 11:56:13 +0000 (07:56 -0400)]
bgpd: set NH len for ipv4 vpn|encap statics
Signed-off-by: Lou Berger <lberger@labn.net>
David Lamparter [Fri, 19 May 2017 11:38:48 +0000 (13:38 +0200)]
Merge pull request #586 from donaldsharp/msdp_crashalicious
pimd: Fix crash from cli missinterpertation
Timo Teräs [Fri, 19 May 2017 11:08:35 +0000 (14:08 +0300)]
nhrpd: configure mgre ipv6 nd for nhrp
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Donald Sharp [Fri, 19 May 2017 03:06:12 +0000 (23:06 -0400)]
pimd: Fix crash from cli missinterpertation
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Lou Berger [Thu, 18 May 2017 21:53:06 +0000 (17:53 -0400)]
bgpd: fix ipv4|6 vpn|encap with route-map show config
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Thu, 18 May 2017 13:45:48 +0000 (09:45 -0400)]
bgp: don't put empty encap or vnc attributes on the wire
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Thu, 18 May 2017 13:06:47 +0000 (09:06 -0400)]
bgpd: repalce direct calls to system memory functions
Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger [Thu, 18 May 2017 12:56:26 +0000 (08:56 -0400)]
bgpd: cleanup vpn label config, set BoS, use 'label' in place of 'tag'
Signed-off-by: Lou Berger <lberger@labn.net>
David Lamparter [Wed, 17 May 2017 19:34:01 +0000 (21:34 +0200)]
ldpd: use frr_init()
Without this, modules aren't loaded.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Wed, 17 May 2017 17:19:56 +0000 (19:19 +0200)]
lib: fix __attribute__ typo
__attribute breaks pycparser
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Mon, 8 May 2017 04:07:52 +0000 (06:07 +0200)]
lib: qobj: MT-guard with rwlock
Make qobj_* calls MT-Safe/LF-Blocking.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Mon, 8 May 2017 01:06:07 +0000 (03:06 +0200)]
lib: detangle protocol name/instance from logging
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 17:24:29 +0000 (19:24 +0200)]
Merge pull request #571 from donaldsharp/nhrp
Nhrp
David Lamparter [Thu, 18 May 2017 17:22:03 +0000 (19:22 +0200)]
Merge pull request #573 from donaldsharp/pim_crash_a_boo
pimd: Thread changes allow pim to crash a boo
Donald Sharp [Thu, 18 May 2017 17:16:58 +0000 (13:16 -0400)]
doc: Add some documentation for 'show zebra'
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 18 May 2017 17:13:32 +0000 (13:13 -0400)]
zebra: Add code to track kernel interactions
Allow zebra to track kernel interactions.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 18 May 2017 15:03:21 +0000 (11:03 -0400)]
ospf6d: Make 'show zebra' 'show ipv6 ospf6 zebra'
The 'show zebra' command really shouldn't be owned
by ospf6. This command is a specialized command
to show some basic information about ospf6 and zebra
so limit it to ospf6.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 18 May 2017 13:45:57 +0000 (09:45 -0400)]
Merge remote-tracking branch 'origin/master' into pim_crash_a_boo
Donald Sharp [Thu, 18 May 2017 13:44:09 +0000 (09:44 -0400)]
pimd: Address PR Comments
Remove a bit more dead code and unused variable.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 18 May 2017 12:56:40 +0000 (08:56 -0400)]
pimd: Fix indentation issue that is causing clang unhappiness
The indentation of ifjoin_to_noinfo was not consistent with
the rest of the function and caused clang to loose it's mind
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Donald Sharp [Thu, 18 May 2017 12:56:40 +0000 (08:56 -0400)]
pimd: Fix indentation issue that is causing clang unhappiness
The indentation of ifjoin_to_noinfo was not consistent with
the rest of the function and caused clang to loose it's mind
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
David Lamparter [Thu, 18 May 2017 12:51:56 +0000 (14:51 +0200)]
zebra: fix label manager merge snafu
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Timo Teräs [Thu, 18 May 2017 09:00:22 +0000 (12:00 +0300)]
nhrpd: announce ipv6 routes to zebra
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
David Lamparter [Thu, 18 May 2017 12:14:00 +0000 (14:14 +0200)]
Merge branch 'stable/3.0'
Conflicts:
ldpd/lde.c
zebra/label_manager.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 12:05:53 +0000 (14:05 +0200)]
Revert "bgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop"
This reverts commit
fa14eb2c0b408982a6634459b3afb21e9df6326a .
This was for stable/2.0 and wasn't intended to go on stable/3.0
-- my bad, missed this in the merge.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Donald Sharp [Thu, 18 May 2017 11:09:07 +0000 (07:09 -0400)]
Merge pull request #512 from bingen/tmp_lm_relay_async
lm: Make relay label manager async
David Lamparter [Thu, 18 May 2017 10:35:53 +0000 (12:35 +0200)]
Merge branch 'frr/pull/569'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 10:34:34 +0000 (12:34 +0200)]
Merge branch 'frr/pull/569'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 10:33:50 +0000 (12:33 +0200)]
Merge branch 'frr/pull/567'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 10:32:28 +0000 (12:32 +0200)]
Merge branch 'frr/pull/550'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 10:28:12 +0000 (12:28 +0200)]
Merge branch 'stable/3.0'
Conflicts:
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/interface.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 10:23:23 +0000 (12:23 +0200)]
Merge branch 'frr/pull/575'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 10:15:04 +0000 (12:15 +0200)]
Merge branch stable/2.0 into stable/3.0
Conflicts:
bgpd/bgp_fsm.c
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/redistribute.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 09:41:01 +0000 (11:41 +0200)]
Pre-revert nonmergeable changes
Revert "ospf6d: fix decimal area ID cli"
commit
a27cb3cfe901d4f1378116bc91e6656aaed7c74c
Revert "bgpd: add back unicast option to 'address-family vpnv(4&6)' Issue #459"
commit
399598bf6b749daa15d70ad64fc885d00cde1225
Revert "Fix the memory leak"
commit
d8d58e98397d8442ec68f8d715b64d5e6000b903
Revert "zebra: 'no ip route 4.1.1.19 255.255.255.255 99' is ambiguous"
commit
83f35619359379687f21c839d61121e4ebe72541
Revert "ospf6d: Allow unconfig of unknown lsa's"
commit
5b0747d71df6006835ead8e6354f70b26f7bca80
Revert "Fix the "Dead assignment" of clang SA."
commit
3a6570a1f145c49155d72a815441025085dd45ad
Revert "snapcraft: Improve README.usage.md based on feedback received"
commit
2a3a819a9c2b2c9700e6228e7352e53b3562776c
Revert "zebra: stop deregistering static nexthops unless removing the static"
commit
1dac3a9619c8436f81c7b37f0252574b0b677dd0
All of these changes do not apply on stable/3.0 due to either CLI
changes or another fix already being present.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 09:39:58 +0000 (11:39 +0200)]
Merge branch 'frr/pull/574'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 09:38:25 +0000 (11:38 +0200)]
Merge branch 'frr/pull/558'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter [Thu, 18 May 2017 09:37:37 +0000 (11:37 +0200)]
Merge branch 'frr/pull/557'
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>