Commit Graph

14292 Commits

Author SHA1 Message Date
Renato Westphal
3cb4162cfe lib: fix segfault on freebsd when using vsnprintf() incorrectly
FreeBSD's libc segfaults when vsnprintf() is called with a null
format string. Add a null check before calling vsnprintf() to
resolve this problem.

Fixes #3537

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-02 22:32:13 -02:00
Quentin Young
6205e5dc07
Merge pull request #3553 from opensourcerouting/fix-interface-vrf-update-msg
zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message
2019-01-02 13:50:47 -05:00
Renato Westphal
650f3a558b
Merge pull request #3550 from donaldsharp/sharp_nhg
Sharp nhg
2019-01-02 14:42:34 -02:00
Quentin Young
1d52b3d407
Merge pull request #3534 from opensourcerouting/netlink-length-duplicated
zebra: remove duplicated code
2019-01-02 10:53:49 -05:00
Renato Westphal
91d227b7e3 zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message
Unlike the other interface zapi messages, ZEBRA_INTERFACE_VRF_UPDATE
identifies interfaces using ifindexes and not interface names. This
is a problem because zebra always sends ZEBRA_INTERFACE_DOWN
and ZEBRA_INTERFACE_DELETE messages before sending
ZEBRA_INTERFACE_VRF_UPDATE, and the ZEBRA_INTERFACE_DELETE callback
from all daemons set the interface index to IFINDEX_INTERNAL. Hence,
when decoding a ZEBRA_INTERFACE_VRF_UPDATE message, the interface
lookup would always fail since the corresponding interface lost
its ifindex. Example (ospfd):

OSPF: Zebra: Interface[rt1-eth2] state change to down.
OSPF: Zebra: interface delete rt1-eth2 vrf default[0] index 8 flags 11143 metric 0 mtu 1500
OSPF: [EC 100663301] INTERFACE_VRF_UPDATE: Cannot find IF 8 in VRF 0

To fix this problem, use interface names instead of ifindexes to
indentify interfaces like the other interface zapi messages do.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2019-01-02 13:32:31 -02:00
Donald Sharp
d4101c0a8b sharpd: Allow sharpd to accept nexthop group as part of route install
When installing routes via sharpd 'sharp install route... ' command
add the ability to specify a nexthop-group to use.  This will
allow sharpd to create ECMP routes into zebra.

Nexthop-group:
!
nexthop-group JANELLE
  nexthop 192.168.209.1
  nexthop 192.168.210.1
!

The install:

donna.cumulusnetworks.com# sharp install routes 10.0.50.0 nexthop-group JANELLE 10
donna.cumulusnetworks.com# end
donna.cumulusnetworks.com# show ip route
Codes: K - kernel route, C - connected, S - static, R - RIP,
       O - OSPF, I - IS-IS, B - BGP, E - EIGRP, N - NHRP,
       T - Table, v - VNC, V - VNC-Direct, A - Babel, D - SHARP,
       F - PBR, f - OpenFabric,
       > - selected route, * - FIB route

K>* 0.0.0.0/0 [0/106] via 10.0.2.2, enp0s3, 00:20:38
C>* 10.0.2.0/24 is directly connected, enp0s3, 00:20:38
D>* 10.0.50.0/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.1/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.2/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.3/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.4/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.5/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.6/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.7/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.8/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
D>* 10.0.50.9/32 [150/0] via 192.168.209.1, enp0s8, 00:00:02
  *                      via 192.168.210.1, enp0s9, 00:00:02
C>* 192.168.209.0/24 is directly connected, enp0s8, 00:20:38
C>* 192.168.210.0/24 is directly connected, enp0s9, 00:20:38
donna.cumulusnetworks.com#

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2019-01-02 09:55:51 -05:00
Donald Sharp
81dd71eb68 sharpd/vtysh: Allow sharpd to use nexthop-groups
Allow the sharp daemon to understand and use nexthop-groups.

This commit is merely to allow sharpd to understand them
when accepted in a future commit

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2019-01-02 09:46:33 -05:00
Donald Sharp
694b242f21 sharp: Modify route install to take nexthop groups
Modify the route_add function to take nexthop groups.  Future commits
will allow sharpd to use nexthop groups as the install mechanism
for routes.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2019-01-02 09:46:33 -05:00
Renato Westphal
d52fa66f0e
Merge pull request #3543 from donaldsharp/eigrp_router_id_is_the_bee
Eigrp router id cleanup
2019-01-01 22:39:03 -02:00
Renato Westphal
e079045dde
Merge pull request #3540 from donaldsharp/staic
staticd: Do not ready prefix for printing till it's decoded
2019-01-01 22:36:59 -02:00
Renato Westphal
dd6f112619
Merge pull request #3246 from pguibert6WIND/distribute_vrf_aware
Distribute vrf aware
2019-01-01 22:34:59 -02:00
Donald Sharp
e9e9a7f2b7
Merge pull request #3546 from opensourcerouting/ospf-show-neighbor-fix
ospfd: fix wrong argv index in the "show ip ospf neighbor" command
2018-12-31 09:26:37 -05:00
Renato Westphal
986b87cb3d ospfd: convert a couple of "show" commands to DEFPY
DEFPY commands are easier to maintain and less susceptible to
bugs. In the long term we should try to merge the plethora of
"show ip ospf neighbor" commands (total of 14) into a single DEFPY.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-12-31 11:14:46 -02:00
Renato Westphal
f4f4b6bff5 ospfd: fix wrong argv index in the "show ip ospf neighbor" command
Fixes Issue #3544.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
2018-12-31 11:03:53 -02:00
Donald Sharp
aa0af4243b eigrpd: Allow eigrp to set/unset the router-id as a value.
This code addition allows eigrp to set/unset the router-id
value.  At this point I am not 100% sure that we do all the necessary
rework when a router-id changes.  But on startup if read in before
a network statement we should be ok.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-30 19:59:52 -05:00
Donald Sharp
900e2d42cf eigrpd: eigrp usage of uint32_t to struct in_addr for router_id data
In eigrp we were using a uint32_t to hold the `struct in_addr` data
for the router id values.  This caused us to do unnecessary conversions
pre and post for in/out.  Let's just use the standard `struct in_addr`

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-30 19:55:50 -05:00
Donald Sharp
e7c0d8c234 eigrpd: Write eigrp config even if no network statements yet
Let's write the eigrp config even if we have no network statements
as that the other functions return safely if nothing to do here.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-30 19:44:27 -05:00
Rafael Zalamena
13ec4c1d5b zebra: replace zlog_err with flog_err
Change the logging mechanism for truncated netlink error messages.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2018-12-29 07:14:14 -02:00
Donald Sharp
4a58288894 staticd: Do not ready prefix for printing till it's decoded
The static daemon is setting up the prefix for printing
before it is decoded when we get notified about our
route.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-28 21:06:09 -05:00
Philippe Guibert
03a38493f8 lib, rip, ripng, babel, eigrp: add ctx pointer to distribute api
a distribute_ctx context pointer is returned after initialisation to the
calling daemon. this context pointer will be further used to do
discussion with distribute service. Today, there is no specific problem
with old api, since the pointer is the same in all the memory process.
but the pointer will be different if we have multiple instances. Right
now, this is not the case, but if that happens, that work will be used
for that.
distribute-list initialisation is split in two. the vty initialisation
is done at global level, while the context initialisation is done for
each routing daemon instance.
babel daemon is being equipped with a routing returning the main babel
instance.
also, a delete routine is available when the daemon routing instance is
suppressed.
a list of contexts is used inside distribute_list. This will permit
distribute_list utility to handle in the same daemon to handle more than
one context. This will be very useful in the vrf context.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2018-12-28 18:18:40 +01:00
Philippe Guibert
2569910bb6 lib: enforce vrf_name_to_id by returning default_vrf when name is null
in order to enforce the vrf_id to return, from a vrf name, a check is
done on the vrf_name_to_id callback.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2018-12-28 18:18:40 +01:00
Quentin Young
71c4e0c59b
Merge pull request #3535 from kareiva/master
Fix typos in BGPd sample configuration file
2018-12-27 16:25:26 -05:00
Simonas
196f242fa0
Fix typos in BGPd sample configuration file 2018-12-27 09:13:55 +02:00
Rafael Zalamena
d0c893802a zebra: remove duplicated code
Remove duplicated netlink error message length check.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2018-12-26 17:06:35 -02:00
Donald Sharp
a60df89e65
Merge pull request #3527 from opensourcerouting/ldpd-bsd-fixes
ldpd: *BSD fixes
2018-12-21 20:20:48 -05:00
Rafael Zalamena
f43be00b6a ldpd: fix startup on OpenBSD
We must open the PF_KEY socket before dropping privileges, otherwise the
socket creation will fail with permission problems.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2018-12-21 21:00:53 -02:00
Rafael Zalamena
7f7651eba7 zebra: fix compilation on OpenBSD
OpenBSD doesn't define RTM_LOCK anymore:
https://marc.info/?l=openbsd-tech&m=153018811429193&w=2

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2018-12-21 19:33:58 -02:00
Rafael Zalamena
1ef00571f8 ldpd: add support for FreeBSD IP_BINDANY
Add yet another way to setsockopt a socket to listen to a foreign
address.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
2018-12-21 19:33:48 -02:00
Rafael Zalamena
f6913418f3
Merge pull request #3499 from donaldsharp/topotest_inheritance
Topotest inheritance
2018-12-20 15:52:03 -02:00
Renato Westphal
96def26e5a
Merge pull request #3327 from adeg/feature/bgp-lu-auto-labels
bgpd, zebra: auto assign labels to regular labeled-unicast prefixes
2018-12-20 13:59:28 -02:00
Anton Degtyarev
57592a53b5 bgpd, zebra: auto assign labels from label pool to regular prefixes in BGP labeled unicast
This commit is the last missing piece to complete BGP LU support in bgpd. To this moment, bgpd (and zebra) supported auto label assignment only for prefixes leaked from VRFs to vpn and for MPLS SR prefixes. This adds auto label assignment to other routes types in bgpd. The following enhancements have been made:
* bgp_route.c:bgp_process_main_one() now sets implicit-null local_label to all local, aggregate and redistributed routes.
* bgp_route.c:bgp_process_main_one() now will request a label from the label pool for any prefix that loses the label for some reason (for example, when the static label assignment config is removed)
* bgp_label.c:bgp_reg_dereg_for_label() now requests labels from label pool for routes which have no associated label index
* zebra_mpls.c:zebra_mpls_fec_register() now expects both label and label_index from the calling function, one of which must be set to MPLS_INVALID_LABEL or MPLS_INVALID_LABEL_INDEX, based on this it will decide how to register the provided FEC.

Signed-off-by: Anton Degtyarev <anton@cumulusnetworks.com>
2018-12-20 15:28:52 +03:00
Renato Westphal
bbfaa7054a
Merge pull request #3516 from qlyoung/doc-ip-nht-resolve-via-default
doc: add `ip nht resolve-via-default`
2018-12-20 10:05:01 -02:00
Renato Westphal
fa039939e7
Merge pull request #3517 from qlyoung/doc-exclude-snmptrap
doc: exclude snmptrap.rst from build
2018-12-20 10:04:13 -02:00
Donald Sharp
480e123687
Merge pull request #3515 from mjstapp/fix_rib_wq_timer
zebra: reduce rib workqueue retry timeout
2018-12-19 15:33:56 -05:00
Quentin Young
be11dfbf87 doc: exclude snmptrap.rst from build
This doc is .. include::'d in snmp.rst and needs to be ignored as part
of the main toctree build. This patch squashes a Sphinx build warning.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-12-19 18:10:41 +00:00
Quentin Young
43b8e264c8 doc: add ip nht resolve-via-default
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
2018-12-19 17:55:05 +00:00
Quentin Young
f30f54a79b
Merge pull request #3513 from mjstapp/fix_dplane_q_include
zebra: include lib/queue.h in zebra dataplane
2018-12-19 12:11:24 -05:00
Russ White
69aebba51a
Merge pull request #3492 from donaldsharp/no_set_community
bgpd: Allow 'no set community`
2018-12-19 11:57:01 -05:00
Mark Stapp
7e1d580ad7 zebra: reduce rib workqueue retry timeout
Reduce the zebra rib workqueue retry timeout, used when the queue
towards the zebra dataplane has reached its limit. Lowering the
value was reported to improve update throughput on some platforms.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
2018-12-19 11:51:41 -05:00
Russ White
c52e2ecf95
Merge pull request #3502 from donaldsharp/socket_to_me_baby
BSD route socket refactoring/cleanup
2018-12-19 11:48:42 -05:00
Donald Sharp
c9277ebb41 zebra: Fixup spaces/tabs issue found by CI in rt_socket.c
Cleanup the space/tabs issues found by CI in rt_socket.c so
it stops complaining at us.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 09:42:45 -05:00
Donald Sharp
c2519893e0 zebra: Make label processing guaranteed to be unique
The label processing for socket installs was not ensuring
that each nexthop would not accidently use the last
nexthops value.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 09:42:45 -05:00
Mark Stapp
214fc2bd3a zebra: include lib/queue.h in zebra dataplane
Replace direct use of one of the platform-specific xxx-queue.h
headers - use the wrapper queue.h instead.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
2018-12-19 09:03:33 -05:00
Donald Sharp
4dd39a0ec4 zebra: Convert gate in kernel_rtm to a bool
Convert the gate test int to a bool as that we use it this way.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 08:58:33 -05:00
Donald Sharp
18d10d8854 zebra: The mask and sin_mask are a bit redundant for kernel_rtm
The test we were using to ensure that a mask was sent in
is a bit redundant, let's just always send it in.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 08:58:33 -05:00
Donald Sharp
86afd5292f zebra: Refactor kernel_rtm to be a bit smarter about how it handles options
The ADD/DELETE messages are the only ones we support, so leave
early from the function, in other words don't check it every
nexthop loop.

Additionally nexthops only care about non recursive active flags.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 08:58:33 -05:00
Donald Sharp
08ea27d112 zebra: Refactor kernel_socket kernel_rtm_ipv4 and ipv6 functions
Refactor both v4 and v6 functions down to 1 install function.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 08:58:33 -05:00
Donald Sharp
9ba0e5706c zebra: Move sin6_masklen to earlier in the file
I'm going to rearrage the kernel_rtm_ipv4 and v6 functions
so the sin6_masklen needs to be moved a bit earlier.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 08:58:33 -05:00
Donald Sharp
ca2c70bde0 zebra: Convert socket interface to use union sockunion
The write function converted to v4 and v6 functions to a union sockunion
via casting.  Just use `union sockunion` instead.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 08:58:33 -05:00
Donald Sharp
76a20aa982 bgpd: Allow shortened 'no set large-community' and 'no set large-comm-list'
These two commands previously required the whole original command but
we should allow the user to shorten out this since the data at the
end is not required to figure out what to delete.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2018-12-19 07:30:01 -05:00