X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-dhcp%2Fdhcp-network.c;h=934e8bf13ee5837755958870c6129c3a0caa4e29;hb=bdd13f6be4b588568683a1ab54f421fc6a636dbb;hp=83a30842c2fcf59c0bce82244e2e13bab50aa5db;hpb=8c00042c939938818365753023ff2d50f984dec6;p=elogind.git

diff --git a/src/libsystemd-dhcp/dhcp-network.c b/src/libsystemd-dhcp/dhcp-network.c
index 83a30842c..934e8bf13 100644
--- a/src/libsystemd-dhcp/dhcp-network.c
+++ b/src/libsystemd-dhcp/dhcp-network.c
@@ -31,8 +31,11 @@
 #include "dhcp-internal.h"
 
 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,8 +48,32 @@ 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(s);
+                close_nointr_nofail(s);
+                return -errno;
+        }
+
+        return s;
+}
+
+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(port),
+                .in.sin_addr.s_addr = address,
+        };
+
+        s = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
+        if (s < 0)
+                return -errno;
+
+        if (bind(s, &src.sa, sizeof(src.in)) < 0) {
+                close_nointr_nofail(s);
                 return -errno;
         }
 
@@ -56,10 +83,27 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
 int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
                                  const void *packet, size_t len)
 {
-        int err = 0;
+        assert(link);
+        assert(packet);
+        assert(len);
 
         if (sendto(s, packet, len, 0, &link->sa, sizeof(link->ll)) < 0)
-                err = -errno;
+                return -errno;
+
+        return 0;
+}
+
+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(port),
+                .in.sin_addr.s_addr = address,
+        };
+
+        if (sendto(s, packet, len, 0, &dest.sa, sizeof(dest.in)) < 0)
+                return -errno;
 
-        return err;
+        return 0;
 }