]> git.puffer.fish Git - matthieu/frr.git/log
matthieu/frr.git
8 years agobgpd: Do not force nh_afi to be AFI_IP for 'ipv4 labeled-unicast'
Daniel Walton [Tue, 25 Apr 2017 21:53:28 +0000 (21:53 +0000)]
bgpd: Do not force nh_afi to be AFI_IP for 'ipv4 labeled-unicast'

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
8 years agoMerge remote-tracking branch 'origin/master' into mpls2
Donald Sharp [Wed, 26 Apr 2017 11:50:02 +0000 (07:50 -0400)]
Merge remote-tracking branch 'origin/master' into mpls2

8 years agoMerge pull request #345 from chiragshah6/pim_dev
Renato Westphal [Mon, 24 Apr 2017 19:59:58 +0000 (16:59 -0300)]
Merge pull request #345 from chiragshah6/pim_dev

pimd: Pim ECMP changes along with nexthop tracking using cached DB

8 years agoMerge remote-tracking branch 'origin/stable/3.0'
Donald Sharp [Wed, 19 Apr 2017 11:43:30 +0000 (07:43 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'

8 years agoMerge pull request #373 from qlyoung/fix-no-pim-rp
Russ White [Wed, 19 Apr 2017 11:16:22 +0000 (07:16 -0400)]
Merge pull request #373 from qlyoung/fix-no-pim-rp

pimd: fix some pim commands

8 years agoMerge pull request #374 from qlyoung/pqueue-linear-remove
Russ White [Wed, 19 Apr 2017 11:04:04 +0000 (07:04 -0400)]
Merge pull request #374 from qlyoung/pqueue-linear-remove

lib: add removal by item to pqueue

8 years agoMerge pull request #379 from pguibert6WIND/frrouting_issue309_2
Russ White [Wed, 19 Apr 2017 10:58:48 +0000 (06:58 -0400)]
Merge pull request #379 from pguibert6WIND/frrouting_issue309_2

vtysh: remove deprecated HAVE_EVPN flag

8 years agovtysh: remove deprecated HAVE_EVPN flag
Philippe Guibert [Wed, 12 Apr 2017 13:22:41 +0000 (15:22 +0200)]
vtysh: remove deprecated HAVE_EVPN flag

This flag prevents from entering into evpn address-family node, when
calling command from vtysh.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
8 years agoMerge pull request #315 from LabNConsulting/working/master/patch/bgp-startup
Donald Sharp [Tue, 18 Apr 2017 16:14:58 +0000 (12:14 -0400)]
Merge pull request #315 from LabNConsulting/working/master/patch/bgp-startup

Restore functionality broken/overridden by 857b5446497505f582417e4a5ada029712743cbc

8 years agozebra: stop crash on process termination due to stale ifp->node
Don Slice [Tue, 18 Apr 2017 12:11:32 +0000 (08:11 -0400)]
zebra: stop crash on process termination due to stale ifp->node

Problem reported that crash occurred when stopping quagga in certain
circumstances.  Determined that this was due to a stale pointer on the
ifp for a deleted interface.  The ifp->node had been freed but the ifp
still kept a pointer to it, and when later the process was stopped, it
attempted to delete it again.

Ticket: CM-15550
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoMerge remote-tracking branch 'origin/stable/3.0'
Donald Sharp [Mon, 17 Apr 2017 23:12:44 +0000 (19:12 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'

8 years agoMerge pull request #371 from donaldsharp/as_path_fix_3.0
Martin Winter [Mon, 17 Apr 2017 21:47:08 +0000 (14:47 -0700)]
Merge pull request #371 from donaldsharp/as_path_fix_3.0

bgpd: Fix 'set as-path prepend last-as 10'

8 years agopimd: fix 'show ip msdp sa ...'
Quentin Young [Mon, 17 Apr 2017 19:21:06 +0000 (19:21 +0000)]
pimd: fix 'show ip msdp sa ...'

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
8 years agolib: add removal by item to pqueue
Quentin Young [Mon, 17 Apr 2017 00:06:02 +0000 (00:06 +0000)]
lib: add removal by item to pqueue

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
8 years agozebra: Add some more checks to fec [un]registration
Donald Sharp [Sat, 15 Apr 2017 17:25:03 +0000 (13:25 -0400)]
zebra: Add some more checks to fec [un]registration

Be a bit more rigoruous about what we can receive
from another protocol and attempt to make the code
less likely to crash and to just safely bail
out when an error is received.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd: Fix up several issues in bgp_route.c
Donald Sharp [Sat, 15 Apr 2017 13:31:59 +0000 (09:31 -0400)]
bgpd: Fix up several issues in bgp_route.c

1) Some commands were installed in the wrong node
2) Fix output to show labeled information to correctly display
3) Whitespace issue in route-map command

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agozebra: Fix whitespace issue with if statement
Donald Sharp [Sat, 15 Apr 2017 12:59:40 +0000 (08:59 -0400)]
zebra: Fix whitespace issue with if statement

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agozebra: Allow explicit-null as a label option
Donald Sharp [Sat, 15 Apr 2017 12:57:03 +0000 (08:57 -0400)]
zebra: Allow explicit-null as a label option

When entering 'mpls label bind ...' command
allow the explicit-null as an option.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agozebra: Fix crash with dereference of NULL pointer
Donald Sharp [Sat, 15 Apr 2017 12:42:18 +0000 (08:42 -0400)]
zebra: Fix crash with dereference of NULL pointer

We only create the v4 and v6 mpls fec tables currently.
Follow the code pattern for the rest of the code and
ensure that the table exists before we attempt to access it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agolib, bgpd: Remove UNDEFINED_NODE
Donald Sharp [Sat, 15 Apr 2017 12:33:43 +0000 (08:33 -0400)]
lib, bgpd: Remove UNDEFINED_NODE

Remove the UNDEFINED_NODE as that it's implementation breaks
our ability in BGP to figure out where we are by allowing
default: in the switch statement.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agopimd: fix off-by-one in `no ip pim rp ...`
Quentin Young [Sat, 15 Apr 2017 06:23:22 +0000 (06:23 +0000)]
pimd: fix off-by-one in `no ip pim rp ...`

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
8 years agobgpd: 'show .... bgp regexp WORD' fixed
Donald Sharp [Sat, 15 Apr 2017 00:39:56 +0000 (20:39 -0400)]
bgpd: 'show .... bgp regexp WORD' fixed

The command was always just returning as part of the
bgp_regexp_show function.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd: Fix 'set as-path prepend last-as 10'
Donald Sharp [Sat, 15 Apr 2017 00:13:26 +0000 (20:13 -0400)]
bgpd: Fix 'set as-path prepend last-as 10'

1) Fix missing newline in help string
2) Make the ability to have 10 be consistent with the stable/2.0 branch.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoMerge pull request #359 from opensourcerouting/bgpd_largecomm_fix
Donald Sharp [Mon, 10 Apr 2017 23:21:05 +0000 (19:21 -0400)]
Merge pull request #359 from opensourcerouting/bgpd_largecomm_fix

bgpd: fixes for the "show bgp large-community" command

8 years agoMerge pull request #351 from donaldsharp/ospf_fix
Renato Westphal [Mon, 10 Apr 2017 22:06:17 +0000 (19:06 -0300)]
Merge pull request #351 from donaldsharp/ospf_fix

Some Issues fixed

8 years agobgpd: fixes for the "show bgp large-community" command
Renato Westphal [Mon, 10 Apr 2017 15:28:45 +0000 (12:28 -0300)]
bgpd: fixes for the "show bgp large-community" command

* Fix a segfault when the "show bgp large-community" command is given
  without any optional large communities;
* Fix parsing of optional large communities. Without this fix a
  "Large-community malformed" error is shown even for valid large
  communities.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
8 years agoMerge pull request #304 from donaldsharp/pim_5549
Jafar Al-Gharaibeh [Mon, 10 Apr 2017 16:07:58 +0000 (11:07 -0500)]
Merge pull request #304 from donaldsharp/pim_5549

Pim 5549 Additions

8 years agoripd: fix argv index numbers in the redistribute command
Renato Westphal [Sat, 8 Apr 2017 20:52:57 +0000 (17:52 -0300)]
ripd: fix argv index numbers in the redistribute command

Fixes Issue#350

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
8 years agolib: Fix debugs to be guarded.
Donald Sharp [Sat, 8 Apr 2017 12:55:40 +0000 (08:55 -0400)]
lib: Fix debugs to be guarded.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoospfd: Fix the 'show ip ospf int ...' command
Donald Sharp [Sat, 8 Apr 2017 12:47:59 +0000 (08:47 -0400)]
ospfd: Fix the 'show ip ospf int ...' command

Fixed output:

robot.cumulusnetworks.com# show ip ospf int
enp0s3 is up
  ifindex 2, MTU 1500 bytes, BW 0 Mbit <UP,BROADCAST,RUNNING,MULTICAST>
  Internet Address 10.0.2.15/24, Broadcast 10.0.2.255, Area 0.0.0.0
  MTU mismatch detection:enabled
  Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10
  Transmit Delay is 1 sec, State Waiting, Priority 1
  No backup designated router on this network
  Multicast group memberships: OSPFAllRouters
  Timer intervals configured, Hello 10s, Dead 40s, Wait 40s, Retransmit 5
    Hello due in 9.611s
  Neighbor Count is 0, Adjacent neighbor count is 0
enp0s10 is up
  ifindex 7, MTU 1500 bytes, BW 0 Mbit <UP,BROADCAST,RUNNING,MULTICAST>
  Internet Address 192.168.201.146/24, Broadcast 192.168.201.255, Area 0.0.0.0
  MTU mismatch detection:enabled
  Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10
  Transmit Delay is 1 sec, State Waiting, Priority 1
  No backup designated router on this network
  Multicast group memberships: OSPFAllRouters
  Timer intervals configured, Hello 10s, Dead 40s, Wait 40s, Retransmit 5
    Hello due in 7.241s
  Neighbor Count is 0, Adjacent neighbor count is 0

robot.cumulusnetworks.com# show ip ospf int enp0s3
enp0s3 is up
  ifindex 2, MTU 1500 bytes, BW 0 Mbit <UP,BROADCAST,RUNNING,MULTICAST>
  Internet Address 10.0.2.15/24, Broadcast 10.0.2.255, Area 0.0.0.0
  MTU mismatch detection:enabled
  Router ID 192.168.0.1, Network Type BROADCAST, Cost: 10
  Transmit Delay is 1 sec, State Waiting, Priority 1
  No backup designated router on this network
  Multicast group memberships: OSPFAllRouters
  Timer intervals configured, Hello 10s, Dead 40s, Wait 40s, Retransmit 5
    Hello due in 2.915s
  Neighbor Count is 0, Adjacent neighbor count is 0

robot.cumulusnetworks.com# show ip ospf int enp0s10 json
{
  "enp0s10":{
    "ifUp":true,
    "ifIndex":7,
    "mtuBytes":1500,
    "bandwidthMbit":0,
    "ifFlags":"<UP,BROADCAST,RUNNING,MULTICAST>",
    "ospfEnabled":true,
    "ipAddress":"192.168.201.146",
    "ipAddressPrefixlen":24,
    "ospfIfType":"Broadcast",
    "localIfUsed":"192.168.201.255",
    "area":"0.0.0.0",
    "routerId":"192.168.0.1",
    "networkType":"BROADCAST",
    "cost":10,
    "transmitDelayMsecs":1000,
    "state":"Waiting",
    "priority":1,
    "mcastMemberOspfAllRouters":true,
    "timerMsecs":100,
    "timerDeadMsecs":25,
    "timerWaitMsecs":25,
    "timerRetransmit":200,
    "timerHelloInMsecs":2106,
    "nbrCount":0,
    "nbrAdjacentCount":0
  }
}
robot.cumulusnetworks.com#

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoMerge pull request #347 from qlyoung/ignore-flex-sign-error
Renato Westphal [Fri, 7 Apr 2017 21:48:14 +0000 (18:48 -0300)]
Merge pull request #347 from qlyoung/ignore-flex-sign-error

lib: add #pragma to ignore flex sign cmp error

8 years agolib: add #pragma's to ignore flex sign cmp error
Quentin Young [Fri, 7 Apr 2017 17:40:11 +0000 (17:40 +0000)]
lib: add #pragma's to ignore flex sign cmp error

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
8 years agozebra: Experimental commit to see if this fixes snap builds
Donald Sharp [Fri, 7 Apr 2017 17:56:41 +0000 (13:56 -0400)]
zebra: Experimental commit to see if this fixes snap builds

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoMerge remote-tracking branch 'origin/stable/3.0'
Donald Sharp [Fri, 7 Apr 2017 17:37:01 +0000 (13:37 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'

8 years agobgpd: Switch u_int64_t -> uint64_t
Donald Sharp [Fri, 7 Apr 2017 17:34:01 +0000 (13:34 -0400)]
bgpd: Switch u_int64_t -> uint64_t

Apparently u_int64_t is not available( or we don't pull the
right headers in for solaris based systems).

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agopimd: Fix various sizeof and buffer length issues
Donald Sharp [Thu, 6 Apr 2017 21:57:24 +0000 (17:57 -0400)]
pimd: Fix various sizeof and buffer length issues

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agozebra: Get mpls building across multiple platforms.
Donald Sharp [Thu, 6 Apr 2017 14:25:43 +0000 (10:25 -0400)]
zebra: Get mpls building across multiple platforms.

The build system for mpls is a bit convoluted.  We need
a way to handle builds across multiple platforms.  This,
I believe addresses this issue.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoMerge pull request #339 from donaldsharp/update_master
Jafar Al-Gharaibeh [Thu, 6 Apr 2017 18:38:44 +0000 (13:38 -0500)]
Merge pull request #339 from donaldsharp/update_master

*: Switchover to 3.1-dev

8 years agoMerge pull request #338 from donaldsharp/3.0_fixes
Jafar Al-Gharaibeh [Thu, 6 Apr 2017 18:38:29 +0000 (13:38 -0500)]
Merge pull request #338 from donaldsharp/3.0_fixes

3.0 fixes

8 years agopimd: Pim Nexthop Tracking support with ECMP
Chirag Shah [Wed, 5 Apr 2017 20:14:12 +0000 (13:14 -0700)]
pimd: Pim Nexthop Tracking support with ECMP

In this patch, PIM nexthop tracking uses locally populated nexthop cached list
to determine ECMP based nexthop (w/ ECMP knob enabled), otherwise picks
the first nexthop as RPF.
Introduced '[no] ip pim ecmp' command to enable/disable PIM ECMP knob.
By default, PIM ECMP is disabled.
Intorudced '[no] ip pim ecmp rebalance' command to provide existing mcache
entry to switch new path based on hash chosen path.
Introduced, show command to display pim registered addresses and respective nexthops.
Introuduce, show command to find nexthop and out interface for (S,G) or (RP,G).
Re-Register an address with nexthop when Interface UP event received,
to ensure the PIM nexthop cache is updated (being PIM enabled).
During PIM neighbor UP, traverse all RPs and Upstreams nexthop and determine, if
any of nexthop's IPv4 address changes/resolves due to neigbor UP event.

Testing Done: Run various LHR, RP and FHR related cases to resolve RPF using
nexthop cache with ECMP knob disabled, performed interface/PIM neighbor flap events.
Executed pim-smoke with knob disabled.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
8 years agozebra: Fix usage of HAVE_CUMULUS
Donald Sharp [Wed, 15 Mar 2017 19:15:40 +0000 (15:15 -0400)]
zebra: Fix usage of HAVE_CUMULUS

The function zebra_mpls_lsp_label_consistent needs
to be wrappered by HAVE_CUMULUS

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd: Fix iana_afi_t afi_t confusion
Donald Sharp [Wed, 15 Mar 2017 19:12:47 +0000 (15:12 -0400)]
bgpd: Fix iana_afi_t afi_t confusion

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd: correct labeled-unicast withdraw update
Don Slice [Wed, 15 Mar 2017 18:06:54 +0000 (14:06 -0400)]
bgpd: correct labeled-unicast withdraw update

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd: Fix labeled-unicast generation and parsing issues
Don Slice [Wed, 15 Mar 2017 12:43:01 +0000 (08:43 -0400)]
bgpd: Fix labeled-unicast generation and parsing issues

Labeled-unicast updates were being sent with an ipv6 nexthop due to
not setting the mp_nexthop_len or nh_afi.  On the receive side, the
prefix length was being incorrectly determined and has been fixed.
Also the stream for bgp_label_buf was not created.  All resolved.

Ticket: CM-15260
Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by:

8 years agobgpd: bgp_static_update just called bgp_static_update_main
Donald Sharp [Tue, 14 Mar 2017 14:02:16 +0000 (10:02 -0400)]
bgpd: bgp_static_update just called bgp_static_update_main

Just make it one function call

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com.
8 years agozebra: Fix gcc compile warn->error issue
Donald Sharp [Fri, 10 Mar 2017 18:34:02 +0000 (13:34 -0500)]
zebra: Fix gcc compile warn->error issue

flags is set but never used.  Since we
plan to use it in the future, make
it evident what is going on here.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd: Use appropriate Attribute number for labels
Donald Sharp [Fri, 10 Mar 2017 13:04:39 +0000 (08:04 -0500)]
bgpd: Use appropriate Attribute number for labels

The draft-ietf-idr-bgp-prefix-sid-04 specifies the label attribute
should be 40 not 30.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd: Modify attr->flag to be 64 bit
Donald Sharp [Fri, 10 Mar 2017 12:59:52 +0000 (07:59 -0500)]
bgpd: Modify attr->flag to be 64 bit

With the some current bgp drafts the Attribute number has
surpassed 32.  Which is a bit unfortunate in that we keep
track of the attributes via a bitfield based on the attribute #.

For the moment since I am not aware of Attribute #'s being
greater than 64, convert the flag to 64 bit and allow the
bit shifting to know about it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd, lib, zebra: Implement handling of BGP-Prefix-SID label Index
Vivek Venkatraman [Thu, 9 Mar 2017 17:55:54 +0000 (12:55 -0500)]
bgpd, lib, zebra: Implement handling of BGP-Prefix-SID label Index

Implement BGP Prefix-SID IETF draft to be able to signal a labeled-unicast
prefix with a label index (segment ID). This makes it easier to deploy
global MPLS labels with BGP, even without other aspects of Segment Routing
implemented.

This patch implements the handling of the BGP-Prefix-SID Label Index
attribute. When received from a peer and the index is acceptable, the local
label is picked up from the SRGB and is programmed as the incoming label as
well as advertised to peers. If the index is not acceptable, no local label
is assigned. The outgoing label will always be the one advertised by the
downstream neighbor.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
8 years agobgpd: This patch implements the exchange of the BGP-Prefix-SID label index attr
Vivek Venkatraman [Thu, 9 Mar 2017 17:22:04 +0000 (12:22 -0500)]
bgpd: This patch implements the exchange of the BGP-Prefix-SID label index attr

Implement BGP Prefix-SID IETF draft to be able to signal a labeled-unicast
prefix with a label index (segment ID). This makes it easier to deploy
global MPLS labels with BGP, even without other aspects of Segment Routing
implemented.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
8 years agobgpd, zebra: Implement BGP Prefix-SID IETF draft
Vivek Venkatraman [Thu, 9 Mar 2017 16:43:59 +0000 (11:43 -0500)]
bgpd, zebra: Implement BGP Prefix-SID IETF draft

Implement BGP Prefix-SID IETF draft to be able to signal a labeled-unicast
prefix with a label index (segment ID). This makes it easier to deploy
global MPLS labels with BGP, even without other aspects of Segment Routing
implemented.

This patch implements configuration of the global label block (SRGB) and
configuration of a label-index for a network in BGP.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
8 years agobgpd: labeled unicast display
Don Slice [Thu, 9 Mar 2017 21:12:44 +0000 (16:12 -0500)]
bgpd: labeled unicast display

Implement 'show' and 'clear' commands for the labeled-unicast address-family.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
8 years agobgpd: labeled unicast processing
Don Slice [Thu, 9 Mar 2017 14:54:20 +0000 (09:54 -0500)]
bgpd: labeled unicast processing

Implement support for negotiating IPv4 or IPv6 labeled-unicast address
family, exchanging prefixes and installing them in the routing table, as
well as interactions with Zebra for FEC registration. This is the
implementation of RFC 3107.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
8 years agobgpd: labeled unicast config
Don Slice [Wed, 8 Feb 2017 19:19:54 +0000 (14:19 -0500)]
bgpd: labeled unicast config

Implement support for activating the labeled-unicast address family in
BGP and relevant configuration for this address family.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
8 years agoquagga: labeled unicast definitions
Don Slice [Thu, 2 Feb 2017 18:34:00 +0000 (13:34 -0500)]
quagga: labeled unicast definitions

Internal and IANA definitions for labeled-unicast SAFI. Note that this SAFI
is specific to BGP and maps to the corresponding unicast SAFI in Zebra.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
8 years agozebra: labeled unicast handling
Don Slice [Thu, 2 Feb 2017 17:58:33 +0000 (12:58 -0500)]
zebra: labeled unicast handling

Support install of labeled-unicast routes by a client. This would be
BGP, in order to install routes corresponding to AFI/SAFI 1/4 (IPv4)
or 2/4 (IPv6). Convert labeled-unicast routes into label forwarding
entries (i.e., transit LSPs) when there is a static label binding.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
8 years agobgpd: update debugs enance
Don Slice [Wed, 1 Feb 2017 18:19:37 +0000 (13:19 -0500)]
bgpd: update debugs enance

Add information about AFI/SAFI to updates - received and sent.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
8 years agozebra: fec register
Don Slice [Wed, 1 Feb 2017 18:10:56 +0000 (13:10 -0500)]
zebra: fec register

Implement interface that allows a client to register a FEC for obtaining
a label binding (in-label). Update client whenever the label binding is
updated and cleanup when client goes away.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
8 years agozebra: static label binding
Don Slice [Tue, 27 Dec 2016 15:09:28 +0000 (07:09 -0800)]
zebra: static label binding

Implement static label binding of a label to a prefix (FEC).

Note: Currently, only binding to a prefix is supported, the nexthop and/or
other parameters are not considered.  This was cherry-picked by hand from
an earlier mpls branch.

Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
8 years ago*: Switchover to 3.1-dev
Donald Sharp [Thu, 6 Apr 2017 03:18:12 +0000 (23:18 -0400)]
*: Switchover to 3.1-dev

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years ago*: Switchover to 3.0
Donald Sharp [Thu, 6 Apr 2017 03:18:12 +0000 (23:18 -0400)]
*: Switchover to 3.0

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agolib: Fix missing help strings
Donald Sharp [Thu, 6 Apr 2017 03:08:19 +0000 (23:08 -0400)]
lib: Fix missing help strings

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoMerge pull request #337 from donaldsharp/more_spt_more
David Lamparter [Wed, 5 Apr 2017 20:32:46 +0000 (22:32 +0200)]
Merge pull request #337 from donaldsharp/more_spt_more

More spt more

8 years agoMerge pull request #336 from dwalton76/bgpd-allowas-in-removal
David Lamparter [Wed, 5 Apr 2017 20:30:11 +0000 (22:30 +0200)]
Merge pull request #336 from dwalton76/bgpd-allowas-in-removal

bgpd: removing "allowas-in" for peer-group member still allows AS_PATHS

8 years agoMerge pull request #333 from donaldsharp/frr
David Lamparter [Wed, 5 Apr 2017 20:29:39 +0000 (22:29 +0200)]
Merge pull request #333 from donaldsharp/frr

Frr

8 years agoMerge branch 'master' into pim_5549
Donald Sharp [Wed, 5 Apr 2017 16:49:17 +0000 (12:49 -0400)]
Merge branch 'master' into pim_5549

8 years agoMerge pull request #310 from opensourcerouting/thread-prep
Donald Sharp [Wed, 5 Apr 2017 16:39:25 +0000 (12:39 -0400)]
Merge pull request #310 from opensourcerouting/thread-prep

MT preparations

8 years agopimd: Add the ability to never SPT switchover
Donald Sharp [Wed, 5 Apr 2017 16:08:53 +0000 (12:08 -0400)]
pimd: Add the ability to never SPT switchover

Add the ability to allow pim to determine if we should
allow spt-switchover or not on the LHR.

Signed-off-by: Donald Sharp
8 years agopimd: Fix crash when failure to create upstream
Donald Sharp [Thu, 30 Mar 2017 14:50:04 +0000 (10:50 -0400)]
pimd: Fix crash when failure to create upstream

When we have a *,G mroute that starts receiving any particular
S,G, we will get wholepkt callbacks due to the pimreg in the
OIL for the *,G.

So we need to do SPT switchover, but this can fail if we
do not have a path to the S( but we do to the RP!).

In this case fail gracefully.

Ticket: CM-15621
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agopimd: Allow SPT switchover
Donald Sharp [Thu, 23 Mar 2017 01:07:57 +0000 (21:07 -0400)]
pimd: Allow SPT switchover

This allows SPT switchover for S,G upon receipt of packets
on the LHR.

1) When we create a *,G from a IGMP Group Report, install
the *,G route with the pimreg device on the OIL.

2) When a packet hits the LHR that matches the *,G, we will
get a WHOLEPKT callback from the kernel and if we cannot
find the S,G, that means we have matched it on the LHR via
the *,G mroute.  Create the S,G start the KAT and run
inherited_olist.

3) When the S,G times out, safely remove the S,G via
the KAT expiry

4) When the *,G is removed, remove any S,G associated
with it via the LHR flag.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agopimd: Add # of ifchannels to 'show ip pim int'
Donald Sharp [Fri, 24 Mar 2017 19:10:11 +0000 (15:10 -0400)]
pimd: Add # of ifchannels to 'show ip pim int'

Add the ability to see the number of ifchannels
associated with a particular interface.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agobgpd: removing "allowas-in" for peer-group member still allows AS_PATHS
Daniel Walton [Wed, 5 Apr 2017 15:19:00 +0000 (15:19 +0000)]
bgpd: removing "allowas-in" for peer-group member still allows AS_PATHS
with our ASN

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
8 years agoMerge pull request #334 from pichuang/typo frr-3.1-dev
Donald Sharp [Wed, 5 Apr 2017 10:08:28 +0000 (06:08 -0400)]
Merge pull request #334 from pichuang/typo

Remove superfluous path and correct groupname

8 years agoRemove superfluous path and correct groupname
Phil Huang [Wed, 5 Apr 2017 08:00:56 +0000 (16:00 +0800)]
Remove superfluous path and correct groupname

Signed-off-by: Phil Huang <phil_huang@edge-core.com>
8 years agodoc: Cleanup 'Build the Software'
Donald Sharp [Wed, 5 Apr 2017 00:36:16 +0000 (20:36 -0400)]
doc: Cleanup 'Build the Software'

The frrouting.org web page:
https://frrouting.org/manual/Build-the-Software.html#Build-the-Software
is built from doc/install.texi.  The output on this page is a bit
missleading, let's clean it up some.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years ago*: Clean up some wrong references
Donald Sharp [Wed, 5 Apr 2017 00:18:24 +0000 (20:18 -0400)]
*: Clean up some wrong references

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoMerge pull request #332 from opensourcerouting/snmp-fix
Donald Sharp [Tue, 4 Apr 2017 20:39:56 +0000 (16:39 -0400)]
Merge pull request #332 from opensourcerouting/snmp-fix

fix SNMP build

8 years agoMerge pull request #331 from dwalton76/quagga-reload
David Lamparter [Tue, 4 Apr 2017 19:47:01 +0000 (21:47 +0200)]
Merge pull request #331 from dwalton76/quagga-reload

tools: quagga-reload.py fails to change max-paths

8 years agoMerge pull request #330 from dwalton76/ospf-no-log-adjacency-changes-detail
David Lamparter [Tue, 4 Apr 2017 19:45:14 +0000 (21:45 +0200)]
Merge pull request #330 from dwalton76/ospf-no-log-adjacency-changes-detail

ospfd: "no log-adjacency-changes detail" disables log-adjacency-changes

8 years agoMerge pull request #329 from dwalton76/debug-zebra-nht
David Lamparter [Tue, 4 Apr 2017 19:44:28 +0000 (21:44 +0200)]
Merge pull request #329 from dwalton76/debug-zebra-nht

zebra: "debug zebra nht" is not in the config

8 years agovtysh: Fix build for non-snmp case
Donald Sharp [Tue, 4 Apr 2017 19:20:52 +0000 (15:20 -0400)]
vtysh: Fix build for non-snmp case

The snmp code is being included in the build of the vtysh_cmd.c
irrelevant of whether or not it is needed.  Be a bit smarter
about what files to include.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
8 years agobuild: fix CFLAGS for snmp modules
David Lamparter [Tue, 4 Apr 2017 19:25:19 +0000 (21:25 +0200)]
build: fix CFLAGS for snmp modules

The SNMP modules include <net-snmp/net-snmp-config.h>, which won't be
found in off-searchpath directories without SNMP_CFLAGS.  Unfortunately
in my tests the files were on the search path even without the flags.

(SNMP_LIBS is not needed because only libfrrsnmp calls into net-snmp
functions.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
8 years agotools: quagga-reload.py fails to change max-paths
Daniel Walton [Tue, 4 Apr 2017 18:51:32 +0000 (18:51 +0000)]
tools: quagga-reload.py fails to change max-paths

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoospfd: "no log-adjacency-changes detail" disables log-adjacency-changes
Daniel Walton [Tue, 4 Apr 2017 18:13:43 +0000 (18:13 +0000)]
ospfd: "no log-adjacency-changes detail" disables log-adjacency-changes

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agozebra: "debug zebra nht" is not in the config
Daniel Walton [Tue, 4 Apr 2017 18:11:04 +0000 (18:11 +0000)]
zebra: "debug zebra nht" is not in the config

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoMerge branch 'master'
David Lamparter [Tue, 4 Apr 2017 18:04:07 +0000 (20:04 +0200)]
Merge branch 'master'

8 years agobuild: remove wildcards from snapcraft/Makefile.am
David Lamparter [Tue, 4 Apr 2017 16:37:47 +0000 (18:37 +0200)]
build: remove wildcards from snapcraft/Makefile.am

automake does not support globs.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
8 years agoMerge branch 'stable/2.0'
David Lamparter [Tue, 4 Apr 2017 16:34:08 +0000 (18:34 +0200)]
Merge branch 'stable/2.0'

Fixed minor conflicts from "defaults" change on stable.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
8 years agoMerge pull request #294 from opensourcerouting/modules
Donald Sharp [Tue, 4 Apr 2017 15:55:00 +0000 (11:55 -0400)]
Merge pull request #294 from opensourcerouting/modules

Loadable module support

8 years agovtysh: handle "show modules" like "show memory"
David Lamparter [Tue, 4 Apr 2017 14:12:59 +0000 (16:12 +0200)]
vtysh: handle "show modules" like "show memory"

Preface with line identifying which daemon it applies to.
[Also fixes a missed "plugin" -> "module" replace.]

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
8 years agoMerge pull request #322 from qlyoung/fix-distance-commands
David Lamparter [Tue, 4 Apr 2017 13:59:12 +0000 (15:59 +0200)]
Merge pull request #322 from qlyoung/fix-distance-commands

ospfd, ospf6d: fix distance commands

8 years agoMerge pull request #321 from donaldsharp/speed
David Lamparter [Tue, 4 Apr 2017 13:58:11 +0000 (15:58 +0200)]
Merge pull request #321 from donaldsharp/speed

Speedy McSpeederson

8 years agoMerge pull request #314 from donaldsharp/scan-build
David Lamparter [Tue, 4 Apr 2017 13:57:00 +0000 (15:57 +0200)]
Merge pull request #314 from donaldsharp/scan-build

Scan build

8 years agoMerge pull request #324 from opensourcerouting/zebra-v4v6-typos
Donald Sharp [Tue, 4 Apr 2017 13:55:58 +0000 (09:55 -0400)]
Merge pull request #324 from opensourcerouting/zebra-v4v6-typos

zebra: fix v4/v6 typos in some show commands

8 years agozebra: Fix printf formatting
Donald Sharp [Tue, 4 Apr 2017 11:50:31 +0000 (07:50 -0400)]
zebra: Fix printf formatting

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agozebra: fix v4/v6 typos in some show commands
Renato Westphal [Tue, 4 Apr 2017 00:14:18 +0000 (21:14 -0300)]
zebra: fix v4/v6 typos in some show commands

This fixes a few problems like this one:
vtysh# show ipv6 route ospf6
Unknown route type

Also, replace SAFI_UNICAST with SAFI_MULTICAST in the "show ipv6 mroute
vrf all" command.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
8 years agoMerge pull request #323 from LabNConsulting/working/master/patch/install1
Donald Sharp [Mon, 3 Apr 2017 22:55:30 +0000 (18:55 -0400)]
Merge pull request #323 from LabNConsulting/working/master/patch/install1

Fix a couple of centos related install issues

8 years agolib, zebra: Fix CR comments
Donald Sharp [Mon, 3 Apr 2017 22:28:26 +0000 (18:28 -0400)]
lib, zebra: Fix CR comments

lib -> Add a bit of documentation about what units we are in.
zebra -> Fix failure case to be a bit better.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
8 years agoredhat/frr.spec.in: fix typo
Lou Berger [Mon, 3 Apr 2017 21:32:03 +0000 (17:32 -0400)]
redhat/frr.spec.in: fix typo

Signed-off-by: Lou Berger <lberger@labn.net>
8 years agodoc: fix some omissions in centos instructions
Lou Berger [Mon, 3 Apr 2017 21:30:31 +0000 (17:30 -0400)]
doc: fix some omissions in centos instructions

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