]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
7 years agozebra: Allow netlink_talk to choose the filter function to call
Donald Sharp [Tue, 9 Aug 2016 17:02:27 +0000 (13:02 -0400)]
zebra: Allow netlink_talk to choose the filter function to call

The netlink_talk call sends a message to the kernel, which
with netlink_talk_filter only waits for the ACK.

It would be nice to have the ability to specify what the handler
function would be for when we send queries about mcast S,G routes
so that we can gather the data returned from the kernel.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Remove unused variable.
Donald Sharp [Wed, 3 Aug 2016 23:53:42 +0000 (19:53 -0400)]
zebra: Remove unused variable.

Remove the rtnh variable since it is unused.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib: Setup prefix.h to allow it to store (s,g)
Donald Sharp [Fri, 22 Jul 2016 09:58:08 +0000 (05:58 -0400)]
lib: Setup prefix.h to allow it to store (s,g)

We need the ability to store the (s,g) in a struct prefix.
This will allow us to consolidate some duplicated code in
pimd as well as set us up to switch from a link list to a
table to store (s,g) state.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: API to locate client structure based on protocol
vivek [Thu, 21 Jul 2016 15:50:17 +0000 (08:50 -0700)]
zebra: API to locate client structure based on protocol

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Ticket:
Reviewed By: CCR-4968
Testing Done: Tested with subsequent patch(es)

7 years agoMerge pull request #59 from donaldsharp/cli_cleanup
David Lamparter [Tue, 17 Jan 2017 20:36:07 +0000 (21:36 +0100)]
Merge pull request #59 from donaldsharp/cli_cleanup

Cli cleanup, largely VNC related, minor bgpd/ospfd/lib fixes.

7 years agoMerge pull request #82 from opensourcerouting/queue/ldp-xml2cli-build
Donald Sharp [Tue, 17 Jan 2017 18:30:59 +0000 (13:30 -0500)]
Merge pull request #82 from opensourcerouting/queue/ldp-xml2cli-build

build: fix several ldpd XML-CLI build issues

7 years agoMerge remote-tracking branch 'origin/stable/2.0'
Donald Sharp [Tue, 17 Jan 2017 18:03:59 +0000 (13:03 -0500)]
Merge remote-tracking branch 'origin/stable/2.0'

7 years agobuild: fix several ldpd XML-CLI build issues
David Lamparter [Fri, 13 Jan 2017 14:31:04 +0000 (15:31 +0100)]
build: fix several ldpd XML-CLI build issues

- the location of ldp_vty_cmds.c can be either in srcdir or builddir,
  depending on whether a premade file from a dist tarball is used
- perl libxml support is only needed if that file is absent
- the actual perl script wasn't even included in the dist tarball
- the include location doesn't work when srcdir != builddir

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #78 from pguibert6WIND/fix_str2prefix_rd_as4
Donald Sharp [Tue, 17 Jan 2017 17:56:46 +0000 (12:56 -0500)]
Merge pull request #78 from pguibert6WIND/fix_str2prefix_rd_as4

bgpd: str2prefix_rd support for AS4 format

7 years agobgpd: avoid recalculating as_val value in str2prefix_rd
Philippe Guibert [Tue, 17 Jan 2017 16:51:40 +0000 (17:51 +0100)]
bgpd: avoid recalculating as_val value in str2prefix_rd

This is an optimisation that consists in avoiding calling twice atol()
function when converting an ext. community to an AS4 byte or a standard AS byte value.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agoMerge pull request #77 from pguibert6WIND/frr_6wind_vpnv6fix_1
Donald Sharp [Tue, 17 Jan 2017 13:38:49 +0000 (08:38 -0500)]
Merge pull request #77 from pguibert6WIND/frr_6wind_vpnv6fix_1

bgpd: fix nexthop comparison for nexthop vpnv6 attribute

7 years agobgpd: fix nexthop comparison for nexthop vpnv6 attribute
Philippe Guibert [Fri, 6 Jan 2017 12:35:40 +0000 (13:35 +0100)]
bgpd: fix nexthop comparison for nexthop vpnv6 attribute

As nexthop attribute for vpnv6 also contains a blank RD and a blank tag,
the IPv6 address length increases from 16 to 24 bytes. The same was
observed for vpnv4 nexthop, but was missing for VPNv6.
The same is done for martian nexthop debugging.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agobgpd: str2prefix_rd support for AS4 format
Philippe Guibert [Mon, 24 Oct 2016 13:16:36 +0000 (15:16 +0200)]
bgpd: str2prefix_rd support for AS4 format

This commit improves the ability for str2prefix_rd command to support
AS4 format. Until now, only AS2 format and IP format was supported.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agoMerge pull request #68 from donaldsharp/cleanup
Olivier Dugeon [Mon, 16 Jan 2017 14:12:55 +0000 (15:12 +0100)]
Merge pull request #68 from donaldsharp/cleanup

Cleanup

7 years agozebra: Some code cleanup based upon Review.
Donald Sharp [Mon, 16 Jan 2017 13:57:20 +0000 (08:57 -0500)]
zebra: Some code cleanup based upon Review.

Cleanup 2 spots in the code:
1) In if_netlink.c -> combine multi-line if statement into 1 line
2) In zebra_ptm.c -> only handle code that needs to be inside the if statement
in the if statement.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Fixup missing list '...' values
Donald Sharp [Mon, 16 Jan 2017 12:42:38 +0000 (07:42 -0500)]
bgpd: Fixup missing list '...' values

When I modified the code to use the new cli, I missed
adding a '...' in a couple of spaces.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Put back show command to way it was originally
Donald Sharp [Mon, 16 Jan 2017 00:13:23 +0000 (19:13 -0500)]
bgpd: Put back show command to way it was originally

I modified the 'show ....' command to be one long line.
Upon reflection and porting the large-community code
I have decided that we need to put this back to the way
it was before.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Add missing help-string for [route-map WORD]
Donald Sharp [Mon, 16 Jan 2017 00:01:56 +0000 (19:01 -0500)]
bgpd: Add missing help-string for [route-map WORD]

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge remote-tracking branch 'frr/master' into cli_cleanup
Donald Sharp [Sun, 15 Jan 2017 23:56:01 +0000 (18:56 -0500)]
Merge remote-tracking branch 'frr/master' into cli_cleanup

7 years agoospfd: Fix some more virtual-link crashes
Donald Sharp [Sun, 15 Jan 2017 23:45:09 +0000 (18:45 -0500)]
ospfd: Fix some more virtual-link crashes

This commit fixes 2 virtual link cli crashes.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #70 from pguibert6WIND/frr_6wind_vpnv6_2
Donald Sharp [Sat, 14 Jan 2017 00:23:47 +0000 (19:23 -0500)]
Merge pull request #70 from pguibert6WIND/frr_6wind_vpnv6_2

VPNv6 Improvements ( version 2)

7 years agobgpd: Fixup optional safi parameters
Donald Sharp [Fri, 13 Jan 2017 21:45:12 +0000 (16:45 -0500)]
bgpd: Fixup optional safi parameters

The afi/safi specification should allow you to skip
the safi if it is defaulting to unicast.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge branch 'master' into cleanup
Donald Sharp [Fri, 13 Jan 2017 19:48:16 +0000 (14:48 -0500)]
Merge branch 'master' into cleanup

7 years agobgpd: Remove missed HAVE_IPV6
Donald Sharp [Fri, 13 Jan 2017 19:32:02 +0000 (14:32 -0500)]
bgpd: Remove missed HAVE_IPV6

Not sure how I missed this :(

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Fixup paranthesis mistake
Donald Sharp [Fri, 13 Jan 2017 17:46:58 +0000 (12:46 -0500)]
zebra: Fixup paranthesis mistake

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge branch 'stable/2.0-for-merge'
David Lamparter [Fri, 13 Jan 2017 14:24:25 +0000 (15:24 +0100)]
Merge branch 'stable/2.0-for-merge'

Conflicts (CLI vs. atol()):
- bgpd/bgp_vty.c
- ospfd/ospf_vty.c
- zebra/zebra_vty.c

NB: pull req #65 (LabNConsulting/working/2.0/afi-safi-vty/c) was
excluded from this merge.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agopartial merge: revert "LabNConsulting/working/2.0/afi-safi-vty/c"
David Lamparter [Fri, 13 Jan 2017 14:10:05 +0000 (15:10 +0100)]
partial merge: revert "LabNConsulting/working/2.0/afi-safi-vty/c"

Unfortunately, the CLI changes need to be redone on master since the CLI
has massively changed there.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agobgpd: remove one extra help handler from show bgp mpls commands
Philippe Guibert [Fri, 13 Jan 2017 13:29:20 +0000 (14:29 +0100)]
bgpd: remove one extra help handler from show bgp mpls commands

This commit fixes the help display of show bgp mpls commands, since
the last change introduced a problem in relation with help handlers.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agoMerge pull request #67 from opensourcerouting/stable-test-fixes
Donald Sharp [Fri, 13 Jan 2017 13:51:14 +0000 (08:51 -0500)]
Merge pull request #67 from opensourcerouting/stable-test-fixes

stable/2.0 test fixes

7 years agolib: limit size of vty buffer to 4096 bytes
Quentin Young [Tue, 10 Jan 2017 23:33:50 +0000 (23:33 +0000)]
lib: limit size of vty buffer to 4096 bytes

This removes the automatic resizing of the vty input buffer and places a
hard size cap of 4096 bytes. It also fixes a potentially unsafe strcpy.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
[cherry-picked from master 2af38873d89e20bd039255418366c1601aa99e64]

7 years agoMerge pull request #63 from qlyoung/fix-vty-buffer
David Lamparter [Fri, 13 Jan 2017 13:33:50 +0000 (14:33 +0100)]
Merge pull request #63 from qlyoung/fix-vty-buffer

lib: limit size of vty buffer to 4096 bytes

7 years agoMerge pull request #69 from opensourcerouting/queue/indent-watchfrr
Donald Sharp [Fri, 13 Jan 2017 13:21:42 +0000 (08:21 -0500)]
Merge pull request #69 from opensourcerouting/queue/indent-watchfrr

watchfrr: indent to Linux CodingStyle

7 years agobgpd: merge vpnvx network [route-map] command
Philippe Guibert [Mon, 9 Jan 2017 18:29:43 +0000 (19:29 +0100)]
bgpd: merge vpnvx network [route-map] command

This commit merges two vty command into one single vty command

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agobgpd: add some show commands for vpnv6
Philippe Guibert [Sun, 8 Jan 2017 17:09:04 +0000 (18:09 +0100)]
bgpd: add some show commands for vpnv6

Some show commands are added for handling vpnv6.
As the commands was present for vpnv4, but not vpnv6, the handler
routine for vty vpnv4 have been extended for vpnv6.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agobgpd: fix nexthop comparison for nexthop vpnv6 attribute
Philippe Guibert [Fri, 6 Jan 2017 12:35:40 +0000 (13:35 +0100)]
bgpd: fix nexthop comparison for nexthop vpnv6 attribute

As nexthop attribute for vpnv6 also contains a blank RD and a blank tag,
the IPv6 address length increases from 16 to 24 bytes. The same was
observed for vpnv4 nexthop, but was missing for VPNv6.
The same is done for martian nexthop debugging.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agobgpd: add network command for vpnv6 address family
Liu Xiaofeng [Mon, 19 Dec 2016 09:53:38 +0000 (10:53 +0100)]
bgpd: add network command for vpnv6 address family

Add the next commands:

    network X:X::X:X/M rd ASN:nn_or_IP-address:nn tag WORD [route-map WORD]
    no network X:X::X:X/M rd ASN:nn_or_IP-address:nn tag WORD

Also, fix show running-config for vpnv6 network, as well as modiying
bgp_static_set_safi, and take into account matching afi table.

Signed-off-by: Liu Xiaofeng <xiaofeng.liu@6wind.com>
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
7 years agowatchfrr: indent to Linux CodingStyle
David Lamparter [Fri, 13 Jan 2017 13:10:00 +0000 (14:10 +0100)]
watchfrr: indent to Linux CodingStyle

before this patch, watchfrr was using an inconsistent style that matched
neither GNU nor Linux kernel nor BSD style.  Reindent to Linux kernel
style, which should be pretty close to pimd & ldpd.

indent (2.2.11) options used:
 -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4
 -cli0 -d0 -di1 -nfc1 -i8 -ip0 -l80 -lp -npcs -nprs -npsl -sai
 -saf -saw -ncs -nsc -sob -nfca -cp33 -ss -ts8 -il1

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agofrr: Remove HAVE_LIBM from the system
Donald Sharp [Fri, 13 Jan 2017 13:02:50 +0000 (08:02 -0500)]
frr: Remove HAVE_LIBM from the system

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agofrr: Remove HAVE_IPV6 from code base
Donald Sharp [Fri, 13 Jan 2017 12:57:57 +0000 (07:57 -0500)]
frr: Remove HAVE_IPV6 from code base

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agotests: fix mis-fixed format string
David Lamparter [Thu, 15 Dec 2016 23:14:55 +0000 (00:14 +0100)]
tests: fix mis-fixed format string

PRIu64 is "u", we need "x", so PRIx64...

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Cc: Donald Sharp <sharpd@cumulusnetworks.com>
[cherry-picked from master eed831e065694b3746896b126f6ad47548ea9dc0]

7 years agoMerge pull request #38 from donaldsharp/stable_ospf6_fix
David Lamparter [Fri, 13 Jan 2017 10:32:17 +0000 (11:32 +0100)]
Merge pull request #38 from donaldsharp/stable_ospf6_fix

ospf6d: resolve problem with area range lsid creation

7 years agotests: fix exit <> return mix-up in dejagnu
David Lamparter [Thu, 15 Dec 2016 23:09:46 +0000 (00:09 +0100)]
tests: fix exit <> return mix-up in dejagnu

exit 0 exits the entire testrunner... Oops.
Also, "unresolved" breaks too many things, so make this a pass.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
[cherry-picked from master e988dfd35b0d9df437ac043a613472437c8842e6]

7 years agotests: ignore stderr for expect
David Lamparter [Fri, 13 Jan 2017 10:23:18 +0000 (11:23 +0100)]
tests: ignore stderr for expect

expect redirects both stdout and stderr to its input.  This causes
serious problems when libzebra prints log messages to stderr, which are
then asynchronously inserted in the middle of lines of stdout test
output.  Ultimately this makes testbgpmpattr fail on FreeBSD.

(The stdio buffering seems to be slightly different on FreeBSD,
triggering the bug.)

Just ignore stderr for expect.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoapply rename to readme.md
Quentin Young [Thu, 12 Jan 2017 18:10:48 +0000 (13:10 -0500)]
apply rename to readme.md

7 years agoMerge pull request #65 from LabNConsulting/working/2.0/afi-safi-vty/c
Donald Sharp [Thu, 12 Jan 2017 17:54:30 +0000 (12:54 -0500)]
Merge pull request #65 from LabNConsulting/working/2.0/afi-safi-vty/c

Updated: stable/2.0 pull to pick up bgp afi/safi vty changes (Issues #14 and #61)

7 years agoMerge pull request #66 from pguibert6WIND/frr_6wind_afisafi_iana_1
Donald Sharp [Thu, 12 Jan 2017 17:53:00 +0000 (12:53 -0500)]
Merge pull request #66 from pguibert6WIND/frr_6wind_afisafi_iana_1

Quagga: AFI/SAFI mappings IANA to/from internal values

7 years agobgpd: convert 'show_ip_bgp_vpnv4' to afi/safi form (Issue #61)
Lou Berger [Thu, 12 Jan 2017 14:36:24 +0000 (09:36 -0500)]
bgpd: convert 'show_ip_bgp_vpnv4' to afi/safi form (Issue #61)

7 years agobgpd: remove code contained by ifdef KEEP_OLD_VPNV4_COMMANDS
Lou Berger [Thu, 12 Jan 2017 13:54:22 +0000 (08:54 -0500)]
bgpd: remove code contained by ifdef KEEP_OLD_VPNV4_COMMANDS

Signed-off-by: Lou Berger <lberger@labn.net>
7 years agoQuagga: AFI/SAFI mappings IANA to/from internal values
vivek [Wed, 15 Jun 2016 17:25:35 +0000 (10:25 -0700)]
Quagga: AFI/SAFI mappings IANA to/from internal values

Introduce internal and IANA defintions for AFI/SAFI and mapping
functions and modify code to use these. This refactoring will
facilitate adding support for other AFI/SAFI whose IANA values
won't be suitable for internal data structure definitions (e.g.,
they are not contiguous).
The commit adds some fixes related to afi/safi testing with 'make check
' command.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Ticket: CM-11416
Reviewed By: CCR-3594 (mpls branch)
Testing Done: Not tested now, tested earlier on mpls branch

7 years agobgpd: conditionally compile out old vpnv4 syntax (Issue #61)
Lou Berger [Tue, 10 Jan 2017 20:53:03 +0000 (15:53 -0500)]
bgpd: conditionally compile out old vpnv4 syntax (Issue #61)
      (under ifdef KEEP_OLD_VPNV4_COMMANDS)

Signed-off-by: Lou Berger <lberger@labn.net>
7 years agobgpd: restore wildcard handling in show summary (Issue#14)
Lou Berger [Fri, 6 Jan 2017 23:25:56 +0000 (18:25 -0500)]
bgpd: restore wildcard handling in show summary (Issue#14)
      Includes more branch specific afi/safi changes

Signed-off-by: Lou Berger <lberger@labn.net>
7 years agobgpd: restore some missing afi/safi commands (Issue #14)
Lou Berger [Fri, 6 Jan 2017 15:50:31 +0000 (10:50 -0500)]
bgpd: restore some missing afi/safi commands (Issue #14)
      Added defines and parse utility functions
      Fix vty code that treated vpn&encap as AFIs
      and some other related vty printing/handline issues
      Note: Includes branch specific changes (due to new parser)

Signed-off-by: Lou Berger <lberger@labn.net>
7 years agoMerge remote-tracking branch 'origin/develop'
Donald Sharp [Wed, 11 Jan 2017 13:25:17 +0000 (08:25 -0500)]
Merge remote-tracking branch 'origin/develop'

7 years agolib: limit size of vty buffer to 4096 bytes
Quentin Young [Tue, 10 Jan 2017 23:33:50 +0000 (23:33 +0000)]
lib: limit size of vty buffer to 4096 bytes

This removes the automatic resizing of the vty input buffer and places a
hard size cap of 4096 bytes. It also fixes a potentially unsafe strcpy.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agobgpd: Fixing list options to be right
Donald Sharp [Mon, 9 Jan 2017 21:13:40 +0000 (16:13 -0500)]
bgpd: Fixing list options to be right

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Some more cleanup of commands found by vtysh
Donald Sharp [Mon, 9 Jan 2017 20:59:17 +0000 (15:59 -0500)]
bgpd: Some more cleanup of commands found by vtysh

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agovtysh: Add 'vnc l2-group NAME' to exclusion list
Donald Sharp [Mon, 9 Jan 2017 20:35:28 +0000 (15:35 -0500)]
vtysh: Add 'vnc l2-group NAME' to exclusion list

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #58 from opensourcerouting/libxml-check
Donald Sharp [Mon, 9 Jan 2017 15:45:49 +0000 (10:45 -0500)]
Merge pull request #58 from opensourcerouting/libxml-check

build: check if the LibXML perl module is available

7 years agobgpd: Fixup some vnc cli
Donald Sharp [Mon, 9 Jan 2017 15:25:16 +0000 (10:25 -0500)]
bgpd: Fixup some vnc cli

Fixup the vnc cli to use the new syntax as well as fixup a bunch
of cli help strings that were wrong.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib: Fixup 'ipv6 distribute-list ... ' cli help strings
Donald Sharp [Mon, 9 Jan 2017 15:22:39 +0000 (10:22 -0500)]
lib: Fixup 'ipv6 distribute-list ... ' cli help strings

Fixup the cli help strings for 'ipv6 distribute-list [prefix] WORD <in|out> [WORD]'

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobuild: check if the LibXML perl module is available
Renato Westphal [Mon, 9 Jan 2017 14:35:57 +0000 (12:35 -0200)]
build: check if the LibXML perl module is available

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agoMerge pull request #51 from donaldsharp/atol_borked
Olivier Dugeon [Mon, 9 Jan 2017 14:26:41 +0000 (15:26 +0100)]
Merge pull request #51 from donaldsharp/atol_borked

Atol borked

7 years agoMerge pull request #55 from donaldsharp/monotonic
Olivier Dugeon [Mon, 9 Jan 2017 14:26:16 +0000 (15:26 +0100)]
Merge pull request #55 from donaldsharp/monotonic

Monotonic

7 years agoMerge pull request #56 from qlyoung/if-metric
Olivier Dugeon [Mon, 9 Jan 2017 14:25:40 +0000 (15:25 +0100)]
Merge pull request #56 from qlyoung/if-metric

lib: make interface metric a uint32_t

7 years agoMerge pull request #47 from donaldsharp/valgrind
Donald Sharp [Mon, 9 Jan 2017 14:17:17 +0000 (09:17 -0500)]
Merge pull request #47 from donaldsharp/valgrind

Valgrind

7 years agoredhat: update .gitignore
Quentin Young [Mon, 9 Jan 2017 02:36:53 +0000 (02:36 +0000)]
redhat: update .gitignore

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agolib: make interface metric a uint32_t
Quentin Young [Mon, 9 Jan 2017 01:35:41 +0000 (01:35 +0000)]
lib: make interface metric a uint32_t

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agobgpd: Remove knowledge of HAVE_CLOCK_MONTONIC
Donald Sharp [Sun, 8 Jan 2017 00:23:50 +0000 (19:23 -0500)]
bgpd: Remove knowledge of HAVE_CLOCK_MONTONIC

thread.c fails to build properly on systems that do
not have a CLOCK_MONOTONIC.  Therefore there is
no need for bgp to have knowledge of it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agopimd: Remove knowledge of HAVE_CLOCK_MONOTONIC
Donald Sharp [Sun, 8 Jan 2017 00:21:21 +0000 (19:21 -0500)]
pimd: Remove knowledge of HAVE_CLOCK_MONOTONIC

thread.c fails to build if we do not have CLOCK_MONOTONIC
no need to have pim have any knowledge of it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #54 from LabNConsulting/working/master/afi-safi-vty/a
Donald Sharp [Sat, 7 Jan 2017 22:14:27 +0000 (17:14 -0500)]
Merge pull request #54 from LabNConsulting/working/master/afi-safi-vty/a

Working/master/afi safi vty/a

7 years agobgpd: fixup safi as afi confusion in show update-groups
Lou Berger [Sat, 7 Jan 2017 18:41:33 +0000 (13:41 -0500)]
bgpd: fixup safi as afi confusion in show update-groups

7 years agobgpd: restore wildcard handling in show summary (Issue#14)
Lou Berger [Fri, 6 Jan 2017 23:25:56 +0000 (18:25 -0500)]
bgpd: restore wildcard handling in show summary (Issue#14)

7 years agobgpd: restore some missing afi/safi commands (Issue #14)
Lou Berger [Fri, 6 Jan 2017 15:50:31 +0000 (10:50 -0500)]
bgpd: restore some missing afi/safi commands (Issue #14)
      Added defines and parse utility functions
      Fix vty code that treated vpn&encap as AFIs
      and some other related vty printing/handline issues

7 years agoMerge pull request #10 from qlyoung/fix-proto_redistnum
Donald Sharp [Sat, 7 Jan 2017 00:46:41 +0000 (19:46 -0500)]
Merge pull request #10 from qlyoung/fix-proto_redistnum

all: use ->text when parsing protocol argument

7 years agoMerge branch 'master' into fix-proto_redistnum
Quentin Young [Sat, 7 Jan 2017 00:44:46 +0000 (19:44 -0500)]
Merge branch 'master' into fix-proto_redistnum

7 years agoMerge pull request #35 from qlyoung/fix-zebra-rf
Donald Sharp [Sat, 7 Jan 2017 00:42:09 +0000 (19:42 -0500)]
Merge pull request #35 from qlyoung/fix-zebra-rf

zebra: check route flags when deciding whether to update existing route

7 years agoMerge pull request #32 from qlyoung/fix-cli-nits2
Donald Sharp [Sat, 7 Jan 2017 00:38:28 +0000 (19:38 -0500)]
Merge pull request #32 from qlyoung/fix-cli-nits2

bgpd, ospfd, zebra: remove duplicate cli installs

7 years agoMerge pull request #30 from qlyoung/fix-cli-nits
Donald Sharp [Sat, 7 Jan 2017 00:37:28 +0000 (19:37 -0500)]
Merge pull request #30 from qlyoung/fix-cli-nits

vtysh: add `logical-router ...` to extract.pl ignore list

7 years agoMerge pull request #27 from qlyoung/fix-derefs2
Donald Sharp [Sat, 7 Jan 2017 00:36:59 +0000 (19:36 -0500)]
Merge pull request #27 from qlyoung/fix-derefs2

bgpd, lib: fix a few scan-build catches

7 years agoMerge pull request #24 from qlyoung/fix-uninitialized-jump
Donald Sharp [Sat, 7 Jan 2017 00:34:09 +0000 (19:34 -0500)]
Merge pull request #24 from qlyoung/fix-uninitialized-jump

lib: Initialize ->allowrepeat

7 years agoMerge pull request #53 from opensourcerouting/fixes/isis-for-stable
Donald Sharp [Fri, 6 Jan 2017 20:13:43 +0000 (15:13 -0500)]
Merge pull request #53 from opensourcerouting/fixes/isis-for-stable

isisd: clean up own LSPs correctly on update

7 years agoisisd: clean up own LSPs correctly on update
Christian Franke [Fri, 6 Jan 2017 19:19:40 +0000 (20:19 +0100)]
isisd: clean up own LSPs correctly on update

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
7 years agoMerge pull request #40 from opensourcerouting/ldpd-ordered-output
Donald Sharp [Fri, 6 Jan 2017 19:01:23 +0000 (14:01 -0500)]
Merge pull request #40 from opensourcerouting/ldpd-ordered-output

ldpd ordered output - fixes issue#18

7 years agoMerge pull request #39 from opensourcerouting/renato-assorted-fixes
Donald Sharp [Fri, 6 Jan 2017 19:00:29 +0000 (14:00 -0500)]
Merge pull request #39 from opensourcerouting/renato-assorted-fixes

Renato's assorted patches

7 years agoMerge remote-tracking branch 'origin/stable/2.0'
Donald Sharp [Fri, 6 Jan 2017 17:48:32 +0000 (12:48 -0500)]
Merge remote-tracking branch 'origin/stable/2.0'

7 years agoMerge pull request #50 from mwinter-osr/redhat-pkg-rename
Donald Sharp [Fri, 6 Jan 2017 17:41:43 +0000 (12:41 -0500)]
Merge pull request #50 from mwinter-osr/redhat-pkg-rename

Redhat pkg rename

7 years agozebra: Allow tag values greater than 2 billion on arm
Donald Sharp [Fri, 6 Jan 2017 17:25:55 +0000 (12:25 -0500)]
zebra: Allow tag values greater than 2 billion on arm

Due to the usage of atol, values that are larger than
2 billion on arm for tag are not converted correctly.

Ticket: CM-14099
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Allow 'neighbor X local-as Y' to have large values
Donald Sharp [Fri, 6 Jan 2017 17:24:03 +0000 (12:24 -0500)]
bgpd: Allow 'neighbor X local-as Y' to have large values

On ARM platforms specifying a local-as greater than
2 billion causes issues due to atoi usage.

Ticket: CM-14019
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoconfigure.ac: rename red hat spec from quagga.spec to frr.spec
Martin Winter [Fri, 6 Jan 2017 17:12:16 +0000 (00:12 +0700)]
configure.ac: rename red hat spec from quagga.spec to frr.spec

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agocumulus files: Rename Project from Quagga to FRR
Martin Winter [Fri, 6 Jan 2017 17:10:57 +0000 (00:10 +0700)]
cumulus files: Rename Project from Quagga to FRR

Default files used by redhat package scripts

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoredhat: rename project from Quagga to FRR
Martin Winter [Fri, 6 Jan 2017 16:45:13 +0000 (23:45 +0700)]
redhat: rename project from Quagga to FRR

Rename all instances of Quagga to FRR in red hat package files

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoMerge pull request #49 from pguibert6WIND/frr_6wind_mpbgpgracefulrestart_2
Donald Sharp [Fri, 6 Jan 2017 15:22:11 +0000 (10:22 -0500)]
Merge pull request #49 from pguibert6WIND/frr_6wind_mpbgpgracefulrestart_2

Graceful Restart Route Preservation

7 years agoMerge remote-tracking branch 'origin/stable/2.0'
Donald Sharp [Fri, 6 Jan 2017 14:58:21 +0000 (09:58 -0500)]
Merge remote-tracking branch 'origin/stable/2.0'

7 years agobgpd: configure preserve forwarding state from vty
Julien Courtat [Tue, 17 May 2016 14:26:22 +0000 (16:26 +0200)]
bgpd: configure preserve forwarding state from vty

Preserve forwarding state bit can be set in OPEN message with the use of
new vty commands
bgp graceful-restart preserve-fw-state
no bgp graceful-restart preserve-fw-state

This must be set before activating the connection to a peer, since it is
for forging graceful restart capability of OPEN messages.

Signed-off-by: Julien Courtat <julien.courtat@6wind.com>
7 years agobgpd: enable send of Graceful Restart Preserve State F bit
Julien Courtat [Fri, 20 May 2016 10:10:07 +0000 (12:10 +0200)]
bgpd: enable send of Graceful Restart Preserve State F bit

Enhance struct bgp to add a new flag BGP_FLAG_GR_PRESERVE_FWD, which
allow to set the Preserve State F bit of Graceful Restart capability in
OPEN messages.

Signed-off-by: Julien Courtat <julien.courtat@6wind.com>
7 years agoMerge pull request #41 from donaldsharp/quagga_to_frr
Martin Winter [Fri, 6 Jan 2017 13:07:41 +0000 (20:07 +0700)]
Merge pull request #41 from donaldsharp/quagga_to_frr

Quagga to frr - Rename of Quagga to FRR (FreeRangeRouting)

7 years agoospfd: Stop attempt to read beyond end of argv
Donald Sharp [Thu, 5 Jan 2017 17:52:18 +0000 (12:52 -0500)]
ospfd: Stop attempt to read beyond end of argv

When unconfiguring certain commands in ospf, you can
run into situations where we attempt to read beyond
the end of a argv[] vector created.  On certain platforms
this will crash it.

Ticket: CM-14090
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib: Stop potential uninitialized memory access
Donald Sharp [Thu, 5 Jan 2017 17:44:23 +0000 (12:44 -0500)]
lib: Stop potential uninitialized memory access

VRF_UNKNOWN = MAX_INT16_T

The vrf macros to determine where in the bitmap something belongs
assume that the valid values of a vrf are 0 - (MAX_INT16 - 1)
so when they attempt to determine where to look in the bitmap
for VRF_DEFAULT, we can get invalid reads of memory.

This happens because bgp can create vrf's with VRF_UNKNOWN
when we get configuration for a vrf before we've been actually
created in zebra.

Ticket: CM-14090
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #45 from opensourcerouting/fixes/isis-for-stable
Donald Sharp [Fri, 6 Jan 2017 00:32:30 +0000 (19:32 -0500)]
Merge pull request #45 from opensourcerouting/fixes/isis-for-stable

isisd: don't generate LSPs with LSP-ID zero on is-type change

7 years agoisisd: don't generate LSPs with LSP-ID zero on is-type change
Christian Franke [Thu, 5 Jan 2017 19:22:31 +0000 (20:22 +0100)]
isisd: don't generate LSPs with LSP-ID zero on is-type change

Signed-off-by: Christian Franke <chris@opensourcerouting.org>