proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-10-31 08:45:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,833 Commits 4 Branches 191 Tags 125 MiB
ae08637827
Commit Graph

257 Commits

Author SHA1 Message Date
David Lamparter
09781197b6 build: make builddir include path consistent 
... by referencing all autogenerated headers relative to the root
directory.  (90% of the changes here is `version.h`.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
 2021-04-21 15:42:33 +02:00
Mark Stapp
f5a1fb4f32 nhrpd: fix coverity warning about os_socket() 
Ensure we don't try to use an invalid fd in nhrpd, reported
by coverity.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
 2021-04-14 09:57:41 -04:00
Jafar Al-Gharaibeh
d75213d260
Merge pull request #8153 from reubendowle/nhrp-multicast 
nhrp, ospf: add nhrp multicast for OSPF DMVPN
 2021-04-13 12:49:28 -05:00
Philippe Guibert
a8807299ef nhrpd: remove useless typedef 
this typedef was useless. remote it.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-04-13 08:58:54 +02:00
Philippe Guibert
d603c0774e nhrp, zebra, lib: enforce usage of zapi_neigh_ip structure 
zapi_nbr structure is renamed to zapi_neigh_ip.
Initially used to set a neighbor ip entry for gre interfaces, this
structure is used to get events from the zebra layer to nhrp layer.

The ndm state has been added, as it is needed on both sides.
The zebra dplane layer is slightly modified.

Also, to clarify what ZEBRA_NEIGH_ADD/DEL means, a rename is done:
it is called now ZEBRA_NEIGH_IP_ADD/DEL, and it signified that this
zapi interface permits to set link operations by associating ip
addresses to link addresses.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-04-13 08:58:49 +02:00
Philippe Guibert
850b2b70ac nhrp: avoid crashing when terminating interface contexts 
avoid crashing when terminating interface contexts.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-04-12 19:23:57 +02:00
Philippe Guibert
f468a45af2 nhrpd: add a zebra api to configure neighbor table per interface 
neighbor table per interface is being configured per interface, via
zebra api.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-04-12 19:23:53 +02:00
Philippe Guibert
05657ec2b7 nhrp, lib, zebra: add/del neighbor entry possible from nhrp 
a zebra api is extended to offer ability to add or remove neighbor
entry from daemon. Also this extension makes possible to add neigh
entry, not only between IPs and macs, but also between IPs and NBMA IPs.
This API supports configuring ipv6/ipv4 entries with ipv4/ipv6 lladdr.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-04-09 18:29:58 +02:00
Philippe Guibert
b3b7510464 nhrpd: link layer registration to notifications 
neighbor notifications are done in zebra. so, instead of relying on
nhrp, rely on zebra by using zebra api interface.
Consequently, the code originally used in nhrp for netlink neighor
notification is no more used.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-04-09 18:29:58 +02:00
Philippe Guibert
e8263bdb77 nhrpd: use CALLOC instead of MALLOC 
in order to apply a memset to a non initialised structure, use CALLOC
instead of MALLOC

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-04-09 18:29:58 +02:00
Philippe Guibert
4030737044 nhrpd: lookup appropriate ipsec path 
lookup appropriate ipsec path. there are systems where the path where
the charon.vici file is not in standard paths. For that, 'ipsec
--piddir' may help in solving the path.

result of ipsec --piddir is as follow for example:
'
/etc/ike/ipsec.d/run
'

Note that the assumption is done that even if there are several
instances of strongswan across the vrfs, the charon.vici path file is
the same across vrfs. Consequently, as there is a thread per vrf that
performs vici initialisation, and file path retrieval is part of the
vici initialisation procedure, in order to avoid intempestive system
calls, use a boolean 'vici_charon_filepath_done' to avoid doing
unnecessary calls.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
 2021-04-09 18:29:58 +02:00
Reuben Dowle
46d3c1859b nhrpd: Change sockunion2str to %pSU in a few places 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-08 08:45:51 +12:00
Donald Sharp
2a1fa50ecf nhrpd: Fixup tab usage and sockunion2str usage 
For some reason the usage of tabs in a string snuck in as well
as using a sockunion2str instead of %pSU.  Fix.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2021-04-06 10:09:48 -04:00
Reuben Dowle
c2bb9917b1 nhrpd: Fix style issues 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:23:42 +12:00
Reuben Dowle
4946316150 nhrpd: Add missing semicolon 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:23:42 +12:00
Reuben Dowle
32ff81f6c9 nhrpd: Improve debug message for multicast interception 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:23:42 +12:00
Reuben Dowle
63c0a73559 nhrpd: Cleanup multicast nflog handler function 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:23:42 +12:00
Amol Lad
9084e20961 nhrpd: Introduce new - nflog mutlicast-nflog-group (1-65535) - command 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:23:42 +12:00
Reuben Dowle
9f7f6d3c6b nhrpd: Use ethertype defines instead of hard-coded values 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:23:42 +12:00
Reuben Dowle
ca317495b8 nhrpd: Use strlcpy not unsafe strncpy 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:23:42 +12:00
Reuben Dowle
0f8595a9f4 nhrpd: Fix style violation issues 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:23:42 +12:00
Reuben Dowle
4f7a37ace3 nhrpd: Use correct printf format specifier 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:22:59 +12:00
Reuben Dowle
0da7701aa2 nhrpd: Fix multicast crash due to dangling references to nhrp peers 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:22:59 +12:00
Amol Lad
fa31fcf2ea nhrpd: Add support for forwarding multicast packets 
Forwarding multicast is a pre-requisite for allowing multicast based routing
protocols such as OSPF to work with DMVPN

This code relies on externally adding iptables rule. For example:
iptables -A OUTPUT -d 224.0.0.0/24 -o gre1 -j NFLOG --nflog-group 224

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-06 09:22:59 +12:00
Jafar Al-Gharaibeh
283981e4a7
Merge pull request #8240 from reubendowle/fixes/nhrp-nat 
nhrp: NAT fixes
 2021-04-03 22:37:25 -05:00
Reuben Dowle
ba113ac64e nhrpd: Fix memory leak in error path when forwarding packets 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-01 14:52:15 +13:00
Reuben Dowle
d0c9d09aa9 nhrpd: Ensure invalid pointer is not used if two NAT extensions received 
Also cleanup some minor style issues

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-04-01 14:06:24 +13:00
Philippe Guibert
0551aeadff nhrpd: Make some debug prints more informative 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-29 10:21:16 +13:00
Amold Lad
bcf5673d61 nhrpd: Display post-nat NBMA for local addresses 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-29 10:17:19 +13:00
Reuben Dowle
6baf035ce3 nhrpd: Remove unecessary new line from debug messages 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-29 10:17:18 +13:00
Donatas Abraitis
37916b2b11
Merge pull request #8121 from opensourcerouting/macro-cleanup 
*: require ISO C11 + semicolons after file-scope macros
 2021-03-22 11:00:34 +02:00
Reuben Dowle
4ddc702ad2 nhrpd: Use %pSU instead of sockunion2str 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-19 19:10:53 +13:00
Reuben Dowle
00683a1479 nhrpd: Fix some style issues 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-19 09:31:45 +13:00
Donald Sharp
dccd71c182 nhrpd: Remove newline from log message 
We should not be putting new lines in log messages.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
 2021-03-18 10:32:01 -04:00
Amol Lad
e8089de123 nhrpd: Set prefix length in NAT extension in resolution-reply 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Reuben Dowle
9025515c25 nhrpd: Ensure invalid NAT extension info cannot be used 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Reuben Dowle
18cc9c4293 nhrpd: Use SU_ADDRSTRLEN where appropriate 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Amol Lad
611915ae89 nhrpd: populate correct prefix length in NAT extension in Reg-Reply 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Amol Lad
85365e51f0 nhrpd: Add Claimed NBMA field in sh ip nhrp cache output 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Amol Lad
94eae49d01 nhrpd: add NHS details in NAT Extension header 
Hub uses this to check if is itself behind a NAT

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Amol Lad
1bd508da17 nhrpd: copy NAT extension if present else attempt to populate 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Amol Lad
9c292647a9 nhrpd: parse multiple CIEs in NAT extension header 
Cisco devices send can send multiple CIEs so we must search for the correct CIE

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Amol Lad
5e70e83b9e nhrpd: Add empty NAT extension header for Non Natted Spoke in Resolution-Reply 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Amol Lad
1e52c95464 nhrpd: Set correct MTU in NHRP extensions 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Reuben Dowle
999a07f0d4 nhrpd: Send prefix length in NAT extension the same as is done by Cisco 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Gaurav Goyal
c2cffffb37 nhrpd: Add CIE to NAT extension in resolution requests 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Gaurav Goyal
b5fc78c068 nhrpd: Add NAT extension in forwarded packets 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Gaurav Goyal
bb58f44259 nhrpd: Process NAT extension properly, and also fallback to IPSec NAT info 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
Amol Lad
d5dc926f18 nhrpd: Add zbuf routine to peek at contents 
Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>
 2021-03-18 16:35:41 +13:00
David Lamparter
80413c2073 *: require semicolon after FRR_DAEMON_INFO & co. 
... again ...

Signed-off-by: David Lamparter <equinox@diac24.net>
 2021-03-17 06:18:39 +01:00