]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dhcp-client-send: move/update BPF code and socket initialization from dhcp-network.c
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 2 May 2026 18:24:41 +0000 (03:24 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 17 May 2026 13:44:17 +0000 (22:44 +0900)
- BPF code now supports the case when IP header has IP packet options,
- also set socket priority to UDP socket.

Co-developed-by: Google Gemini Pro
src/libsystemd-network/dhcp-client-send.c
src/libsystemd-network/dhcp-network.c
src/libsystemd-network/dhcp-network.h

index 89bae11a691e40d57864f610f258fb18d41d8379..f4f3b52a6598db4f0332f3ddb97b64577984953b 100644 (file)
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/filter.h>
 #include <net/if_arp.h>
 
 #include "sd-event.h"
@@ -8,9 +9,215 @@
 #include "dhcp-client-send.h"
 #include "dhcp-lease-internal.h"  /* IWYU pragma: keep */
 #include "dhcp-message.h"
-#include "dhcp-network.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "ip-util.h"
+#include "socket-util.h"
+#include "unaligned.h"
+
+/* The minimal DHCP packet size without IP header:
+ * UDP header (8 bytes) + DHCP header (without options) */
+#define DHCP_MINIMUM_UDP_SIZE (sizeof(struct udphdr) + sizeof(struct DHCPMessageHeader))
+
+static int client_set_bpf(sd_dhcp_client *client, int fd) {
+        assert(client);
+        assert(fd >= 0);
+
+        size_t hlen = 0;
+        uint32_t mac_hi = 0;
+        uint16_t mac_lo = 0;
+        if (client->arp_type != ARPHRD_INFINIBAND)
+                hlen = client->hw_addr.length;
+        if (hlen == ETH_ALEN) {
+                mac_hi = unaligned_read_be32(client->hw_addr.bytes);
+                mac_lo = unaligned_read_be16(client->hw_addr.bytes + 4);
+        }
+
+        struct sock_filter filter[] = {
+                /* 1. Basic packet length check.
+                 * Check against the minimum possible length.
+                 * Note, BPF_MSH extracts the lower 4 bits (IHL) and multiplies by 4 to get the byte length,
+                 * it needs to be combined with BPF_LDX. */
+                BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),                                /* X <- IP header length in bytes */
+                BPF_STMT(BPF_MISC + BPF_TXA, 0),                                       /* A <- X */
+                BPF_STMT(BPF_ALU + BPF_ADD + BPF_K, DHCP_MINIMUM_UDP_SIZE),            /* A += UDP header + DHCP header */
+                BPF_STMT(BPF_MISC + BPF_TAX, 0),                                       /* X <- A (minimal DHCP packet size) */
+                BPF_STMT(BPF_LD + BPF_W + BPF_LEN, 0),                                 /* A <- packet length */
+                BPF_JUMP(BPF_JMP + BPF_JGE + BPF_X, 0, 1, 0),                          /* packet length >= minimal DHCP packet size ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* 2. Protocol check (Fixed offset in IPv4 header) */
+                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(struct iphdr, protocol)),  /* A <- IP protocol */
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 1, 0),                /* IP protocol == UDP ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* 3. IP Fragmentation checks.
+                 * When an IP packet is larger than the MTU, it is fragmented into smaller pieces. The UDP
+                 * header is ONLY present in the very first fragment. Since BPF filters are stateless and
+                 * cannot reassemble fragments, we must explicitly drop any packet that is part of a
+                 * fragmented sequence to avoid parsing raw payload data as if it were a UDP/DHCP header. */
+
+                /* 3a. Check the 'More Fragments' (MF) bit.
+                 * If the bit is set, it means there are more fragments following this one. Hence, the packet
+                 * must be dropped. */
+                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(struct iphdr, frag_off)),
+                BPF_STMT(BPF_ALU + BPF_AND + BPF_K, 0x20),                             /* A <- A & 0x20 (More Fragments bit) */
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0, 1, 0),                          /* A == 0 ? (No more fragments) */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore packet if MF == 1 */
+
+                /* 3b. Check the 'Fragment Offset' field.
+                 * This indicates the position of this specific fragment relative to the beginning of the
+                 * original, unfragmented packet. If the offset is greater than 0, it means this is a
+                 * subsequent fragment (e.g., the 2nd or later piece), hence it must be dropped. */
+                BPF_STMT(BPF_LD + BPF_H + BPF_ABS, offsetof(struct iphdr, frag_off)),
+                BPF_STMT(BPF_ALU + BPF_AND + BPF_K, 0x1fff),                           /* A <- A & 0x1fff (Fragment offset) */
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0, 1, 0),                          /* A == 0 ? (This is the first fragment) */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore packet if Offset != 0 */
+
+                /* 4. Variable Offset Processing (Support for IP Options)
+                 * Load the IP header length again. It will be used BPF_IND below. */
+                BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),                                /* X <- IP header length in bytes */
+
+                /* 4a. Check UDP destination port using indirect load (X + offset) */
+                BPF_STMT(BPF_LD + BPF_H + BPF_IND, offsetof(struct udphdr, dest)),     /* A <- (UDP destination port) */
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, client->port, 1, 0),               /* UDP destination port == 68 ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* 4b. Check DHCP operation code (op) using indirect load (X + UDP header len + op offset) */
+                BPF_STMT(BPF_LD + BPF_B + BPF_IND, sizeof(struct udphdr) + offsetof(DHCPMessageHeader, op)),
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, BOOTREPLY, 1, 0),                  /* op == BOOTREPLY ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* 4c. Check hardware type using indirect load (X + UDP header len + htype offset) */
+                BPF_STMT(BPF_LD + BPF_B + BPF_IND, sizeof(struct udphdr) + offsetof(DHCPMessageHeader, htype)),
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, client->arp_type, 1, 0),           /* htype == client->arp_type ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* 4d. Check message xid using indirect load (X + UDP header len + xid offset) */
+                BPF_STMT(BPF_LD + BPF_W + BPF_IND, sizeof(struct udphdr) + offsetof(DHCPMessageHeader, xid)),
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, client->xid, 1, 0),                /* xid == client->xid ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* 4e. Check hardware address length using indirect load (X + UDP header len + hlen offset) */
+                BPF_STMT(BPF_LD + BPF_B + BPF_IND, sizeof(struct udphdr) + offsetof(DHCPMessageHeader, hlen)),
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, hlen, 1, 0),                       /* hlen == expected hlen ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* 4f. Check hardware address when the hardware address length is 6 (ETH_ALEN) */
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ETH_ALEN, 0, 6),                   /* hlen == ETH_ALEN ? */
+                BPF_STMT(BPF_LD + BPF_W + BPF_IND, sizeof(struct udphdr) + offsetof(DHCPMessageHeader, chaddr)),
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, mac_hi, 1, 0),                     /* first 4 bytes of chaddr == mac_hi ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+                BPF_STMT(BPF_LD + BPF_H + BPF_IND, sizeof(struct udphdr) + offsetof(DHCPMessageHeader, chaddr) + 4),
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, mac_lo, 1, 0),                     /* next 2 bytes of chaddr == mac_lo ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* 4g. Check DHCP magic cookie using indirect load (X + UDP header len + magic cookie offset) */
+                BPF_STMT(BPF_LD + BPF_W + BPF_IND, sizeof(struct udphdr) + offsetof(DHCPMessageHeader, magic)),
+                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, DHCP_MAGIC_COOKIE, 1, 0),          /* cookie == DHCP magic cookie ? */
+                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
+
+                /* All checks passed, accept the entire packet. */
+                BPF_STMT(BPF_RET + BPF_K, UINT32_MAX),                                 /* accept */
+        };
+
+        struct sock_fprog fprog = {
+                .len = ELEMENTSOF(filter),
+                .filter = filter
+        };
+
+        return RET_NERRNO(setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog)));
+}
+
+static int client_open_raw_socket(sd_dhcp_client *client) {
+        int r;
+
+        assert(client);
+
+        _cleanup_close_ int fd = RET_NERRNO(socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0));
+        if (fd < 0)
+                return fd;
+
+        /* While bind() with sockaddr_ll is strictly sufficient for AF_PACKET, we also set SO_BINDTOIFINDEX
+         * to initialize the kernel's sk_bound_dev_if state. This ensures compatibility with cgroup/eBPF
+         * filters and maintains consistency. */
+        r = socket_bind_to_ifindex(fd, client->ifindex);
+        if (r < 0)
+                return r;
+
+        r = client_set_bpf(client, fd);
+        if (r < 0)
+                return r;
+
+        r = setsockopt_int(fd, SOL_SOCKET, SO_TIMESTAMP, true);
+        if (r < 0)
+                return r;
+
+        r = setsockopt_int(fd, SOL_SOCKET, SO_PRIORITY, client->socket_priority);
+        if (r < 0)
+                return r;
+
+        r = setsockopt_int(fd, SOL_PACKET, PACKET_AUXDATA, true);
+        if (r < 0)
+                return r;
+
+        union sockaddr_union sa = {
+                .ll.sll_family = AF_PACKET,
+                .ll.sll_protocol = htobe16(ETH_P_IP),
+                .ll.sll_ifindex = client->ifindex,
+        };
+
+        if (bind(fd, &sa.sa, sockaddr_ll_len(&sa.ll)) < 0)
+                return -errno;
+
+        return TAKE_FD(fd);
+}
+
+static int client_open_udp_socket(sd_dhcp_client *client) {
+        int r;
+
+        assert(client);
+        assert(client->lease);
+
+        _cleanup_close_ int fd = RET_NERRNO(socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0));
+        if (fd < 0)
+                return fd;
+
+        r = socket_bind_to_ifindex(fd, client->ifindex);
+        if (r < 0)
+                return r;
+
+        r = setsockopt_int(fd, SOL_SOCKET, SO_REUSEADDR, true);
+        if (r < 0)
+                return r;
+
+        r = setsockopt_int(fd, SOL_SOCKET, SO_TIMESTAMP, true);
+        if (r < 0)
+                return r;
+
+        r = setsockopt_int(fd, SOL_SOCKET, SO_PRIORITY, client->socket_priority);
+        if (r < 0)
+                return r;
+
+        r = setsockopt_int(fd, IPPROTO_IP, IP_TOS, client->ip_service_type);
+        if (r < 0)
+                return r;
+
+        r = setsockopt_int(fd, IPPROTO_IP, IP_FREEBIND, true);
+        if (r < 0)
+                return r;
+
+        union sockaddr_union sa = {
+                .in.sin_family = AF_INET,
+                .in.sin_port = htobe16(client->port),
+                .in.sin_addr.s_addr = client->lease->address,
+        };
+
+        if (bind(fd, &sa.sa, sizeof(sa.in)) < 0)
+                return -errno;
+
+        return TAKE_FD(fd);
+}
 
 static int client_get_socket(sd_dhcp_client *client, int domain) {
         int r, d, fd;
@@ -98,20 +305,9 @@ static int client_send_raw(
 
         fd = client_get_socket(client, AF_PACKET);
         if (fd < 0) {
-                fd = dhcp_network_bind_raw_socket(
-                                client->ifindex,
-                                &client->link,
-                                client->xid,
-                                &client->hw_addr,
-                                &client->bcast_addr,
-                                client->arp_type,
-                                client->port,
-                                /* so_priority_set= */ true,
-                                client->socket_priority);
+                fd = fd_close = client_open_raw_socket(client);
                 if (fd < 0)
                         return fd;
-
-                fd_close = fd;
         }
 
         r = dhcp_message_send_raw(
@@ -160,15 +356,9 @@ static int client_send_udp(
 
         fd = client_get_socket(client, AF_INET);
         if (fd < 0) {
-                fd = dhcp_network_bind_udp_socket(
-                                client->ifindex,
-                                client->lease->address,
-                                client->port,
-                                client->ip_service_type);
+                fd = fd_close = client_open_udp_socket(client);
                 if (fd < 0)
                         return fd;
-
-                fd_close = fd;
         }
 
         r = dhcp_message_send_udp(
index c78f49159f7e408b88458d2c00787b2fe3d24738..39b001a64777408c13a09a4db80e4cc18dc249f3 100644 (file)
   Copyright © 2013 Intel Corporation. All rights reserved.
 ***/
 
-#include <linux/filter.h>
-#include <linux/if_infiniband.h>
-#include <linux/if_packet.h>
-#include <net/if_arp.h>
-#include <string.h>
+#include <netinet/ip.h>
 
 #include "dhcp-network.h"
 #include "dhcp-protocol.h"
-#include "ether-addr-util.h"
 #include "fd-util.h"
 #include "iovec-wrapper.h"
 #include "socket-util.h"
-#include "unaligned.h"
-
-static int _bind_raw_socket(
-                int ifindex,
-                union sockaddr_union *link,
-                uint32_t xid,
-                const struct hw_addr_data *hw_addr,
-                const struct hw_addr_data *bcast_addr,
-                uint16_t arp_type,
-                uint16_t port,
-                bool so_priority_set,
-                int so_priority) {
-
-        assert(ifindex > 0);
-        assert(link);
-        assert(hw_addr);
-        assert(bcast_addr);
-        assert(IN_SET(arp_type, ARPHRD_ETHER, ARPHRD_INFINIBAND));
-
-        switch (arp_type) {
-        case ARPHRD_ETHER:
-                assert(hw_addr->length == ETH_ALEN);
-                assert(bcast_addr->length == ETH_ALEN);
-                break;
-        case ARPHRD_INFINIBAND:
-                assert(hw_addr->length == 0);
-                assert(bcast_addr->length == INFINIBAND_ALEN);
-                break;
-        default:
-                assert_not_reached();
-        }
-
-        struct sock_filter filter[] = {
-                BPF_STMT(BPF_LD + BPF_W + BPF_LEN, 0),                                 /* A <- packet length */
-                BPF_JUMP(BPF_JMP + BPF_JGE + BPF_K, sizeof(DHCPPacket), 1, 0),         /* packet >= DHCPPacket ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, ip.protocol)), /* A <- IP protocol */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 1, 0),                /* IP protocol == UDP ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, ip.frag_off)), /* A <- Flags */
-                BPF_STMT(BPF_ALU + BPF_AND + BPF_K, 0x20),                             /* A <- A & 0x20 (More Fragments bit) */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0, 1, 0),                          /* A == 0 ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_H + BPF_ABS, offsetof(DHCPPacket, ip.frag_off)), /* A <- Flags + Fragment offset */
-                BPF_STMT(BPF_ALU + BPF_AND + BPF_K, 0x1fff),                           /* A <- A & 0x1fff (Fragment offset) */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0, 1, 0),                          /* A == 0 ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_H + BPF_ABS, offsetof(DHCPPacket, udp.dest)),    /* A <- UDP destination port */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, port, 1, 0),                       /* UDP destination port == DHCP client port ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.op)),     /* A <- DHCP op */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, BOOTREPLY, 1, 0),                  /* op == BOOTREPLY ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.htype)),  /* A <- DHCP header type */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, arp_type, 1, 0),                   /* header type == arp_type ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(DHCPPacket, dhcp.xid)),    /* A <- client identifier */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, xid, 1, 0),                        /* client identifier == xid ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_LD + BPF_B + BPF_ABS, offsetof(DHCPPacket, dhcp.hlen)),   /* A <- MAC address length */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, (uint8_t) hw_addr->length, 1, 0),  /* address length == hw_addr->length ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-
-                /* We only support MAC address length to be either 0 or 6 (ETH_ALEN). Optionally
-                 * compare chaddr for ETH_ALEN bytes. */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ETH_ALEN, 0, 8),                        /* A (the MAC address length) == ETH_ALEN ? */
-                BPF_STMT(BPF_LDX + BPF_IMM, unaligned_read_be32(hw_addr->bytes)),           /* X <- 4 bytes of client's MAC */
-                BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(DHCPPacket, dhcp.chaddr)),      /* A <- 4 bytes of MAC from dhcp.chaddr */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_X, 0, 1, 0),                               /* A == X ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                               /* ignore */
-                BPF_STMT(BPF_LDX + BPF_IMM, unaligned_read_be16(hw_addr->bytes + 4)),       /* X <- remainder of client's MAC */
-                BPF_STMT(BPF_LD + BPF_H + BPF_ABS, offsetof(DHCPPacket, dhcp.chaddr) + 4),  /* A <- remainder of MAC from dhcp.chaddr */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_X, 0, 1, 0),                               /* A == X ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                               /* ignore */
-
-                BPF_STMT(BPF_LD + BPF_W + BPF_ABS, offsetof(DHCPPacket, dhcp.magic)),  /* A <- DHCP magic cookie */
-                BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, DHCP_MAGIC_COOKIE, 1, 0),          /* cookie == DHCP magic cookie ? */
-                BPF_STMT(BPF_RET + BPF_K, 0),                                          /* ignore */
-                BPF_STMT(BPF_RET + BPF_K, UINT32_MAX),                                 /* accept */
-        };
-        struct sock_fprog fprog = {
-                .len = ELEMENTSOF(filter),
-                .filter = filter
-        };
-        _cleanup_close_ int s = -EBADF;
-        int r;
-
-        s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
-        if (s < 0)
-                return -errno;
-
-        r = setsockopt_int(s, SOL_PACKET, PACKET_AUXDATA, true);
-        if (r < 0)
-                return r;
-
-        r = setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, sizeof(fprog));
-        if (r < 0)
-                return -errno;
-
-        r = setsockopt_int(s, SOL_SOCKET, SO_TIMESTAMP, true);
-        if (r < 0)
-                return r;
-
-        if (so_priority_set) {
-                r = setsockopt_int(s, SOL_SOCKET, SO_PRIORITY, so_priority);
-                if (r < 0)
-                        return r;
-        }
-
-        link->ll = (struct sockaddr_ll) {
-                .sll_family = AF_PACKET,
-                .sll_protocol = htobe16(ETH_P_IP),
-                .sll_ifindex = ifindex,
-                .sll_hatype = htobe16(arp_type),
-                .sll_halen = bcast_addr->length,
-        };
-        /* We may overflow link->ll. link->ll_buffer ensures we have enough space. */
-        memcpy(link->ll.sll_addr, bcast_addr->bytes, bcast_addr->length);
-
-        r = bind(s, &link->sa, sockaddr_ll_len(&link->ll));
-        if (r < 0)
-                return -errno;
-
-        return TAKE_FD(s);
-}
-
-int dhcp_network_bind_raw_socket(
-                int ifindex,
-                union sockaddr_union *link,
-                uint32_t xid,
-                const struct hw_addr_data *hw_addr,
-                const struct hw_addr_data *bcast_addr,
-                uint16_t arp_type,
-                uint16_t port,
-                bool so_priority_set,
-                int so_priority) {
-
-        static struct hw_addr_data default_eth_bcast = {
-                .length = ETH_ALEN,
-                .ether = {{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }},
-        }, default_ib_bcast = {
-                .length = INFINIBAND_ALEN,
-                .infiniband = {
-                        0x00, 0xff, 0xff, 0xff, 0xff, 0x12, 0x40, 0x1b,
-                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                        0xff, 0xff, 0xff, 0xff
-                },
-        };
-
-        assert(ifindex > 0);
-        assert(link);
-        assert(hw_addr);
-
-        switch (arp_type) {
-        case ARPHRD_ETHER:
-                return _bind_raw_socket(ifindex, link, xid,
-                                        hw_addr,
-                                        (bcast_addr && !hw_addr_is_null(bcast_addr)) ? bcast_addr : &default_eth_bcast,
-                                        arp_type, port, so_priority_set, so_priority);
-
-        case ARPHRD_INFINIBAND:
-                return _bind_raw_socket(ifindex, link, xid,
-                                        &HW_ADDR_NULL,
-                                        (bcast_addr && !hw_addr_is_null(bcast_addr)) ? bcast_addr : &default_ib_bcast,
-                                        arp_type, port, so_priority_set, so_priority);
-        default:
-                return -EINVAL;
-        }
-}
 
 int dhcp_network_bind_udp_socket(int ifindex, be32_t address, uint16_t port, int ip_service_type) {
         union sockaddr_union src = {
@@ -266,31 +92,3 @@ int dhcp_network_send_raw_socket(
 
         return 0;
 }
-
-int dhcp_network_send_udp_socket(
-                int fd,
-                be32_t address,
-                uint16_t port,
-                const struct iovec_wrapper *iovw) {
-
-        assert(fd >= 0);
-        assert(!iovw_isempty(iovw));
-
-        union sockaddr_union dest = {
-                .in.sin_family = AF_INET,
-                .in.sin_port = htobe16(port),
-                .in.sin_addr.s_addr = address,
-        };
-
-        struct msghdr mh = {
-                .msg_name = &dest.sa,
-                .msg_namelen = sizeof(dest.in),
-                .msg_iov = iovw->iovec,
-                .msg_iovlen = iovw->count,
-        };
-
-        if (sendmsg(fd, &mh, MSG_NOSIGNAL) < 0)
-                return -errno;
-
-        return 0;
-}
index 6bef8ddaf9cbf778140678ce6f643c5387a99536..117e3f4dc8c39f6db0eb00e15bf2e0163d97bbae 100644 (file)
@@ -4,16 +4,6 @@
 #include "sd-forward.h"
 #include "sparse-endian.h"
 
-int dhcp_network_bind_raw_socket(
-                int ifindex,
-                union sockaddr_union *link,
-                uint32_t xid,
-                const struct hw_addr_data *hw_addr,
-                const struct hw_addr_data *bcast_addr,
-                uint16_t arp_type,
-                uint16_t port,
-                bool so_priority_set,
-                int so_priority);
 int dhcp_network_bind_udp_socket(
                 int ifindex,
                 be32_t address,
@@ -23,8 +13,3 @@ int dhcp_network_send_raw_socket(
                 int fd,
                 const union sockaddr_union *link,
                 const struct iovec_wrapper *iovw);
-int dhcp_network_send_udp_socket(
-                int fd,
-                be32_t address,
-                uint16_t port,
-                const struct iovec_wrapper *iovw);