X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-dhcp%2Ftest-dhcp-client.c;h=d398510745f373049c4e122da48a882b04a377b1;hb=a94200d0b4a8f98e5d9433282642300082de7d59;hp=fdcb6b1c495ce4b396d321061a9b21510c002cd1;hpb=290c7324ca6ed22bcb6f4d644765aefeb47dc9de;p=elogind.git

diff --git a/src/libsystemd-dhcp/test-dhcp-client.c b/src/libsystemd-dhcp/test-dhcp-client.c
index fdcb6b1c4..d39851074 100644
--- a/src/libsystemd-dhcp/test-dhcp-client.c
+++ b/src/libsystemd-dhcp/test-dhcp-client.c
@@ -23,8 +23,12 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <unistd.h>
 
 #include "util.h"
+#include "socket-util.h"
 
 #include "dhcp-protocol.h"
 #include "dhcp-internal.h"
@@ -34,11 +38,13 @@ static struct ether_addr mac_addr = {
         .ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}
 };
 
-static void test_request_basic(void)
+static int test_fd[2];
+
+static void test_request_basic(sd_event *e)
 {
         sd_dhcp_client *client;
 
-        client = sd_dhcp_client_new();
+        client = sd_dhcp_client_new(e);
 
         assert(client);
 
@@ -125,14 +131,15 @@ static int check_options(uint8_t code, uint8_t len, const uint8_t *option,
         return 0;
 }
 
-int dhcp_network_send_raw_packet(int index, const void *packet, size_t len)
+int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
+                                 const void *packet, size_t len)
 {
         size_t size;
         _cleanup_free_ DHCPPacket *discover;
         uint16_t ip_check, udp_check;
         int res;
 
-        assert(index == 42);
+        assert(s >= 0);
         assert(packet);
 
         size = sizeof(DHCPPacket) + 4;
@@ -146,8 +153,8 @@ int dhcp_network_send_raw_packet(int index, const void *packet, size_t len)
         assert(discover->ip.protocol == IPPROTO_UDP);
         assert(discover->ip.saddr == INADDR_ANY);
         assert(discover->ip.daddr == INADDR_BROADCAST);
-        assert(discover->udp.source == ntohs(DHCP_PORT_CLIENT));
-        assert(discover->udp.dest == ntohs(DHCP_PORT_SERVER));
+        assert(discover->udp.source == be16toh(DHCP_PORT_CLIENT));
+        assert(discover->udp.dest == be16toh(DHCP_PORT_SERVER));
 
         ip_check = discover->ip.check;
 
@@ -172,12 +179,20 @@ int dhcp_network_send_raw_packet(int index, const void *packet, size_t len)
         return 575;
 }
 
-static void test_discover_message(void)
+int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link)
+{
+        if (socketpair(AF_UNIX, SOCK_STREAM, 0, test_fd) < 0)
+                return -errno;
+
+        return test_fd[0];
+}
+
+static void test_discover_message(sd_event *e)
 {
         sd_dhcp_client *client;
         int res;
 
-        client = sd_dhcp_client_new();
+        client = sd_dhcp_client_new(e);
         assert(client);
 
         assert(sd_dhcp_client_set_index(client, 42) >= 0);
@@ -188,14 +203,22 @@ static void test_discover_message(void)
         res = sd_dhcp_client_start(client);
 
         assert(res == 0 || res == -EINPROGRESS);
+
+        close(test_fd[0]);
+        close(test_fd[1]);
 }
 
 int main(int argc, char *argv[])
 {
-        test_request_basic();
+        sd_event *e;
+
+        assert(sd_event_new(&e) >= 0);
+
+        test_request_basic(e);
         test_checksum();
 
-        test_discover_message();
+        test_discover_message(e);
+        sd_event_run(e, (uint64_t) -1);
 
         return 0;
 }