zebra: Store commonly used values instead of regenerating

the ipv4_ll address used for 5549 routes does not need
to be figured out every single time that we attempt
to install/remove a route of that type.

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

Merge pull request #610 from donaldsharp/rpprefixlen

pimd: Allow secondary address comparisons to work

Merge remote-tracking branch 'origin/stable/3.0'

Merge pull request #612 from LabNConsulting/working/master/patch-set/deprecateEncap

master:  remove support for config & show of encap safi

Merge pull request #611 from LabNConsulting/working/3.0/patch-set/deprecateEncap

3.0: remove support for config & show of encap safi

bgpd: remove encap safi vty related files bgp_encap.h|c

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: remove encap_safi rx processing

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: remove encap safi show commands

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: remove additional instance of BGP_ENCAP(v6)_NODE

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd rfapi: remove ability to configure use of encap-safi (continue to use encap attribute)

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: remove support for ipv4|6 encap safi config

Signed-off-by: Lou Berger <lberger@labn.net>

vtysh: remove BGP_ENCAP(V6)_NODE

Signed-off-by: Lou Berger <lberger@labn.net>

lib: remove BGP_ENCAP(V6)_NODE

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: remove encap safi vty related files bgp_encap.h|c

Signed-off-by: Lou Berger <lberger@labn.net>

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>

bgpd: remove encap_safi rx processing

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: remove encap safi show commands

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd rfapi: remove ability to configure use of encap-safi (continue to use encap attribute)

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: remove support for ipv4|6 encap safi config

Signed-off-by: Lou Berger <lberger@labn.net>

vtysh: remove BGP_ENCAP(V6)_NODE

Signed-off-by: Lou Berger <lberger@labn.net>

lib: remove BGP_ENCAP(V6)_NODE

Signed-off-by: Lou Berger <lberger@labn.net>

Merge pull request #598 from donaldsharp/to_3.0

To 3.0

Merge pull request #593 from qlyoung/fix-nhrpd-acl-3.0

nhrpd: install access-list commands

Merge pull request #591 from qlyoung/ospf-df-areaid-3.0

ospfd: remember format for ospf area id

Merge pull request #582 from qlyoung/ospf6-df-areaid

ospf6d: remember format for ospf6 area id

Merge pull request #581 from donaldsharp/zebra

Zebra

Merge pull request #596 from donaldsharp/bgp_vrf_terminate

bgpd: Fix crash when going down

Merge pull request #600 from qlyoung/fix-privs-obo

lib: fix array sizes for capability map

Merge pull request #599 from qlyoung/fix-ospf6-uaf-3.0

ospf6d: fix use-after-free

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>

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>

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>

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>

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>

bgpd: add network commands for encapv6

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

bgpd: remove unused str2tag() function

This function is not used anymore since commit fb1d2a2d9.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

Merge pull request #592 from opensourcerouting/bgpd-invalid-nexthops

Bgpd invalid nexthops

Merge pull request #594 from opensourcerouting/fix-mpls-build

zebra: build mpls sources the right way

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>

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>

nhrpd: install access-list commands

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

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>

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>

bgpd: add network commands for encapv6

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

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>

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>

bgpd: remove unused str2tag() function

This function is not used anymore since commit fb1d2a2d9.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

bgpd: add missing white space in debug message

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

Merge remote-tracking branch 'origin/stable/3.0'

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

Merge pull request #588 from opensourcerouting/nhrpd-20170519

nhrpd: configure mgre ipv6 nd for nhrp

Merge remote-tracking branch 'origin/stable/3.0'

bgpd: set NH len for ipv4 vpn|encap statics

Signed-off-by: Lou Berger <lberger@labn.net>

Merge pull request #586 from donaldsharp/msdp_crashalicious

pimd: Fix crash from cli missinterpertation

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>

pimd: Fix crash from cli missinterpertation

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

bgpd: fix ipv4|6 vpn|encap with route-map show config

Signed-off-by: Lou Berger <lberger@labn.net>

bgp: don't put empty encap or vnc attributes on the wire

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: repalce direct calls to system memory functions

Signed-off-by: Lou Berger <lberger@labn.net>

bgpd: cleanup vpn label config, set BoS, use 'label' in place of 'tag'

Signed-off-by: Lou Berger <lberger@labn.net>

ldpd: use frr_init()

Without this, modules aren't loaded.

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

lib: fix __attribute__ typo

__attribute breaks pycparser

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

lib: qobj: MT-guard with rwlock

Make qobj_* calls MT-Safe/LF-Blocking.

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

lib: detangle protocol name/instance from logging

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

Merge pull request #571 from donaldsharp/nhrp

Nhrp

Merge pull request #573 from donaldsharp/pim_crash_a_boo

pimd: Thread changes allow pim to crash a boo

doc: Add some documentation for 'show zebra'

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

zebra: Add code to track kernel interactions

Allow zebra to track kernel interactions.

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

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>

Merge remote-tracking branch 'origin/master' into pim_crash_a_boo

pimd: Address PR Comments

Remove a bit more dead code and unused variable.

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

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>

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>

zebra: fix label manager merge snafu

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

nhrpd: announce ipv6 routes to zebra

Signed-off-by: Timo Teräs <timo.teras@iki.fi>

Merge branch 'stable/3.0'

Conflicts:
ldpd/lde.c
zebra/label_manager.c

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

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>

Merge pull request #512 from bingen/tmp_lm_relay_async

lm: Make relay label manager async

Merge branch 'frr/pull/569'

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

Merge branch 'frr/pull/569'

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

Merge branch 'frr/pull/567'

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

Merge branch 'frr/pull/550'

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

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>

Merge branch 'frr/pull/575'

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

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>

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>

Merge branch 'frr/pull/574'

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

Merge branch 'frr/pull/558'

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

Merge branch 'frr/pull/557'

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

Merge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes")

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

Merge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels")

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

Merge branch 'frr/pull/536'

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

bgpd: remove bgp_nexthop_afi prototype

as pointed out by Renato Westphal in #536

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

ospf6d: fix decimal area ID cli

Not all numbers are dotted quads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

ospf6d: fix decimal area ID cli

Not all numbers are dotted quads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Merge pull request #556 from dslicenc/bgp-fixes

Bgp fixes

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>

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>

nhrpd: Fix crash in 'no nhrp event socket..' command

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

nhrpd: Fix some missing newlines

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