Changeset f023251 in mainline for uspace/srv/net/dhcp

Timestamp:

2013-09-29T21:06:10Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e948fde

Parents:

13be2583

Message:

HelenOS internet address version should not be based on BSD sockets definition.

File:

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

uspace/srv/net/dhcp/dhcp.c

@@ -231 +231 @@
         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 +239 @@
         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 +247 @@
         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 +255 @@
         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 +295 @@
                         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 +302 @@
                         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 +375 @@
 
         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);