]> git.puffer.fish Git - mirror/frr.git/log
mirror/frr.git
7 years agoMerge pull request #728 from donaldsharp/owner
Russ White [Tue, 20 Jun 2017 01:55:43 +0000 (21:55 -0400)]
Merge pull request #728 from donaldsharp/owner

bgpd: Remove unset table.owner

7 years agoMerge pull request #731 from qlyoung/fix-bgp-misc-cli
Russ White [Tue, 20 Jun 2017 01:53:05 +0000 (21:53 -0400)]
Merge pull request #731 from qlyoung/fix-bgp-misc-cli

bgpd: fix misc cli ranges & config writes

7 years agoMerge pull request #732 from qlyoung/coverity-memes
Russ White [Tue, 20 Jun 2017 01:52:10 +0000 (21:52 -0400)]
Merge pull request #732 from qlyoung/coverity-memes

lib: termtable coverity warnings

7 years agoMerge pull request #730 from opensourcerouting/rbtree-improvement
Donald Sharp [Mon, 19 Jun 2017 21:27:55 +0000 (17:27 -0400)]
Merge pull request #730 from opensourcerouting/rbtree-improvement

RB tree improvement

7 years agolib: fix __unused compilation on old platforms 730/head
Rafael Zalamena [Mon, 19 Jun 2017 16:24:04 +0000 (13:24 -0300)]
lib: fix __unused compilation on old platforms

Expand the macro __attribute__ to avoid problem with old platforms that
do not define this.

7 years agolib: rename rb_tree to fix NetBSD compilation
Rafael Zalamena [Mon, 19 Jun 2017 16:17:35 +0000 (13:17 -0300)]
lib: rename rb_tree to fix NetBSD compilation

Change rb_tree struct name to rbt_tree to avoid conflicts with NetBSD.

7 years agolib: Fix ordering of RB Tree
Donald Sharp [Fri, 16 Jun 2017 21:40:17 +0000 (17:40 -0400)]
lib: Fix ordering of RB Tree

So the *bsd implementations of RB Tree's for older
platforms use a macro implementation.  New platforms
have converted to a function implementation that uses
a different calling parameter list.  So when
we attempt to build FRR on older *bsd implementations
the macro's and functions do not interact too well.

As a workaround put the openbsd-tree.h #include
inside of zebra.h at a point before the particular
platforms version is included.  Since we use
the same #if guard for the header we should be ok.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoldpd: fix fallouts from the rb-tree conversion
Renato Westphal [Fri, 16 Jun 2017 20:30:35 +0000 (17:30 -0300)]
ldpd: fix fallouts from the rb-tree conversion

Signed-off-by: Renato Westphal <renato@openbsd.org>
7 years agoMerge pull request #725 from donaldsharp/vrf_completion
David Lamparter [Fri, 16 Jun 2017 19:59:23 +0000 (21:59 +0200)]
Merge pull request #725 from donaldsharp/vrf_completion

Vrf completion

7 years agoMerge pull request #702 from opensourcerouting/ldpd-cli-rewrite
Quentin Young [Fri, 16 Jun 2017 19:53:50 +0000 (15:53 -0400)]
Merge pull request #702 from opensourcerouting/ldpd-cli-rewrite

ldpd: convert cli and get rid of the xml interface

7 years agobgpd: fix misc cli ranges & config writes 731/head
Quentin Young [Fri, 16 Jun 2017 18:03:34 +0000 (18:03 +0000)]
bgpd: fix misc cli ranges & config writes

* Ranges for some MED were 2^32 - 2 instead of 2^32 - 1
* Use correct printf specifiers for unsigned values
* Some drive-by CLI collapsing and simplification

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agolib: termtable coverity warnings 732/head
Quentin Young [Fri, 16 Jun 2017 19:04:57 +0000 (19:04 +0000)]
lib: termtable coverity warnings

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoldpd: update copyright information 702/head
Renato Westphal [Mon, 12 Jun 2017 19:30:54 +0000 (16:30 -0300)]
ldpd: update copyright information

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agoldpd: convert cli and get rid of the xml interface
Renato Westphal [Mon, 12 Jun 2017 14:39:12 +0000 (11:39 -0300)]
ldpd: convert cli and get rid of the xml interface

The xml2cli.pl script was useful years ago when the vty code was very
rudimentary. This is not the case anymore, so convert all ldpd CLI
commands to use DEFUNs directly and get rid of the XML interface.

The benefits are:
* Consistency with the other daemons;
* One less build dependency (the LibXML perl module);
* Easier to add new commands.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agobgpd: Fix as per Code Review comment 725/head
Donald Sharp [Fri, 16 Jun 2017 17:11:12 +0000 (13:11 -0400)]
bgpd: Fix as per Code Review comment

Add ending value in the array.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib, vtysh, zebra: Fix per CR comments
Donald Sharp [Fri, 16 Jun 2017 17:09:37 +0000 (13:09 -0400)]
lib, vtysh, zebra: Fix per CR comments

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Add view/vrf auto completion to commands
Donald Sharp [Thu, 15 Jun 2017 17:48:06 +0000 (13:48 -0400)]
bgpd: Add view/vrf auto completion to commands

Modify the '<view|vrf> NAME' commands to allow auto-completion
of available choices.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years ago*: Add vrf autocompletion for commands
Donald Sharp [Thu, 15 Jun 2017 17:43:26 +0000 (13:43 -0400)]
*: Add vrf autocompletion for commands

Switch NAME to VRFNAME and add vrf autocompletion
to commands that have them

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #718 from qlyoung/fix-vtysh-shit
David Lamparter [Fri, 16 Jun 2017 16:25:48 +0000 (18:25 +0200)]
Merge pull request #718 from qlyoung/fix-vtysh-shit

lib: allow 'do' commands in ENABLE_NODE

7 years agoMerge pull request #726 from chiragshah6/pim_dev
David Lamparter [Fri, 16 Jun 2017 16:24:38 +0000 (18:24 +0200)]
Merge pull request #726 from chiragshah6/pim_dev

pimd: move variable declartion outside of switch

7 years agoMerge pull request #620 from qlyoung/termtable
David Lamparter [Fri, 16 Jun 2017 16:23:14 +0000 (18:23 +0200)]
Merge pull request #620 from qlyoung/termtable

lib: add table generator

7 years agolib: allow 'do' commands in ENABLE_NODE 718/head
Quentin Young [Wed, 14 Jun 2017 19:47:14 +0000 (19:47 +0000)]
lib: allow 'do' commands in ENABLE_NODE

'do' is syntax sugar that allows the user to execute a command under
ENABLE_NODE when in another CLI node. If the user is already in
ENABLE_NODE, use of 'do' was previously disallowed. This patch allows it
because it makes it easier for us to hack around certain instances of
the node synchronization problem with vtysh.

Also included is a fix for one of these problems.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agolib: fix a possible NULL deference
Rafael Zalamena [Fri, 16 Jun 2017 14:08:43 +0000 (11:08 -0300)]
lib: fix a possible NULL deference

Silences a warning generated by clang.

7 years agolib: improve the RB implementation
Rafael Zalamena [Fri, 16 Jun 2017 13:44:31 +0000 (10:44 -0300)]
lib: improve the RB implementation

Switch the RB tree implementation completely to the new dlg@'s version
that uses pre-declared functions instead of macros for tree functions.

Original e-mail/diff:
https://marc.info/?l=openbsd-tech&m=147087487111068&w=2

Pros:

* Reduces the amount of code that the usage of those macros generate
* Allows the compiler to do a better compile-time check job
* Might have better i-cache utilization since the tree code is shared

Con:

* dlg@ benchmarks shows it has 'very slightly slower' insertions
* imported RB_* code must adapt the following calls:
  RB_INIT(), RB_GENERATE(), RB_ROOT(), RB_EMPTY(), make compare
  functions use 'const' (if not already) and maybe others.

7 years agolib: termtable MTYPE_TMP -> MTYPE_TTABLE 620/head
Quentin Young [Thu, 15 Jun 2017 21:02:28 +0000 (21:02 +0000)]
lib: termtable MTYPE_TMP -> MTYPE_TTABLE

And some style nits.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agolib: add table generator
Quentin Young [Wed, 24 May 2017 02:01:00 +0000 (02:01 +0000)]
lib: add table generator

Allows for easy preparation of tabular output.

Supports:
 -- Padding
 -- Alignment
 -- Styling

7 years agobgpd: Remove unset table.owner 728/head
Donald Sharp [Fri, 16 Jun 2017 01:34:19 +0000 (21:34 -0400)]
bgpd: Remove unset table.owner

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agopimd: move variable declartion outside of switch 726/head
Chirag Shah [Thu, 15 Jun 2017 19:20:59 +0000 (12:20 -0700)]
pimd: move variable declartion outside of switch

To Address ICC (intel CC) warning, moving variables
declaration out of switch statement.

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
7 years agoMerge pull request #711 ("Coverity munging")
David Lamparter [Thu, 15 Jun 2017 14:22:42 +0000 (16:22 +0200)]
Merge pull request #711 ("Coverity munging")

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoospfd: fix typo in error message
David Lamparter [Thu, 15 Jun 2017 14:21:58 +0000 (16:21 +0200)]
ospfd: fix typo in error message

... and print the invalid input value

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #705 from dwalton76/bgpd-show-neighbor-community
Lou Berger [Thu, 15 Jun 2017 13:21:44 +0000 (09:21 -0400)]
Merge pull request #705 from dwalton76/bgpd-show-neighbor-community

bgpd: "no neighbor x.x.x.x send-community" not displayed correctly

7 years agolib: fix protocol name array size
David Lamparter [Wed, 14 Jun 2017 18:53:06 +0000 (20:53 +0200)]
lib: fix protocol name array size

Oops.  Fixes #715.

Reported-by: Daniel Walton <dwalton@cumulusnetworks.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #716 from dwalton76/show-route-map
David Lamparter [Wed, 14 Jun 2017 19:07:24 +0000 (21:07 +0200)]
Merge pull request #716 from dwalton76/show-route-map

lib: "show route-map" is missing from the parser

7 years agolib: "show route-map" is missing from the parser 716/head
Daniel Walton [Wed, 14 Jun 2017 18:21:17 +0000 (18:21 +0000)]
lib: "show route-map" is missing from the parser

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
7 years agozebra: Remove unused testzebra and ancillary files 711/head
Donald Sharp [Tue, 13 Jun 2017 18:23:52 +0000 (14:23 -0400)]
zebra: Remove unused testzebra and ancillary files

The testzebra command was unused as well as unmaintained.
The NS and VRF changes never made into testzebra so when
you actually ran testzebra it would just crash due to
uninitialized assumptions.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoeigrpd: Fix integer overflow possibility
Donald Sharp [Tue, 13 Jun 2017 17:33:25 +0000 (13:33 -0400)]
eigrpd: Fix integer overflow possibility

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agopimd: Cleanup ifp->info setup
Donald Sharp [Tue, 13 Jun 2017 17:28:20 +0000 (13:28 -0400)]
pimd: Cleanup ifp->info setup

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoospfclient: Free up leaked resources in error path
Donald Sharp [Tue, 13 Jun 2017 17:15:01 +0000 (13:15 -0400)]
ospfclient: Free up leaked resources in error path

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years ago*: Clean up call into inet_aton
Donald Sharp [Tue, 13 Jun 2017 17:10:32 +0000 (13:10 -0400)]
*: Clean up call into inet_aton

In the few places where we were not checking the return code
for inet_aton, do so.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge branch 'stable/3.0'
David Lamparter [Tue, 13 Jun 2017 15:37:58 +0000 (17:37 +0200)]
Merge branch 'stable/3.0'

Dropped:
redhat/README.rpm_build.md
redhat/daemons
redhat/frr.init
redhat/frr.logrotate
redhat/frr.spec.in

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #681 (ASAN warnings)
David Lamparter [Tue, 13 Jun 2017 15:16:24 +0000 (17:16 +0200)]
Merge pull request #681 (ASAN warnings)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #687 (nexthop refactoring)
David Lamparter [Tue, 13 Jun 2017 14:22:29 +0000 (16:22 +0200)]
Merge pull request #687 (nexthop refactoring)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #624 "Babel"
David Lamparter [Tue, 13 Jun 2017 14:11:32 +0000 (16:11 +0200)]
Merge pull request #624 "Babel"

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agobabeld/eigrpd: flip VTY ports & fix rpm 624/head
David Lamparter [Tue, 13 Jun 2017 12:36:55 +0000 (14:36 +0200)]
babeld/eigrpd: flip VTY ports & fix rpm

babeld was 2609 previously, and this was still marked in SERVICES.
Let's flip it back before we have a release out with it.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #703 from donaldsharp/nl_pid
David Lamparter [Tue, 13 Jun 2017 08:08:43 +0000 (10:08 +0200)]
Merge pull request #703 from donaldsharp/nl_pid

zebra: When calling netlink, set the nl_pid as appropriate

7 years agoMerge pull request #700 "Coverity high"
David Lamparter [Tue, 13 Jun 2017 08:05:51 +0000 (10:05 +0200)]
Merge pull request #700 "Coverity high"

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge pull request #678
David Lamparter [Tue, 13 Jun 2017 08:03:01 +0000 (10:03 +0200)]
Merge pull request #678

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agobabeld: install directly connected IPv4 as such
David Lamparter [Tue, 13 Jun 2017 07:45:16 +0000 (09:45 +0200)]
babeld: install directly connected IPv4 as such

babeld would install "1.2.3.4 on eth0" as "1.2.3.4 via 1.2.3.4 on eth0".
Remove the superfluous nexthop and send to zebra as directly-connected
route.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
7 years agoMerge remote-tracking branch 'frr/master' into pull-624
David Lamparter [Tue, 13 Jun 2017 07:18:14 +0000 (09:18 +0200)]
Merge remote-tracking branch 'frr/master' into pull-624

7 years agobgpd: "no neighbor x.x.x.x send-community" not displayed correctly 705/head
Daniel Walton [Mon, 12 Jun 2017 20:09:09 +0000 (20:09 +0000)]
bgpd: "no neighbor x.x.x.x send-community" not displayed correctly

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
We would only diplay one "no neighbor 2.2.2.2 send-community XYZ" but
there might be multiple that need to be displayed.

7 years agozebra: When calling netlink, set the nl_pid as appropriate 703/head
Donald Sharp [Mon, 12 Jun 2017 17:38:51 +0000 (13:38 -0400)]
zebra: When calling netlink, set the nl_pid as appropriate

This will allow us to further know that we originated the message.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Fix memory leak 700/head
Donald Sharp [Sat, 10 Jun 2017 20:39:41 +0000 (16:39 -0400)]
zebra: Fix memory leak

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Fix uninitialized memory access with src_p
Donald Sharp [Sat, 10 Jun 2017 20:36:32 +0000 (16:36 -0400)]
zebra: Fix uninitialized memory access with src_p

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoeigrpd: Correctly size the dump data
Donald Sharp [Sat, 10 Jun 2017 20:31:49 +0000 (16:31 -0400)]
eigrpd: Correctly size the dump data

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoeigrpd: Use correct memory operation
Donald Sharp [Sat, 10 Jun 2017 20:18:54 +0000 (16:18 -0400)]
eigrpd: Use correct memory operation

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoeigrpd: Fix leak of ep
Donald Sharp [Sat, 10 Jun 2017 20:13:51 +0000 (16:13 -0400)]
eigrpd: Fix leak of ep

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoeigrpd: Cleanup leaked dest_addr
Donald Sharp [Sat, 10 Jun 2017 20:09:29 +0000 (16:09 -0400)]
eigrpd: Cleanup leaked dest_addr

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoeigrpd: Fix use after free
Donald Sharp [Sat, 10 Jun 2017 19:53:27 +0000 (15:53 -0400)]
eigrpd: Fix use after free

Signed-off-by: Donald Sharp <sharpd@Cumulusnetworks.com>
7 years agozebra: Fix possible buffer overrun
Donald Sharp [Sat, 10 Jun 2017 19:42:13 +0000 (15:42 -0400)]
zebra: Fix possible buffer overrun

Use the correct size of the string.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: Free allocated stream in error code
Donald Sharp [Sat, 10 Jun 2017 19:37:02 +0000 (15:37 -0400)]
bgpd: Free allocated stream in error code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agobgpd: fix memleak with 'show ip bgp vrf ...' 699/head
Quentin Young [Fri, 9 Jun 2017 20:18:56 +0000 (20:18 +0000)]
bgpd: fix memleak with 'show ip bgp vrf ...'

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #679 from dslicenc/cm16513
Russ White [Fri, 9 Jun 2017 18:01:36 +0000 (14:01 -0400)]
Merge pull request #679 from dslicenc/cm16513

bgpd: add "set label-index" route-map option

7 years agoMerge pull request #694 from qlyoung/event-loop
Russ White [Fri, 9 Jun 2017 17:54:43 +0000 (13:54 -0400)]
Merge pull request #694 from qlyoung/event-loop

*: remove THREAD_BACKGROUND

7 years agoisisd: fix heap uaf, round 2 681/head
Quentin Young [Fri, 9 Jun 2017 14:53:11 +0000 (14:53 +0000)]
isisd: fix heap uaf, round 2

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #692 from donaldsharp/meta_queue_fix
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 15:41:57 +0000 (10:41 -0500)]
Merge pull request #692 from donaldsharp/meta_queue_fix

zebra: Fix the metaq to be aware of all routing protocols we could see

7 years agoMerge pull request #693 from donaldsharp/more_newlines_missing
Renato Westphal [Thu, 8 Jun 2017 15:33:45 +0000 (12:33 -0300)]
Merge pull request #693 from donaldsharp/more_newlines_missing

bgpd: Fix missing newline

7 years agoMerge pull request #697 from donaldsharp/rt_proto_fixes
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 15:28:35 +0000 (10:28 -0500)]
Merge pull request #697 from donaldsharp/rt_proto_fixes

tools, zebra: Fix netlink notification of who owns the routes

7 years agoMerge pull request #696 from donaldsharp/disable_rtadv
Jafar Al-Gharaibeh [Thu, 8 Jun 2017 14:48:00 +0000 (09:48 -0500)]
Merge pull request #696 from donaldsharp/disable_rtadv

zebra: Fix --disable-rtadv to actually compile

7 years agozebra: In which RTPROT_BABEL is hard
Donald Sharp [Thu, 8 Jun 2017 13:33:54 +0000 (09:33 -0400)]
zebra: In which RTPROT_BABEL is hard

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: For older distributions RTPROT_BABEL might not be defined
Donald Sharp [Thu, 8 Jun 2017 13:16:28 +0000 (09:16 -0400)]
zebra: For older distributions RTPROT_BABEL might not be defined

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agotools, zebra: Allow zebra to insert babel routes as babel
Donald Sharp [Thu, 8 Jun 2017 12:56:36 +0000 (08:56 -0400)]
tools, zebra: Allow zebra to insert babel routes as babel

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agotools, zebra: Fix netlink notification of who owns the routes 697/head
Donald Sharp [Thu, 8 Jun 2017 12:48:10 +0000 (08:48 -0400)]
tools, zebra: Fix netlink notification of who owns the routes

For NHRP, EIGRP and LDP( This is for consistency as opposed to correctness )
assign some new values to routes to be installed into the kernel
so we can know who owns them later.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Fix --disable-rtadv to actually compile 696/head
Alex Couloumbis [Thu, 8 Jun 2017 11:55:25 +0000 (07:55 -0400)]
zebra: Fix --disable-rtadv to actually compile

Signed-off-by: Alex Couloumbis <alex@ozo.com>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years ago*: remove THREAD_BACKGROUND 694/head
Quentin Young [Thu, 8 Jun 2017 01:53:50 +0000 (01:53 +0000)]
*: remove THREAD_BACKGROUND

it's just an alias for a millisecond timer used in exactly nine places
and serves only to complicate

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agobgpd: Fix missing newline 693/head
Donald Sharp [Wed, 7 Jun 2017 22:57:46 +0000 (18:57 -0400)]
bgpd: Fix missing newline

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Add babel routes to the proper meta-Q for processing
Donald Sharp [Wed, 7 Jun 2017 19:57:25 +0000 (15:57 -0400)]
zebra: Add babel routes to the proper meta-Q for processing

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agolib: Add some breadcrumbs for new route types 692/head
Donald Sharp [Wed, 7 Jun 2017 19:47:35 +0000 (15:47 -0400)]
lib: Add some breadcrumbs for new route types

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Fix the metaq to be aware of all routing protocols we could see
Donald Sharp [Wed, 7 Jun 2017 19:43:23 +0000 (15:43 -0400)]
zebra: Fix the metaq to be aware of all routing protocols we could see

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoMerge pull request #678 from chiragshah6/pim_dev
Jafar Al-Gharaibeh [Wed, 7 Jun 2017 18:29:56 +0000 (13:29 -0500)]
Merge pull request #678 from chiragshah6/pim_dev

pimd: fix pim bfd crash and bfd down check specific neigh addr

7 years agoMerge pull request #688 from opensourcerouting/openbsd-mpls-fixes
Donald Sharp [Wed, 7 Jun 2017 14:19:53 +0000 (10:19 -0400)]
Merge pull request #688 from opensourcerouting/openbsd-mpls-fixes

Small fixes for OpenBSD

7 years agodoc: update build instructions for openbsd 688/head
Renato Westphal [Wed, 7 Jun 2017 13:00:34 +0000 (10:00 -0300)]
doc: update build instructions for openbsd

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agozebra: fix uninstallation of mpls lsps in openbsd
Renato Westphal [Wed, 7 Jun 2017 12:53:15 +0000 (09:53 -0300)]
zebra: fix uninstallation of mpls lsps in openbsd

While here, fix a warning in kernel_lsp_cmd().

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agoldpd: remove pledge calls
Renato Westphal [Wed, 7 Jun 2017 00:24:02 +0000 (21:24 -0300)]
ldpd: remove pledge calls

In OpenBSD pledge is a mitigation mechanism used to restrict the syscalls
a program can use, enforcing its correct behavior.

In this port of OpenBSD's ldpd(8), it's hard to run under the same
tight pledge promises because of libfrr and additional components we
introduced, like a zclient in lde. Since ldpd is already privsep'ed,
removing the pledge calls shouldn't be a big compromise security-wise.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
7 years agoMerge pull request #686 from opensourcerouting/redhat-3.0-nhrp
Donald Sharp [Wed, 7 Jun 2017 12:57:18 +0000 (08:57 -0400)]
Merge pull request #686 from opensourcerouting/redhat-3.0-nhrp

Redhat: Add remaining NHRP modifications to match 2.0 and master branch

7 years agozebra: Clean up indentation level in nexthop_active 687/head
Donald Sharp [Wed, 7 Jun 2017 11:39:35 +0000 (07:39 -0400)]
zebra: Clean up indentation level in nexthop_active

Clean up the while loop indentation level to be a bit more
readable.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agozebra: Refactor nexthop_active to remove duplicate code
Donald Sharp [Wed, 7 Jun 2017 11:34:16 +0000 (07:34 -0400)]
zebra: Refactor nexthop_active to remove duplicate code

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
7 years agoRedhat: Add remaining NHRP modifications to match 2.0 and master branch 686/head
Martin Winter [Tue, 6 Jun 2017 22:23:05 +0000 (15:23 -0700)]
Redhat: Add remaining NHRP modifications to match 2.0 and master branch

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoisisd: fix heap uaf
Quentin Young [Tue, 6 Jun 2017 17:53:48 +0000 (17:53 +0000)]
isisd: fix heap uaf

Fix #671

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agozebra: fix misc zebra leaks
Quentin Young [Tue, 6 Jun 2017 16:19:17 +0000 (16:19 +0000)]
zebra: fix misc zebra leaks

Fix #669

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
7 years agoMerge pull request #684 from donaldsharp/redhat_3.0
Martin Winter [Wed, 7 Jun 2017 00:35:27 +0000 (17:35 -0700)]
Merge pull request #684 from donaldsharp/redhat_3.0

Redhat 3.0

7 years agoredhat: Fix changelog to be in correct format and order 684/head
Martin Winter [Tue, 6 Jun 2017 22:03:54 +0000 (15:03 -0700)]
redhat: Fix changelog to be in correct format and order

7 years agoredhat: Fix missing packages in requirements section of README
Martin Winter [Mon, 22 May 2017 11:08:44 +0000 (04:08 -0700)]
redhat: Fix missing packages in requirements section of README

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoredhat: Disallow reload function for unsupported systems
Martin Winter [Mon, 22 May 2017 11:07:22 +0000 (04:07 -0700)]
redhat: Disallow reload function for unsupported systems

Before the change, a reload triggered a restart if the python reload script wasn't installed or for non-integrated configs
With this change, the reload is rejected with an error in this case (and suggests the installation of the python script package)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoredhat: fix previous merge. initsystem detection should now work for mock builds...
Martin Winter [Mon, 22 May 2017 11:04:35 +0000 (04:04 -0700)]
redhat: fix previous merge. initsystem detection should now work for mock builds and native builds on systemd based systems

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoredhat: use %initsystem check that works when chrooted
smccroskey [Fri, 28 Apr 2017 02:39:24 +0000 (19:39 -0700)]
redhat: use %initsystem check that works when chrooted

`systemctl' returns different, non-useful output while in a chroot.
Switch to checking if /sbin/init is a symlink to the systemd binary.
With this change the build works in a mock chroot.

Signed-off-by: Silas McCroskey <smccroskey@cumulusnetworks.com>
7 years agoredhat: fix README for rpm package build
Martin Winter [Thu, 20 Apr 2017 01:45:03 +0000 (18:45 -0700)]
redhat: fix README for rpm package build

- correct requirements
- add comment on bison 2.7 installation on CentOS 6

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoredhat: redirect reload function in frr init script to restart if reload script is...
Martin Winter [Thu, 20 Apr 2017 01:41:45 +0000 (18:41 -0700)]
redhat: redirect reload function in frr init script to restart if reload script is not installed (fixes systemctl restart)

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoredhat: fix duplicate Requires: line in spec file
Martin Winter [Thu, 20 Apr 2017 01:39:49 +0000 (18:39 -0700)]
redhat: fix duplicate Requires: line in spec file

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoredhat: Fix BuildRequires for FRR/2.0 and duplicate /etc/frr/daemons
Martin Winter [Thu, 20 Apr 2017 01:12:10 +0000 (18:12 -0700)]
redhat: Fix BuildRequires for FRR/2.0 and duplicate /etc/frr/daemons

- add make & gcc
- remove autoconf and automake (not needed to build from src.rpm)
- fix texi2html version detection for case when no texi2html is installed (broke yum-builddep)
- fix duplicate listing of /etc/frr/daemons

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
7 years agoredhat: Update documentation for RPM build and usage
Martin Winter [Tue, 18 Apr 2017 01:45:50 +0000 (18:45 -0700)]
redhat: Update documentation for RPM build and usage

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>