Changes in uspace/srv/net/dhcp/transport.c [58e8646:e3811c9] in mainline

File:

• uspace/srv/net/dhcp/transport.c (modified) (8 diffs)

uspace/srv/net/dhcp/transport.c

@@ -36 +36 @@
 
 #include <bitops.h>
-#include <errno.h>
 #include <inet/addr.h>
 #include <inet/dnsr.h>
@@ -42 +41 @@
 #include <io/log.h>
 #include <loc.h>
+#include <net/in.h>
+#include <net/inet.h>
+#include <net/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -65 +67 @@
 } dhcp_offer_t;
 
-static void dhcp_recv_msg(udp_assoc_t *, udp_rmsg_t *);
-static void dhcp_recv_err(udp_assoc_t *, udp_rerr_t *);
-static void dhcp_link_state(udp_assoc_t *, udp_link_state_t);
-
-static udp_cb_t dhcp_transport_cb = {
-        .recv_msg = dhcp_recv_msg,
-        .recv_err = dhcp_recv_err,
-        .link_state = dhcp_link_state
-};
+static int dhcp_recv_fibril(void *);
 
 int dhcp_send(dhcp_transport_t *dt, void *msg, size_t size)
 {
-        inet_ep_t ep;
+        struct sockaddr_in addr;
         int rc;
 
-        inet_ep_init(&ep);
-        ep.port = dhcp_server_port;
-        inet_addr_set(addr32_broadcast_all_hosts, &ep.addr);
+        addr.sin_family = AF_INET;
+        addr.sin_port = htons(dhcp_server_port);
+        addr.sin_addr.s_addr = htonl(addr32_broadcast_all_hosts);
 
-        rc = udp_assoc_send_msg(dt->assoc, &ep, msg, size);
+        rc = sendto(dt->fd, msg, size, 0,
+            (struct sockaddr *)&addr, sizeof(addr));
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed sending message");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Sending failed");
                 return rc;
         }
@@ -93 +88 @@
 }
 
-static void dhcp_recv_msg(udp_assoc_t *assoc, udp_rmsg_t *rmsg)
+static int dhcp_recv_msg(dhcp_transport_t *dt, void **rmsg, size_t *rsize)
 {
-        dhcp_transport_t *dt;
-        size_t s;
+        struct sockaddr_in src_addr;
+        socklen_t src_addr_size;
+        size_t recv_size;
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "dhcp_recv_msg()");
-
-        dt = (dhcp_transport_t *)udp_assoc_userptr(assoc);
-        s = udp_rmsg_size(rmsg);
-        if (s > MAX_MSG_SIZE)
-                s = MAX_MSG_SIZE; /* XXX */
-
-        rc = udp_rmsg_read(rmsg, 0, msgbuf, s);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Error receiving message.");
-                return;
+        if (dt->fd < 0) {
+                /* Terminated */
+                return EIO;
         }
 
-        log_msg(LOG_DEFAULT, LVL_NOTE, "dhcp_recv_msg() - call recv_cb");
-        dt->recv_cb(dt->cb_arg, msgbuf, s);
-}
+        src_addr_size = sizeof(src_addr);
+        rc = recvfrom(dt->fd, msgbuf, MAX_MSG_SIZE, 0,
+            (struct sockaddr *)&src_addr, &src_addr_size);
+        if (rc < 0) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "recvfrom failed (%d)", rc);
+                return rc;
+        }
 
-static void dhcp_recv_err(udp_assoc_t *assoc, udp_rerr_t *rerr)
-{
-        log_msg(LOG_DEFAULT, LVL_WARN, "Ignoring ICMP error");
-}
+        recv_size = (size_t)rc;
+        *rmsg = msgbuf;
+        *rsize = recv_size;
 
-static void dhcp_link_state(udp_assoc_t *assoc, udp_link_state_t ls)
-{
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Link state change");
+        return EOK;
 }
 
@@ -129 +118 @@
     dhcp_recv_cb_t recv_cb, void *arg)
 {
-        udp_t *udp = NULL;
-        udp_assoc_t *assoc = NULL;
-        inet_ep2_t epp;
+        int fd;
+        struct sockaddr_in laddr;
+        int fid;
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_transport_init()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcptransport_init()");
 
-        inet_ep2_init(&epp);
-        epp.local.addr.version = ip_v4;
-        epp.local.port = dhcp_client_port;
-        epp.local_link = link_id;
+        laddr.sin_family = AF_INET;
+        laddr.sin_port = htons(dhcp_client_port);
+        laddr.sin_addr.s_addr = INADDR_ANY;
 
-        rc = udp_create(&udp);
+        fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+        if (fd < 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Bind socket.");
+        rc = bind(fd, (struct sockaddr *)&laddr, sizeof(laddr));
         if (rc != EOK) {
                 rc = EIO;
@@ -147 +142 @@
         }
 
-        rc = udp_assoc_create(udp, &epp, &dhcp_transport_cb, dt, &assoc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Set socket options");
+        rc = setsockopt(fd, SOL_SOCKET, SO_IPLINK, &link_id, sizeof(link_id));
         if (rc != EOK) {
                 rc = EIO;
@@ -153 +149 @@
         }
 
-        rc = udp_assoc_set_nolocal(assoc);
-        if (rc != EOK) {
-                rc = EIO;
+        dt->fd = fd;
+        dt->recv_cb = recv_cb;
+        dt->cb_arg = arg;
+
+        fid = fibril_create(dhcp_recv_fibril, dt);
+        if (fid == 0) {
+                rc = ENOMEM;
                 goto error;
         }
 
-        dt->udp = udp;
-        dt->assoc = assoc;
-        dt->recv_cb = recv_cb;
-        dt->cb_arg = arg;
+        dt->recv_fid = fid;
+        fibril_add_ready(fid);
 
         return EOK;
 error:
-        udp_assoc_destroy(assoc);
-        udp_destroy(udp);
+        closesocket(fd);
         return rc;
 }
@@ -173 +170 @@
 void dhcp_transport_fini(dhcp_transport_t *dt)
 {
-        udp_assoc_destroy(dt->assoc);
-        udp_destroy(dt->udp);
+        closesocket(dt->fd);
+        dt->fd = -1;
+}
+
+static int dhcp_recv_fibril(void *arg)
+{
+        dhcp_transport_t *dt = (dhcp_transport_t *)arg;
+        void *msg;
+        size_t size = (size_t) -1;
+        int rc;
+
+        while (true) {
+                rc = dhcp_recv_msg(dt, &msg, &size);
+                if (rc != EOK)
+                        break;
+
+                assert(size != (size_t) -1);
+
+                dt->recv_cb(dt->cb_arg, msg, size);
+        }
+
+        return EOK;
 }