]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
7 years agoMerge remote-tracking branch 'origin/stable/3.0'
Donald Sharp [Fri, 19 May 2017 13:41:15 +0000 (09:41 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'

7 years agoMerge pull request #584 from LabNConsulting/working/3.0/patch/configVpnTags-v2
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

7 years agoMerge pull request #588 from opensourcerouting/nhrpd-20170519
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

7 years agoMerge remote-tracking branch 'origin/stable/3.0'
Donald Sharp [Fri, 19 May 2017 12:09:42 +0000 (08:09 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'

7 years agobgpd: set NH len for ipv4 vpn|encap statics
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>
7 years agoMerge pull request #586 from donaldsharp/msdp_crashalicious
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

7 years agonhrpd: configure mgre ipv6 nd for nhrp
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>
7 years agopimd: Fix crash from cli missinterpertation
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>
7 years agobgpd: fix ipv4|6 vpn|encap with route-map show config
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>
7 years agobgp: don't put empty encap or vnc attributes on the wire
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>
7 years agobgpd: repalce direct calls to system memory functions
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>
7 years agobgpd: cleanup vpn label config, set BoS, use 'label' in place of 'tag'
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>
7 years agoldpd: use frr_init()
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>
7 years agolib: fix __attribute__ typo
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>
7 years agolib: qobj: MT-guard with rwlock
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>
7 years agolib: detangle protocol name/instance from logging
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>
7 years agoMerge pull request #571 from donaldsharp/nhrp
David Lamparter [Thu, 18 May 2017 17:24:29 +0000 (19:24 +0200)]
Merge pull request #571 from donaldsharp/nhrp

Nhrp

7 years agoMerge pull request #573 from donaldsharp/pim_crash_a_boo
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

7 years agoMerge remote-tracking branch 'origin/master' into pim_crash_a_boo
Donald Sharp [Thu, 18 May 2017 13:45:57 +0000 (09:45 -0400)]
Merge remote-tracking branch 'origin/master' into pim_crash_a_boo

7 years agopimd: Address PR Comments
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>
7 years agopimd: Fix indentation issue that is causing clang unhappiness
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>
7 years agopimd: Fix indentation issue that is causing clang unhappiness
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>
7 years agozebra: fix label manager merge snafu
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>
7 years agonhrpd: announce ipv6 routes to zebra
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>
7 years agoMerge branch 'stable/3.0'
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>
7 years agoRevert "bgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop"
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>
7 years agoMerge pull request #512 from bingen/tmp_lm_relay_async
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

7 years agoMerge branch 'frr/pull/569'
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>
7 years agoMerge branch 'frr/pull/569'
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>
7 years agoMerge branch 'frr/pull/567'
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>
7 years agoMerge branch 'frr/pull/550'
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>
7 years agoMerge branch 'stable/3.0'
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>
7 years agoMerge branch 'frr/pull/575'
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>
7 years agoMerge branch stable/2.0 into stable/3.0
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>
7 years agoPre-revert nonmergeable changes
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>
7 years agoMerge branch 'frr/pull/574'
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>
7 years agoMerge branch 'frr/pull/558'
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>
7 years agoMerge branch 'frr/pull/557'
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>
7 years agoMerge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes")
David Lamparter [Thu, 18 May 2017 09:34:50 +0000 (11:34 +0200)]
Merge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes")

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels")
David Lamparter [Thu, 18 May 2017 09:31:05 +0000 (11:31 +0200)]
Merge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels")

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge branch 'frr/pull/536'
David Lamparter [Thu, 18 May 2017 09:30:04 +0000 (11:30 +0200)]
Merge branch 'frr/pull/536'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agobgpd: remove bgp_nexthop_afi prototype
David Lamparter [Thu, 18 May 2017 09:29:28 +0000 (11:29 +0200)]
bgpd: remove bgp_nexthop_afi prototype

as pointed out by Renato Westphal in #536

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoospf6d: fix decimal area ID cli
Quentin Young [Wed, 17 May 2017 20:31:19 +0000 (20:31 +0000)]
ospf6d: fix decimal area ID cli

Not all numbers are dotted quads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoospf6d: fix decimal area ID cli
Quentin Young [Wed, 17 May 2017 20:31:19 +0000 (20:31 +0000)]
ospf6d: fix decimal area ID cli

Not all numbers are dotted quads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #556 from dslicenc/bgp-fixes
Renato Westphal [Thu, 18 May 2017 00:37:01 +0000 (21:37 -0300)]
Merge pull request #556 from dslicenc/bgp-fixes

Bgp fixes

7 years agopimd: Thread changes allow pim to crash a boo
Donald Sharp [Thu, 18 May 2017 00:33:43 +0000 (20:33 -0400)]
pimd: Thread changes allow pim to crash a boo

When we add a thread pointer to thread_add_XXX functions
when the specified function is called, thread.c is setting
the thread pointer to NULL.  This was causing pim to
liberally pull it's zassert grenade pin's.

Additionally clean up code to not set the NULL pointer.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agonhrp: improve CIE prefix length handling
Timo Teräs [Wed, 17 May 2017 22:36:07 +0000 (18:36 -0400)]
nhrp: improve CIE prefix length handling

RFC2332 states that prefix length MUST be 0xff for unique bindings.
However, it seems at least some Cisco firmwares use host prefix
length instead (which on wire level makes sense). Relax the handling
of prefix length to treat all value longer than address length as
0xff. Additionally treat 0x00 the same way too, this is required
by the RFC. This also fixes the prefix length address family to be
checked against protocol address.
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
7 years agonhrpd: Fix crash in 'no nhrp event socket..' command
Donald Sharp [Wed, 17 May 2017 22:31:02 +0000 (18:31 -0400)]
nhrpd: Fix crash in 'no nhrp event socket..' command

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agonhrpd: Fix some missing newlines
Donald Sharp [Wed, 17 May 2017 22:30:43 +0000 (18:30 -0400)]
nhrpd: Fix some missing newlines

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #562 from dslicenc/small-zebra-fixes
David Lamparter [Wed, 17 May 2017 21:35:29 +0000 (23:35 +0200)]
Merge pull request #562 from dslicenc/small-zebra-fixes

Small zebra fixes

7 years agoMerge pull request #537 from donaldsharp/vrf_stuff
David Lamparter [Wed, 17 May 2017 20:06:39 +0000 (22:06 +0200)]
Merge pull request #537 from donaldsharp/vrf_stuff

Vrf stuff

7 years agobgpd: fix config of v6 vpn networks tags
Lou Berger [Wed, 17 May 2017 18:54:10 +0000 (14:54 -0400)]
bgpd: fix config of v6 vpn networks tags

Signed-off-by: Lou Berger <lberger@labn.net>
7 years agoeigrpd: disambiguate bandwidth command
Quentin Young [Wed, 17 May 2017 18:37:24 +0000 (18:37 +0000)]
eigrpd: disambiguate bandwidth command

eigrpd defines a bandwidth command that takes kilobits instead of
megabits which is problematic when installed in the same node as the
megabits command since (1-100000) and (1-10000000) are ambiguous

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #565 from qlyoung/fix-ldpd-vtysh-3.0
Renato Westphal [Wed, 17 May 2017 18:19:04 +0000 (15:19 -0300)]
Merge pull request #565 from qlyoung/fix-ldpd-vtysh-3.0

vtysh: fix ldpd vtysh

7 years agovtysh: fix ldpd vtysh
Quentin Young [Wed, 17 May 2017 01:53:47 +0000 (01:53 +0000)]
vtysh: fix ldpd vtysh

ldpd needs a special case to execute the correct exit command for walkup
when using vtysh

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #561 from donaldsharp/static_config2
Renato Westphal [Wed, 17 May 2017 17:18:51 +0000 (14:18 -0300)]
Merge pull request #561 from donaldsharp/static_config2

Static config2

7 years agolib: correctly handle EOF when using poll()
Quentin Young [Tue, 16 May 2017 18:17:23 +0000 (18:17 +0000)]
lib: correctly handle EOF when using poll()

Descriptor owner should handle EOF, not thread.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge remote-tracking branch 'origin/stable/3.0'
Donald Sharp [Wed, 17 May 2017 12:51:25 +0000 (08:51 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'

7 years agobgpd: Fix vrf crash
Donald Sharp [Thu, 1 Dec 2016 13:59:16 +0000 (08:59 -0500)]
bgpd: Fix vrf crash

Ensure that we have a valid vrf before we log
information about it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
7 years agoospf6d: Fix debug line always showing up in ospf6d
Donald Sharp [Thu, 17 Nov 2016 03:17:39 +0000 (22:17 -0500)]
ospf6d: Fix debug line always showing up in ospf6d

The command 'debug ospf6 lsa unknown' was
always showing up, upon starting of the ospf6 daemon.

Remove this from happening.  Also fix some help strings
while we are in there.

Ticket: CM-7913
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: More Extended nexthop fixing
Donald Sharp [Wed, 16 Nov 2016 17:00:40 +0000 (12:00 -0500)]
bgpd: More Extended nexthop fixing

Basically if we are reading in a cli with a extended-nexthop
and we have not received from zebra the interface we are working
on I believe we have a race condition where we are not
propagating the PEER_FLAG_CAPABILITY_ENHE in this case.

Modify the code to propagate even if we haven't found the
interface yet.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Fix ADJCHANGE message to include more info
Donald Sharp [Tue, 15 Nov 2016 15:16:52 +0000 (10:16 -0500)]
bgpd: Fix ADJCHANGE message to include more info

When bgp logs ADJCHANGE messages include the
hostname and vrf that this change is being made
in.

Ticket: CM-10922
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Fix occassional turn off of extended-nexthop for an if
Donald Sharp [Tue, 15 Nov 2016 14:39:35 +0000 (09:39 -0500)]
bgpd: Fix occassional turn off of extended-nexthop for an if

Sometimes, like once every 400 iterations, when you restart
Quagga, extended-nexthop has been turned off for interface
based config( for 5549 ).

Examining the code, there is only 1 real path to setting
the PEER_FLAG_CAPABILITITY_ENHE and that is through
peer_conf_interface_get.  Modify this code path
to always set the PEER_FLAG_CAPABILITY_ENHE if it is
not already set.

In addition, fix a possible pointer dereference.

Ticket: CM-12929
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoChange Frr.conf to frr.conf
Daniel Walton [Wed, 10 May 2017 00:55:10 +0000 (00:55 +0000)]
Change Frr.conf to frr.conf

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agoMerge remote-tracking branch 'origin/stable/2.0'
Donald Sharp [Wed, 17 May 2017 12:32:53 +0000 (08:32 -0400)]
Merge remote-tracking branch 'origin/stable/2.0'

7 years agozebra: stop deregistering static nexthops unless removing the static
Don Slice [Tue, 14 Feb 2017 17:15:40 +0000 (09:15 -0800)]
zebra: stop deregistering static nexthops unless removing the static

Problem reported was that with some overlapping static route configurations,
when the link went down the less specific static was not re-installed after
the link came back up.  Determined that with the overlapping statics, we
would recursively resolve the next-hop temporarily thru the more specific
static route, but since the next-hop wasn't actually reachable, we would go
through the code that clears the nht information for the static completely.
This caused the nht code to no longer process the static route.

After reviewing the process, there doesn't seem to be any reason that the
static should be deregistered in that section of code.  Removed the
deregister and the problem is resolved and not addional failures seen in
manual testing.  zebra_test.py completed successfully and ospf and bgp smokes
completed with no new failures.

Ticket: CM-14873
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-5696
7 years agozebrad: Correct problem removing dead routes from rib due to NHT issue
Don Slice [Tue, 6 Dec 2016 17:29:05 +0000 (09:29 -0800)]
zebrad: Correct problem removing dead routes from rib due to NHT issue

Fix for another issue with next-hop tracking for overlapping static routes
created a problem removing the dead routes.  This fix corrects that error.

Ticket: CM-13710
Signed-off-by: Don Slice
Reviewed By: Donald Sharp
Testing Done: ospf-smoke, bgp-smoke

7 years agozebra: Move interfaces to default before deleting
Don Slice [Wed, 23 Nov 2016 19:58:27 +0000 (11:58 -0800)]
zebra: Move interfaces to default before deleting

Encountered a crash in zebra due to getting a delete on an SVI with
VRR configured.  Since we don't actually do a delete but flag the interface
as inactive, slag VRR interfaces would remain on the vrf_iflist with a lock
count of zero, causing the crash.  Since all other interface types are moved
to the default table before deleting, doing the same thing for any interfaces
that were left in the vrf.

Testing includes manual testing, bgp-min, ospf-min, vrf-min, bgp-smoke, and ospf-smoke.
All passed (first time or on rerun) or match known failures.

Ticket: CM-13288
Signed-off-by: Don Slice
Reviewed-by: Donald Sharp
7 years agopimd: Fix spelling mistake in cli
Donald Sharp [Tue, 16 May 2017 23:15:05 +0000 (19:15 -0400)]
pimd: Fix spelling mistake in cli

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Allow 'show bgp neighbor' to indicate authentication or not
Donald Sharp [Mon, 14 Nov 2016 20:28:17 +0000 (15:28 -0500)]
bgpd: Allow 'show bgp neighbor' to indicate authentication or not

When we configure authentication.  Allow the 'show bgp neighbor'
commands( and their ilk ) to indicate that the peer has
authentication enabled.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Consolidate static_config_ipv[4|6] into one function.
Donald Sharp [Sun, 13 Nov 2016 02:52:32 +0000 (21:52 -0500)]
zebra: Consolidate static_config_ipv[4|6] into one function.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge branch 'stable/2.0' into bgp-fixes
Don Slice [Wed, 17 May 2017 11:38:59 +0000 (07:38 -0400)]
Merge branch 'stable/2.0' into bgp-fixes

7 years agoMerge pull request #538 from qlyoung/fix-stack-access-2
Lou Berger [Wed, 17 May 2017 11:34:30 +0000 (07:34 -0400)]
Merge pull request #538 from qlyoung/fix-stack-access-2

lib: return thread * from thread_add*

7 years agoMerge pull request #549 from qlyoung/fix-poll-eof
David Lamparter [Wed, 17 May 2017 09:25:30 +0000 (11:25 +0200)]
Merge pull request #549 from qlyoung/fix-poll-eof

lib: correctly handle EOF when using poll()

7 years agoMerge pull request #545 from donaldsharp/ospf_3.0_fixes
David Lamparter [Wed, 17 May 2017 09:15:45 +0000 (11:15 +0200)]
Merge pull request #545 from donaldsharp/ospf_3.0_fixes

Ospf 3.0 fixes

7 years agoMerge pull request #553 from donaldsharp/missed_2.0
David Lamparter [Wed, 17 May 2017 09:14:48 +0000 (11:14 +0200)]
Merge pull request #553 from donaldsharp/missed_2.0

Missed 2.0

7 years agopimd: Fix input value to bool
Chirag Shah [Wed, 17 May 2017 04:57:25 +0000 (21:57 -0700)]
pimd: Fix input value to bool

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agoMerge pull request #547 from donaldsharp/missed_pim_3.0
Jafar Al-Gharaibeh [Wed, 17 May 2017 04:19:54 +0000 (23:19 -0500)]
Merge pull request #547 from donaldsharp/missed_pim_3.0

pimd: Fix core from json static mroute show

7 years agopimd: fix pim reg processing return 1 upon success
Chirag Shah [Tue, 24 Jan 2017 22:58:59 +0000 (14:58 -0800)]
pimd: fix pim reg processing return 1 upon success

pim register_recv api returns 1 instead of 0 upon succesfully processing REG message

Testing Done:
Verified At RP via receiving PIM (Data/Null) Register messages
and checked show ip pim interface < > Received errors under Hello

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agopimd: fix ip pim hello option does not take in effect
Chirag Shah [Tue, 24 Jan 2017 01:39:54 +0000 (17:39 -0800)]
pimd: fix ip pim hello option does not take in effect

If frr.conf file has pim hello option setup prior to pim sm under an interface, upon frr start/restart hello option cli replayed prior to sm command
from vtysh. Added a code in pim hello option cli handler to create pim vif if it does not exist.

Testing Done:
configure pim hello options before pim sm in frr.conf file and restart frr

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agotools: Allow frr-reload.py to know about agentx
Daniel Walton [Wed, 17 May 2017 00:25:28 +0000 (00:25 +0000)]
tools: Allow frr-reload.py to know about agentx

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agotools: frr-reload.py VtyshMarkException needs to include "vtysh -m"
Daniel Walton [Wed, 17 May 2017 00:23:38 +0000 (00:23 +0000)]
tools: frr-reload.py VtyshMarkException needs to include "vtysh -m"
output

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agofrr-reload.py fails on "no debug ospf6 message unknown"
Daniel Walton [Wed, 17 May 2017 00:22:00 +0000 (00:22 +0000)]
frr-reload.py fails on "no debug ospf6 message unknown"

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agotools: frr-reload removes "ipv6 nd ra-interval" and "no ipv6 nd supp"
Daniel Walton [Wed, 17 May 2017 00:18:33 +0000 (00:18 +0000)]
tools: frr-reload removes "ipv6 nd ra-interval" and "no ipv6 nd supp"

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agotools: reload handle removal of entire address-family section under BGP
Daniel Walton [Wed, 17 May 2017 00:16:09 +0000 (00:16 +0000)]
tools: reload handle removal of entire address-family section under BGP

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
When an entire address-family section is removed from under BGP, we
cannot just issue 'no address-family foo bar' as address-family line
doesn't support 'no'. We have to delete the individual lines under the
address-family.

7 years agotools: frr-reload.py should exit non-zero when "set src x.x.x.x" fails
Daniel Walton [Wed, 17 May 2017 00:14:37 +0000 (00:14 +0000)]
tools: frr-reload.py should exit non-zero when "set src x.x.x.x" fails

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Add epoch uptime to BGP neighbor json outputs
Daniel Walton [Wed, 17 May 2017 00:07:02 +0000 (00:07 +0000)]
bgpd: Add epoch uptime to BGP neighbor json outputs

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agobgp: garbage "neighbor (af 54816) remote-as internal" peer in show run
Daniel Walton [Wed, 17 May 2017 00:01:23 +0000 (00:01 +0000)]
bgp: garbage "neighbor (af 54816) remote-as internal" peer in show run

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agobgpd: 'redistribute' triggers both IPv4 and IPv6 code paths
Daniel Walton [Tue, 16 May 2017 23:58:34 +0000 (23:58 +0000)]
bgpd: 'redistribute' triggers both IPv4 and IPv6 code paths

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Whenever you did "redistribute" zebra would kick this off for ipv4 and
ipv6. No real issue other than this is sub-optimal

7 years agobgpd: does not honor configured keepalive timer
Daniel Walton [Tue, 16 May 2017 23:56:31 +0000 (23:56 +0000)]
bgpd: does not honor configured keepalive timer

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: "neighbor swpX interface remote-as XYZ" is ignored
Daniel Walton [Tue, 16 May 2017 23:54:46 +0000 (23:54 +0000)]
bgpd: "neighbor swpX interface remote-as XYZ" is ignored

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
If you did:
  neighbor swp1 interface
  neighbor swp1 interface remote-as external

we would not set the remote-as. You could however still do
  neighbor swp1 remote-as external

7 years agozebra: 'no ip route 4.1.1.19 255.255.255.255 99' is ambiguous
Daniel Walton [Tue, 16 May 2017 23:49:53 +0000 (23:49 +0000)]
zebra: 'no ip route 4.1.1.19 255.255.255.255 99' is ambiguous

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #532 from opensourcerouting/gpl-headers
Donald Sharp [Tue, 16 May 2017 22:04:31 +0000 (18:04 -0400)]
Merge pull request #532 from opensourcerouting/gpl-headers

*: make consistent & update GPLv2 file headers

7 years agobgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop
Don Slice [Wed, 5 Apr 2017 14:13:45 +0000 (07:13 -0700)]
bgpd: resolve ipv6 ecmp issue with vrfs and ll nexthop

Problem reported that ecmp wasn't working correctly in a vrf with
ipv6.  Issue was that originator of the routes were sending the updates
with a link-local nexthop and nhlen of 16.  In this particular case,
bgp_zebra_announce was using the wrong call to get the ifindex and
was not supplying the vrf.   This caused ecmp to work only in the case
of the default vrf.

Ticket: CM-15545
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: CCR-6017
7 years agobgpd: fix crash in bgp_stop due to missing vrf
Don Slice [Tue, 22 Nov 2016 17:48:16 +0000 (09:48 -0800)]
bgpd: fix crash in bgp_stop due to missing vrf

Problem found to be derefencing a vrf that had already been deleted.  Fix
verifies that vrf exists before using it.

Ticket: CM-13682
Signed-off-by: Don Slice
Reviewed By: Vivek Venkatraman
Testing Done: manual testing, re-run of failing scripts good

7 years agobgpd: Fix ADJCHANGE message to include more info
Donald Sharp [Tue, 15 Nov 2016 15:16:52 +0000 (10:16 -0500)]
bgpd: Fix ADJCHANGE message to include more info

When bgp logs ADJCHANGE messages include the
hostname and vrf that this change is being made
in.

Ticket: CM-10922
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Fix vrf crash
Donald Sharp [Thu, 1 Dec 2016 13:59:16 +0000 (08:59 -0500)]
bgpd: Fix vrf crash

Ensure that we have a valid vrf before we log
information about it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
7 years agoospf6d: Allow unconfig of unknown lsa's
Donald Sharp [Fri, 18 Nov 2016 16:41:53 +0000 (11:41 -0500)]
ospf6d: Allow unconfig of unknown lsa's

When we are receiving the 'no debug ospf6 lsa unknown ...'
Allow the removal of the originate examine and flooding
keywords.

Ticket: CM-12805
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoospf6d: Fix debug line always showing up in ospf6d
Donald Sharp [Thu, 17 Nov 2016 03:17:39 +0000 (22:17 -0500)]
ospf6d: Fix debug line always showing up in ospf6d

The command 'debug ospf6 lsa unknown' was
always showing up, upon starting of the ospf6 daemon.

Remove this from happening.  Also fix some help strings
while we are in there.

Ticket: CM-7913
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: More Extended nexthop fixing
Donald Sharp [Wed, 16 Nov 2016 17:00:40 +0000 (12:00 -0500)]
bgpd: More Extended nexthop fixing

Basically if we are reading in a cli with a extended-nexthop
and we have not received from zebra the interface we are working
on I believe we have a race condition where we are not
propagating the PEER_FLAG_CAPABILITY_ENHE in this case.

Modify the code to propagate even if we haven't found the
interface yet.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>