sharpd: Allow sharpd to accept nexthop group as part of route install

[mirror_frr.git] / bfdd / linux.c

diff --git a/bfdd/linux.c b/bfdd/linux.c
index 8a68511d533a1e2df58272e2d47924f6c2a71783..e260851ddba6a229573406c7540c3e20b3a99ec0 100644 (file)
--- a/bfdd/linux.c
+++ b/bfdd/linux.c
@@ -23,49 +23,8 @@
 
 #ifdef BFD_LINUX
 
-/* XXX: fix compilation error on Ubuntu 16.04 or older. */
-#ifndef _UAPI_IPV6_H
-#define _UAPI_IPV6_H
-#endif /* _UAPI_IPV6_H */
-
-#include <linux/filter.h>
-#include <linux/if_packet.h>
-
-#include <netinet/if_ether.h>
-
-#include <net/if.h>
-#include <sys/ioctl.h>
-
 #include "bfd.h"
 
-/* Berkeley Packet filter code to filter out BFD Echo packets.
- * tcpdump -dd "(udp dst port 3785)"
- */
-static struct sock_filter bfd_echo_filter[] = {
-       {0x28, 0, 0, 0x0000000c}, {0x15, 0, 4, 0x000086dd},
-       {0x30, 0, 0, 0x00000014}, {0x15, 0, 11, 0x00000011},
-       {0x28, 0, 0, 0x00000038}, {0x15, 8, 9, 0x00000ec9},
-       {0x15, 0, 8, 0x00000800}, {0x30, 0, 0, 0x00000017},
-       {0x15, 0, 6, 0x00000011}, {0x28, 0, 0, 0x00000014},
-       {0x45, 4, 0, 0x00001fff}, {0xb1, 0, 0, 0x0000000e},
-       {0x48, 0, 0, 0x00000010}, {0x15, 0, 1, 0x00000ec9},
-       {0x6, 0, 0, 0x0000ffff},  {0x6, 0, 0, 0x00000000},
-};
-
-/* Berkeley Packet filter code to filter out BFD vxlan packets.
- * tcpdump -dd "(udp dst port 4789)"
- */
-static struct sock_filter bfd_vxlan_filter[] = {
-       {0x28, 0, 0, 0x0000000c}, {0x15, 0, 4, 0x000086dd},
-       {0x30, 0, 0, 0x00000014}, {0x15, 0, 11, 0x00000011},
-       {0x28, 0, 0, 0x00000038}, {0x15, 8, 9, 0x000012b5},
-       {0x15, 0, 8, 0x00000800}, {0x30, 0, 0, 0x00000017},
-       {0x15, 0, 6, 0x00000011}, {0x28, 0, 0, 0x00000014},
-       {0x45, 4, 0, 0x00001fff}, {0xb1, 0, 0, 0x0000000e},
-       {0x48, 0, 0, 0x00000010}, {0x15, 0, 1, 0x000012b5},
-       {0x6, 0, 0, 0x0000ffff},  {0x6, 0, 0, 0x00000000},
-};
-
 
 /*
  * Definitions.
@@ -75,13 +34,13 @@ int ptm_bfd_fetch_ifindex(const char *ifname)
        struct ifreq ifr;
 
        if (strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name))
-           > sizeof(ifr.ifr_name)) {
-               CRITLOG("Interface name %s truncated", ifr.ifr_name);
-       }
+           > sizeof(ifr.ifr_name))
+               log_error("interface-to-index: name truncated ('%s' -> '%s')",
+                         ifr.ifr_name, ifname);
 
        if (ioctl(bglobal.bg_shop, SIOCGIFINDEX, &ifr) == -1) {
-               CRITLOG("Getting ifindex for %s failed: %s", ifname,
-                       strerror(errno));
+               log_error("interface-to-index: %s translation failed: %s",
+                         ifname, strerror(errno));
                return -1;
        }
 
@@ -93,13 +52,13 @@ void ptm_bfd_fetch_local_mac(const char *ifname, uint8_t *mac)
        struct ifreq ifr;
 
        if (strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name))
-           > sizeof(ifr.ifr_name)) {
-               CRITLOG("Interface name %s truncated", ifr.ifr_name);
-       }
+           > sizeof(ifr.ifr_name))
+               log_error("interface-mac: name truncated ('%s' -> '%s')",
+                         ifr.ifr_name, ifname);
 
        if (ioctl(bglobal.bg_shop, SIOCGIFHWADDR, &ifr) == -1) {
-               CRITLOG("Getting mac address for %s failed: %s", ifname,
-                       strerror(errno));
+               log_error("interface-mac: %s MAC retrieval failed: %s", ifname,
+                         strerror(errno));
                return;
        }
 
@@ -118,60 +77,14 @@ void fetch_portname_from_ifindex(int ifindex, char *ifname, size_t ifnamelen)
        ifr.ifr_ifindex = ifindex;
 
        if (ioctl(bglobal.bg_shop, SIOCGIFNAME, &ifr) == -1) {
-               CRITLOG("Getting ifname for ifindex %d failed: %s", ifindex,
-                       strerror(errno));
+               log_error("index-to-interface: index %d failure: %s", ifindex,
+                         strerror(errno));
                return;
        }
 
-       strlcpy(ifname, ifr.ifr_name, ifnamelen);
-}
-
-int ptm_bfd_echo_sock_init(void)
-{
-       int s;
-       struct sock_fprog bpf = {.len = sizeof(bfd_echo_filter)
-                                       / sizeof(bfd_echo_filter[0]),
-                                .filter = bfd_echo_filter};
-
-       s = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_IP));
-       if (s == -1) {
-               ERRLOG("%s: socket: %s", __func__, strerror(errno));
-               return -1;
-       }
-
-       if (setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &bpf, sizeof(bpf))
-           == -1) {
-               ERRLOG("%s: setsockopt(SO_ATTACH_FILTER): %s", __func__,
-                      strerror(errno));
-               close(s);
-               return -1;
-       }
-
-       return s;
-}
-
-int ptm_bfd_vxlan_sock_init(void)
-{
-       int s;
-       struct sock_fprog bpf = {.len = sizeof(bfd_vxlan_filter)
-                                       / sizeof(bfd_vxlan_filter[0]),
-                                .filter = bfd_vxlan_filter};
-
-       s = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_IP));
-       if (s == -1) {
-               ERRLOG("%s: socket: %s", __func__, strerror(errno));
-               return -1;
-       }
-
-       if (setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &bpf, sizeof(bpf))
-           == -1) {
-               ERRLOG("%s: setsockopt(SO_ATTACH_FILTER): %s", __func__,
-                      strerror(errno));
-               close(s);
-               return -1;
-       }
-
-       return s;
+       if (strlcpy(ifname, ifr.ifr_name, ifnamelen) >= ifnamelen)
+               log_debug("index-to-interface: name truncated '%s' -> '%s'",
+                         ifr.ifr_name, ifname);
 }
 
 int bp_bind_dev(int sd __attribute__((__unused__)),
@@ -194,25 +107,4 @@ int bp_bind_dev(int sd __attribute__((__unused__)),
        return 0;
 }
 
-uint16_t udp4_checksum(struct iphdr *iph, uint8_t *buf, int len)
-{
-       char *ptr;
-       struct udp_psuedo_header pudp_hdr;
-       uint16_t csum;
-
-       pudp_hdr.saddr = iph->saddr;
-       pudp_hdr.daddr = iph->daddr;
-       pudp_hdr.reserved = 0;
-       pudp_hdr.protocol = iph->protocol;
-       pudp_hdr.len = htons(len);
-
-       ptr = XMALLOC(MTYPE_BFDD_TMP, UDP_PSUEDO_HDR_LEN + len);
-       memcpy(ptr, &pudp_hdr, UDP_PSUEDO_HDR_LEN);
-       memcpy(ptr + UDP_PSUEDO_HDR_LEN, buf, len);
-
-       csum = checksum((uint16_t *)ptr, UDP_PSUEDO_HDR_LEN + len);
-       XFREE(MTYPE_BFDD_TMP, ptr);
-       return csum;
-}
-
 #endif /* BFD_LINUX */