]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
6 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>
6 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>
6 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

6 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

6 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'

6 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>
6 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>
6 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>
6 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>
6 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>
6 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>
6 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'

6 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>
6 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>
6 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>
6 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*

6 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()

6 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

6 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

6 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

6 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

6 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>
6 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>
6 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>
6 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>
6 years agoospfd: Fix possible crash and wrong data being shown
Donald Sharp [Wed, 16 Nov 2016 16:28:11 +0000 (11:28 -0500)]
ospfd: Fix possible crash and wrong data being shown

When you have more than one ospf interface configured
to be used, we were attempting to reuse the
json_interface_sub pointer after we added it
to the json data structure.

Ticket: CM-13597
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 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>
6 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>
6 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>
6 years agobgpd: fix nh_afi in bgp_packet_mpattr_start()
Daniel Walton [Tue, 16 May 2017 18:05:45 +0000 (18:05 +0000)]
bgpd: fix nh_afi in bgp_packet_mpattr_start()

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agobgpd: fix nh_afi in bgp_packet_mpattr_start()
Daniel Walton [Tue, 16 May 2017 17:28:12 +0000 (17:28 +0000)]
bgpd: fix nh_afi in bgp_packet_mpattr_start()

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
6 years agopimd: Fix core from json static mroute show
Donald Sharp [Wed, 8 Mar 2017 15:27:21 +0000 (10:27 -0500)]
pimd: Fix core from json static mroute show

When we have no normal mroutes and only static mroutes
there exists a code path where we attempted to dereference
c_oil when we were showing static mroutes.  Looks like
a cut-n-paste error, we should be using s_route->c_oil there

Ticket: CM-15013
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: let vty.c manage its own pointers
Quentin Young [Tue, 16 May 2017 15:51:30 +0000 (15:51 +0000)]
lib: let vty.c manage its own pointers

vty.c doesn't require back refs for a couple threads

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agolib: return thread pointer from thread_add*
Quentin Young [Tue, 16 May 2017 15:46:41 +0000 (15:46 +0000)]
lib: return thread pointer from thread_add*

Allow some more flexibility in case callers wish to manage their own
thread pointers and don't require or don't want the thread to keep a
back reference to its holding pointer.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge pull request #492 from dwalton76/stable/2.0
David Lamparter [Tue, 16 May 2017 15:55:58 +0000 (17:55 +0200)]
Merge pull request #492 from dwalton76/stable/2.0

Change Frr.conf to frr.conf

6 years agoospfd: Actually fix ospf redistribute.
Donald Sharp [Fri, 5 May 2017 11:33:17 +0000 (07:33 -0400)]
ospfd: Actually fix ospf redistribute.

This is the final time I swear!

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoospf6d: Fix 'no area .. range...' command
Donald Sharp [Wed, 3 May 2017 02:48:32 +0000 (22:48 -0400)]
ospf6d: Fix 'no area .. range...' command

The cli uplift had confused some parameters.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge branch 'master' into vrf_stuff
Donald Sharp [Tue, 16 May 2017 11:58:55 +0000 (07:58 -0400)]
Merge branch 'master' into vrf_stuff

6 years agolib: Fix missing vrf_int.h from `make distribute`
Donald Sharp [Tue, 16 May 2017 11:49:46 +0000 (07:49 -0400)]
lib: Fix missing vrf_int.h from `make distribute`

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #539 from donaldsharp/arm
David Lamparter [Tue, 16 May 2017 11:41:57 +0000 (13:41 +0200)]
Merge pull request #539 from donaldsharp/arm

Arm

6 years agobgpd: Revert incorrect handling of data
Donald Sharp [Tue, 16 May 2017 02:29:10 +0000 (22:29 -0400)]
bgpd: Revert incorrect handling of data

data is actually allowed to be NULL.  So allow
pass in.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agotests: Fix vrf_init to have correct call
Donald Sharp [Tue, 16 May 2017 02:00:28 +0000 (22:00 -0400)]
tests: Fix vrf_init to have correct call

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Improve error message for the developer
Donald Sharp [Tue, 16 May 2017 00:55:33 +0000 (20:55 -0400)]
lib: Improve error message for the developer

I keep getting people asking me about what to do
when this error is generated when they are programming
new cli.  Maybe this is a bit better bread-crumb?

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Fix arm compile issue with some gcc's
Donald Sharp [Tue, 16 May 2017 00:46:06 +0000 (20:46 -0400)]
eigrpd: Fix arm compile issue with some gcc's

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: Add some more documentation to vrf.h
Donald Sharp [Mon, 15 May 2017 23:37:16 +0000 (19:37 -0400)]
lib: Add some more documentation to vrf.h

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years ago*: Consolidate vrf_hooks into vrf_init
Donald Sharp [Mon, 15 May 2017 23:31:27 +0000 (19:31 -0400)]
*: Consolidate vrf_hooks into vrf_init

We only needed to add/change the vrf callbacks when we initialize
the vrf subsystem.  As such it is not necessary to handle the callbacks
in any other way than through the init function.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years ago*: Remove some unneeded functions
Donald Sharp [Mon, 15 May 2017 23:11:20 +0000 (19:11 -0400)]
*: Remove some unneeded functions

vrf_iflist_create -> By the time this is called in enable, the vrf's iflist
is already created.  Additionally this code should be a properly of the vrf
to init/destroy not someone else.

vrf_iflist_terminate -> This function should be a property of vrf deletion
and does not need to be exposed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib, zebra: Cleanup vrf api some
Donald Sharp [Mon, 15 May 2017 23:02:34 +0000 (19:02 -0400)]
lib, zebra: Cleanup vrf api some

Segregate the vrf enable/disable functionality from other vrf
code.  This is to ensure that people are not actually using
the functions when they should not be.  Also document the
why of it properly in the new vrf_int.h header.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Cleanup a bunch SA warnings.
Donald Sharp [Mon, 15 May 2017 22:48:54 +0000 (18:48 -0400)]
eigrpd: Cleanup a bunch SA warnings.

1) Cleanup SA warnings, more to come
2) Cleanup some non debug guarded zlog_info code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agobgpd: added bgp_nexthop_afi()
Daniel Walton [Mon, 15 May 2017 17:03:10 +0000 (17:03 +0000)]
bgpd: added bgp_nexthop_afi()

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Added bgp_nexthop_afi() to have one place that determines what the
Nexthop AFI is for bgp_packet_mpattr_start()

6 years agosnapcraft: fix minor typo
Quentin Young [Mon, 15 May 2017 16:24:17 +0000 (12:24 -0400)]
snapcraft: fix minor typo

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agosnap: add vtysh as a "proper" command alias for frr.vtysh
Jafar Al-Gharaibeh [Thu, 11 May 2017 21:52:27 +0000 (16:52 -0500)]
snap: add vtysh as a "proper" command alias for frr.vtysh

   This allows direct access to vtysh without the "frr." prefix.
   The alias can be enabled by sudo snap frr vtysh

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
6 years agolib: parser: remove forgotten line
David Lamparter [Mon, 15 May 2017 14:55:30 +0000 (16:55 +0200)]
lib: parser: remove forgotten line

MTYPE_CMD_TOKEN_DATA isn't used anymore, I forgot to ditch the line.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years ago*: make consistent & update GPLv2 file headers
David Lamparter [Sat, 13 May 2017 08:25:29 +0000 (10:25 +0200)]
*: make consistent & update GPLv2 file headers

The FSF's address changed, and we had a mixture of comment styles for
the GPL file header.  (The style with * at the beginning won out with
580 to 141 in existing files.)

Note: I've intentionally left intact other "variations" of the copyright
header, e.g. whether it says "Zebra", "Quagga", "FRR", or nothing.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #531 from qlyoung/fix-stack-ref
Lou Berger [Mon, 15 May 2017 14:34:38 +0000 (10:34 -0400)]
Merge pull request #531 from qlyoung/fix-stack-ref

lib: fix access to stack value

6 years agodoc: fix VARIABLE <> WORD confusion in cli.md
David Lamparter [Fri, 12 May 2017 10:25:26 +0000 (12:25 +0200)]
doc: fix VARIABLE <> WORD confusion in cli.md

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobgpd: autocomplete peer-groups & interface peers
David Lamparter [Fri, 12 May 2017 10:22:56 +0000 (12:22 +0200)]
bgpd: autocomplete peer-groups & interface peers

This wasn't quite correct in the previous patch, leading to peer-groups
& interface peers breaking in autocompletion.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agolib: cli: fix IPv6 address partial matching
David Lamparter [Thu, 11 May 2017 09:26:40 +0000 (11:26 +0200)]
lib: cli: fix IPv6 address partial matching

A partially-entered IPv6 address would never return a "partly_match",
meaning some possible completions weren't listed by the matcher.

This specifically breaks autocompleting BGP IPv6 neighbor addresses.
Before:
aegaeon# show ip bg ne 2001:<?>
  WORD      Neighbor on BGP configured interface

After:
aegaeon# show ip bg ne 2001:<?>
  WORD      Neighbor on BGP configured interface
  X:X::X:X  Neighbor to display information about
      2001:db8::2

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agodoc: update CLI documentation
David Lamparter [Thu, 11 May 2017 09:20:20 +0000 (11:20 +0200)]
doc: update CLI documentation

Fix markdown formatting & add variable names.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agobgpd: autocomplete neighbor names
David Lamparter [Wed, 10 May 2017 14:55:42 +0000 (16:55 +0200)]
bgpd: autocomplete neighbor names

Add autocompletion for neighbor IP/IPv6/peer-group names.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agovtysh: autocomplete variables
David Lamparter [Wed, 10 May 2017 14:38:48 +0000 (16:38 +0200)]
vtysh: autocomplete variables

This asks the connected daemons for their variable completions through a
hidden CLI command.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agolib: cli: autocomplete variables
David Lamparter [Sat, 19 Nov 2016 10:57:08 +0000 (11:57 +0100)]
lib: cli: autocomplete variables

Shows known values in the appropriate naming domain when the user hits
<?> or <Tab>.  This patch only works in the telnet CLI, the next patch
adds vtysh support.

Included completions:
- interface names
- route-map names
- prefix-list names

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agolib: parser: add pre-merge varname propagation step
David Lamparter [Wed, 22 Mar 2017 05:56:17 +0000 (06:56 +0100)]
lib: parser: add pre-merge varname propagation step

Fills token->varname based on context.  WORD tokens use the WORD - if it
isn't actually "WORD".  Other than that, a preceding constant token is
used as name.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agolib: parser: split off & rename graph handling
David Lamparter [Fri, 18 Nov 2016 15:24:47 +0000 (16:24 +0100)]
lib: parser: split off & rename graph handling

Put core CLI graph stuff in lib/command_graph.[ch] and consistently
prefix all function names with "cmd_".

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agolib: parser: add named variables in CLI
David Lamparter [Fri, 18 Nov 2016 11:06:57 +0000 (12:06 +0100)]
lib: parser: add named variables in CLI

struct cmd_token now has a "varname" field which is derived from the
DEFUN's string definition.  It can be manually specified with "$name"
after some token, e.g. "foo WORD$var".  A later commit adds code to
automatically fill the value if nothing is specified.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
6 years agoMerge pull request #520 from opensourcerouting/bgpd-fixes-master
Donald Sharp [Mon, 15 May 2017 14:01:39 +0000 (10:01 -0400)]
Merge pull request #520 from opensourcerouting/bgpd-fixes-master

bgpd: assorted fixes (master)

6 years agoMerge pull request #527 from LabNConsulting/working/master/patch-set/issue471+473
Donald Sharp [Mon, 15 May 2017 14:01:04 +0000 (10:01 -0400)]
Merge pull request #527 from LabNConsulting/working/master/patch-set/issue471+473

Master: Restore label distribution for VPN safi

6 years agoMerge pull request #526 from donaldsharp/renato_eigrp
David Lamparter [Mon, 15 May 2017 12:32:13 +0000 (14:32 +0200)]
Merge pull request #526 from donaldsharp/renato_eigrp

Renato eigrp

6 years agobgpd: Cleanup some SA
Donald Sharp [Mon, 15 May 2017 11:33:48 +0000 (07:33 -0400)]
bgpd: Cleanup some SA

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agolib: fix access to stack value
Quentin Young [Mon, 15 May 2017 06:29:54 +0000 (06:29 +0000)]
lib: fix access to stack value

Passing stack value to thread_add_* causes thread->ref to become an
invalid pointer when the value goes out of scope

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoMerge remote-tracking branch 'origin/stable/3.0'
Donald Sharp [Mon, 15 May 2017 01:19:33 +0000 (21:19 -0400)]
Merge remote-tracking branch 'origin/stable/3.0'

6 years agobgpd: fix table leak introduced in labeled unicast (Issue #473)
Lou Berger [Mon, 15 May 2017 00:24:25 +0000 (20:24 -0400)]
bgpd: fix table leak introduced in labeled unicast (Issue #473)
      Fix tested for vpn and encap ribs/safi.  Labeled unicast
      may still leak as not tested.

Signed-off-by: Lou Berger <lberger@labn.net>
6 years agobgpd: fix v6 encap safi config - more labeled unicast breakage (Issue #473)
Lou Berger [Sun, 14 May 2017 15:10:42 +0000 (11:10 -0400)]
bgpd: fix v6 encap safi config - more labeled unicast breakage (Issue #473)

Signed-off-by: Lou Berger <lberger@labn.net>
6 years agobgpd: fix rfapi label origination (Issue #473)
Lou Berger [Sat, 13 May 2017 21:46:05 +0000 (17:46 -0400)]
bgpd: fix rfapi label origination (Issue #473)

Signed-off-by: Lou Berger <lberger@labn.net>
6 years agobgpd: fix VPN SAFI label distribution (Issue #473)
Lou Berger [Sat, 13 May 2017 20:38:35 +0000 (16:38 -0400)]
bgpd: fix VPN SAFI label distribution (Issue #473)

Signed-off-by: Lou Berger <lberger@labn.net>
6 years agobgpd: add epvn as labeled safi type (ISSUE #471)
Lou Berger [Sat, 13 May 2017 20:37:13 +0000 (16:37 -0400)]
bgpd: add epvn as labeled safi type (ISSUE #471)

Signed-off-by: Lou Berger <lberger@labn.net>
6 years agoeigrpd: Diverse Fixes
Renato Westphal [Thu, 27 Apr 2017 17:55:23 +0000 (14:55 -0300)]
eigrpd: Diverse Fixes

* Correct the metric calculation as well as the default metrics;
* Do not show invalid routes in the "show ip eigrp topology".
* Add support to VRFs;
* When downloading a neighbor remove the related routes;
* Fix bugs in the parser of packages they were creating
Invalid default routes;
* Add and remove routes in the zebra;
* Add command "on router eigrp AS";
* Make "delay" and "bandwitch" commands work as well as
Display them in running config;
* Add "no" version of several commands;
* Fix a serious momory leaks;
* Fix segfault when there is no 'successor' route to a
Given prefix;
* Other minor corrections;

Signed-off-by: Renato Westphal <renatowestphal@gmail.com>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoeigrpd: Some Basic Corrections
Renato Westphal [Fri, 12 May 2017 19:38:18 +0000 (15:38 -0400)]
eigrpd: Some Basic Corrections

* Advertise routes to zebra
* Connected routes should not have a nexthop address
* Fix segfaut on exit

Signed-off-by: Renato Westphal <renatowestphal@gmail.com>
6 years agolib: Cleanup command parsing a tiny bit
Donald Sharp [Fri, 12 May 2017 13:16:23 +0000 (09:16 -0400)]
lib: Cleanup command parsing a tiny bit

The CLI changes now make it impossible for numbers
outside the range specified in the cli to make it to
this code.  No need to check for it again.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
6 years agoMerge pull request #521 from opensourcerouting/bgpd-fixes-stable
Donald Sharp [Sat, 13 May 2017 16:24:32 +0000 (12:24 -0400)]
Merge pull request #521 from opensourcerouting/bgpd-fixes-stable

bgpd: assorted fixes (stable/3.0)

6 years agoMerge pull request #508 from LabNConsulting/working/3.0/patch/issue198
David Lamparter [Sat, 13 May 2017 07:10:09 +0000 (09:10 +0200)]
Merge pull request #508 from LabNConsulting/working/3.0/patch/issue198

bgpd: Issue #198 - clean up duplicate encap SAFI commands

6 years agoMerge pull request #525 from qlyoung/frr-script-fix
David Lamparter [Sat, 13 May 2017 07:09:22 +0000 (09:09 +0200)]
Merge pull request #525 from qlyoung/frr-script-fix

tools: $valgrind --> "$valgrind"

6 years agoMerge pull request #524 from qlyoung/blublublub3.0
David Lamparter [Sat, 13 May 2017 07:08:55 +0000 (09:08 +0200)]
Merge pull request #524 from qlyoung/blublublub3.0

lib: use %p specifier for pointers

6 years agotools: $valgrind --> "$valgrind"
Quentin Young [Fri, 12 May 2017 23:29:58 +0000 (23:29 +0000)]
tools: $valgrind --> "$valgrind"

String cmp missing quotes

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agolib: use %p specifier for pointers
Quentin Young [Fri, 12 May 2017 21:37:36 +0000 (21:37 +0000)]
lib: use %p specifier for pointers

Fixes builds on ARM

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
6 years agoREADME: add references to EIGRP and NHRP.
Vincent JARDIN [Fri, 12 May 2017 20:51:45 +0000 (22:51 +0200)]
README: add references to EIGRP and NHRP.

6 years agoMerge pull request #518 from dwalton76/zebra-mpls-lsp-uninstall
Renato Westphal [Fri, 12 May 2017 15:51:06 +0000 (12:51 -0300)]
Merge pull request #518 from dwalton76/zebra-mpls-lsp-uninstall

zebra: zebra_mpls_lsp_uninstall was not being called

6 years agoMerge pull request #495 from donaldsharp/mpls_fixes
Renato Westphal [Fri, 12 May 2017 15:23:52 +0000 (12:23 -0300)]
Merge pull request #495 from donaldsharp/mpls_fixes

Mpls fixes

6 years agobgpd: fix segfault with '[no] bgp network import-check'
Renato Westphal [Fri, 12 May 2017 14:01:02 +0000 (11:01 -0300)]
bgpd: fix segfault with '[no] bgp network import-check'

These commands were causing bgpd to crash if a static VPN route was
configured.

While here, fix a bug in bgp_static_add() and bgp_static_delete().

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agobgpd: fix duplicate install of command
Renato Westphal [Fri, 12 May 2017 12:40:21 +0000 (09:40 -0300)]
bgpd: fix duplicate install of command

Only happens when FRR is configured with --enable-oldvpn-commands.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agobgpd: fix 'show bgp [...] longer-prefixes'
Renato Westphal [Fri, 12 May 2017 12:19:42 +0000 (09:19 -0300)]
bgpd: fix 'show bgp [...] longer-prefixes'

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agobgpd: remove unused bgp_attr_default_intern() function
Renato Westphal [Fri, 12 May 2017 14:36:14 +0000 (11:36 -0300)]
bgpd: remove unused bgp_attr_default_intern() function

This function is not used anymore since commit 137446f9.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agolib: remove gap between AFI_IP6 and AFI_L2VPN
Renato Westphal [Fri, 12 May 2017 14:04:31 +0000 (11:04 -0300)]
lib: remove gap between AFI_IP6 and AFI_L2VPN

We have several pieces of code like this in FRR:

  for (afi = AFI_IP; afi < AFI_MAX; afi++)
    for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)
      bgp_distance_table[afi][safi] = bgp_table_init (afi, safi);

We were creating a lot of useless garbage in the code because of this
gap. Fix this.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agobgpd: fix segfault with '[no] bgp network import-check'
Renato Westphal [Fri, 12 May 2017 14:01:02 +0000 (11:01 -0300)]
bgpd: fix segfault with '[no] bgp network import-check'

These commands were causing bgpd to crash if a static VPN route was
configured.

While here, fix a bug in bgp_static_add() and bgp_static_delete().

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agobgpd: fix duplicate install of command
Renato Westphal [Fri, 12 May 2017 12:40:21 +0000 (09:40 -0300)]
bgpd: fix duplicate install of command

Only happens when FRR is configured with --enable-oldvpn-commands.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agobgpd: removed unused parameter from bgp_dump_attr()
Renato Westphal [Fri, 12 May 2017 12:28:43 +0000 (09:28 -0300)]
bgpd: removed unused parameter from bgp_dump_attr()

Originally we used the 'peer' parameter for this:

  if (peer_sort (peer) == BGP_PEER_IBGP)
    snprintf (buf + strlen (buf), size - strlen (buf), ", localpref %d",
              attr->local_pref);

Now we have this:

  if (CHECK_FLAG (attr->flag, ATTR_FLAG_BIT (BGP_ATTR_LOCAL_PREF)))
    snprintf (buf + strlen (buf), size - strlen (buf), ", localpref %u",
              attr->local_pref);

Remove the now useless 'peer' parameter.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agolib: add labeled-unicast in safi2str()
Renato Westphal [Fri, 12 May 2017 12:21:34 +0000 (09:21 -0300)]
lib: add labeled-unicast in safi2str()

While here, move SAFI_ENCAP above SAFI_MPLS_VPN to keep the ordering
consistent.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agobgpd: fix 'show bgp [...] longer-prefixes'
Renato Westphal [Fri, 12 May 2017 12:19:42 +0000 (09:19 -0300)]
bgpd: fix 'show bgp [...] longer-prefixes'

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
6 years agozebra: zebra_mpls_lsp_uninstall was not being called
Daniel Walton [Fri, 12 May 2017 13:34:51 +0000 (13:34 +0000)]
zebra: zebra_mpls_lsp_uninstall was not being called

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Old entries were not being removed from the MPLS table.

6 years agoMerge pull request #511 from donaldsharp/netlink_dump
Jafar Al-Gharaibeh [Fri, 12 May 2017 03:47:22 +0000 (22:47 -0500)]
Merge pull request #511 from donaldsharp/netlink_dump

zebra: Fix kernel netlink hex dump of information