Remove dead lines in various places

[elogind.git] / src / libsystemd-dhcp / dhcp-network.c

diff --git a/src/libsystemd-dhcp/dhcp-network.c b/src/libsystemd-dhcp/dhcp-network.c
index ce27f425c358418402ff36ac7e832af0b4807ddc..934e8bf13ee5837755958870c6129c3a0caa4e29 100644 (file)
--- a/src/libsystemd-dhcp/dhcp-network.c
+++ b/src/libsystemd-dhcp/dhcp-network.c
@@ -32,7 +32,10 @@
 
 int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
 {
-        int s;
+        int s, one = 1;
+
+        assert(index > 0);
+        assert(link);
 
         s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
                    htons(ETH_P_IP));
@@ -45,6 +48,9 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
         link->ll.sll_halen = ETH_ALEN;
         memset(link->ll.sll_addr, 0xff, ETH_ALEN);
 
+        if (setsockopt (s, SOL_PACKET, PACKET_AUXDATA, &one, sizeof(one)) < 0)
+                return -errno;
+
         if (bind(s, &link->sa, sizeof(link->ll)) < 0) {
                 close_nointr_nofail(s);
                 return -errno;
@@ -53,13 +59,13 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
         return s;
 }
 
-int dhcp_network_bind_udp_socket(int index, be32_t client_address)
+int dhcp_network_bind_udp_socket(int index, be32_t address, uint16_t port)
 {
         int s;
         union sockaddr_union src = {
                 .in.sin_family = AF_INET,
-                .in.sin_port = htobe16(DHCP_PORT_CLIENT),
-                .in.sin_addr.s_addr = client_address,
+                .in.sin_port = htobe16(port),
+                .in.sin_addr.s_addr = address,
         };
 
         s = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
@@ -77,19 +83,23 @@ int dhcp_network_bind_udp_socket(int index, be32_t client_address)
 int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
                                  const void *packet, size_t len)
 {
+        assert(link);
+        assert(packet);
+        assert(len);
+
         if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
                 return -errno;
 
         return 0;
 }
 
-int dhcp_network_send_udp_socket(int s, be32_t server_address,
+int dhcp_network_send_udp_socket(int s, be32_t address, uint16_t port,
                                  const void *packet, size_t len)
 {
         union sockaddr_union dest = {
                 .in.sin_family = AF_INET,
-                .in.sin_port = htobe16(DHCP_PORT_SERVER),
-                .in.sin_addr.s_addr = server_address,
+                .in.sin_port = htobe16(port),
+                .in.sin_addr.s_addr = address,
         };
 
         if (sendto(s, packet, len, 0, &dest.sa, sizeof(dest.in)) < 0)