Changeset 947e2ef in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

2013-09-15T16:28:06Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7af0cc5, b9f7848b

Parents:

b8b1adb1

Message:

Determine MAC address for DHCP automatically.

File:

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

uspace/srv/net/dhcp/dhcp.c

@@ -53 +53 @@
 
 static int transport_fd = -1;
-static addr48_t mac_addr;
+static inet_link_info_t link_info;
 static uint8_t msgbuf[MAX_MSG_SIZE];
 
@@ -132 +132 @@
         hdr->flags = flag_broadcast;
 
-        addr48(mac_addr, hdr->chaddr);
+        addr48(link_info.mac_addr, hdr->chaddr);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);
 
@@ -178 +178 @@
         hdr->flags = flag_broadcast;
         hdr->ciaddr = host2uint32_t_be(offer->oaddr.addr);
-        addr48(mac_addr, hdr->chaddr);
+        addr48(link_info.mac_addr, hdr->chaddr);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);
 
@@ -387 +387 @@
                 rc = dnsr_set_srvaddr(&offer->dns_server);
                 if (rc != EOK) {
-                        printf("%s: Failed setting nameserver address (%d))\n",
+                        printf("%s: Error setting nameserver address (%d))\n",
                             NAME, rc);
                         return rc;
@@ -413 +413 @@
         rc = inetcfg_init();
         if (rc != EOK) {
-                printf("Failed contacting inet configuration service.\n");
+                printf("Error contacting inet configuration service.\n");
                 return 1;
         }
@@ -419 +419 @@
         rc = loc_service_get_id(argv[1], &iplink, 0);
         if (rc != EOK) {
-                printf("Failed resolving service '%s'.\n", argv[1]);
-                return 1;
-        }
-
-        /* XXX Determine MAC address automatically */
-        mac_addr[0] = 0xaa;
-        mac_addr[1] = 0xde;
-        mac_addr[2] = 0xad;
-        mac_addr[3] = 0xbe;
-        mac_addr[4] = 0xef;
-        mac_addr[5] = 0xfe;
+                printf("Error resolving service '%s'.\n", argv[1]);
+                return 1;
+        }
+
+        /* Get link hardware address */
+        rc = inetcfg_link_get(iplink, &link_info);
+        if (rc != EOK) {
+                printf("Error getting properties for link '%s'.\n", argv[1]);
+                return 1;
+        }
 
         laddr.sin_family = AF_INET;