Changes in uspace/srv/net/dhcp/dhcp.c [c6bf6be:5a324d99] in mainline

File:

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

uspace/srv/net/dhcp/dhcp.c

@@ -37 +37 @@
 #include <adt/list.h>
 #include <bitops.h>
+#include <errno.h>
 #include <fibril_synch.h>
 #include <inet/addr.h>
@@ -43 +44 @@
 #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>
@@ -231 +229 @@
         memset(offer, 0, sizeof(*offer));
 
-        yiaddr.family = AF_INET;
-        yiaddr.addr = uint32_t_be2host(hdr->yiaddr);
+        inet_addr_set(uint32_t_be2host(hdr->yiaddr), &yiaddr);
         rc = inet_addr_format(&yiaddr, &saddr);
         if (rc != EOK)
@@ -240 +237 @@
         free(saddr);
 
-        siaddr.family = AF_INET;
-        siaddr.addr = uint32_t_be2host(hdr->siaddr);
+        inet_addr_set(uint32_t_be2host(hdr->siaddr), &siaddr);
         rc = inet_addr_format(&siaddr, &saddr);
         if (rc != EOK)
@@ -249 +245 @@
         free(saddr);
 
-        giaddr.family = AF_INET;
-        giaddr.addr = uint32_t_be2host(hdr->giaddr);
+        inet_addr_set(uint32_t_be2host(hdr->giaddr), &giaddr);
         rc = inet_addr_format(&giaddr, &saddr);
         if (rc != EOK)
@@ -258 +253 @@
         free(saddr);
 
-        offer->oaddr.family = AF_INET;
-        offer->oaddr.addr = yiaddr.addr;
+        inet_naddr_set(yiaddr.addr, 0, &offer->oaddr);
 
         msgb = (uint8_t *)msg;
@@ -299 +293 @@
                         if (opt_len != 4)
                                 return EINVAL;
-                        offer->srv_addr.family = AF_INET;
-                        offer->srv_addr.addr = dhcp_uint32_decode(&msgb[i]);
+                        inet_addr_set(dhcp_uint32_decode(&msgb[i]),
+                            &offer->srv_addr);
                         have_server_id = true;
                         break;
@@ -306 +300 @@
                         if (opt_len != 4)
                                 return EINVAL;
-                        offer->router.family = AF_INET;
-                        offer->router.addr = dhcp_uint32_decode(&msgb[i]);
+                        inet_addr_set(dhcp_uint32_decode(&msgb[i]),
+                            &offer->router);
                         break;
                 case opt_dns_server:
                         if (opt_len != 4)
                                 return EINVAL;
-                        offer->dns_server.family = AF_INET;
-                        offer->dns_server.addr = dhcp_uint32_decode(&msgb[i]);
+                        inet_addr_set(dhcp_uint32_decode(&msgb[i]),
+                            &offer->dns_server);
                         break;
                 case opt_end:
@@ -379 +373 @@
 
         if (offer->router.addr != 0) {
-                defr.family = AF_INET;
-                defr.addr = 0;
-                defr.prefix = 0;
+                inet_naddr_set(0, 0, &defr);
 
                 rc = inetcfg_sroute_create("dhcpdef", &defr, &offer->router, &sroute_id);