Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"

This reverts commit c88e09c.

libnetutils/dhcp_utils.c

@@ -115,14 +115,6 @@ static void fill_ip_info(const char *interface,
     }
 }
 
-static const char *ipaddr_to_string(in_addr_t addr)
-{
-    struct in_addr in_addr;
-
-    in_addr.s_addr = addr;
-    return inet_ntoa(in_addr);
-}
-
 /*
  * Start the dhcp client daemon, and wait for it to finish
  * configuring the interface.
@@ -173,13 +165,7 @@ int dhcp_do_request(const char *interface,
         return -1;
     }
     if (strcmp(prop_value, "ok") == 0) {
-        char dns_prop_name[PROPERTY_KEY_MAX];
         fill_ip_info(interface, ipaddr, gateway, mask, dns1, dns2, server, lease);
-        /* copy the dhcp.XXX.dns properties to net.XXX.dns */
-        snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns1", interface);
-        property_set(dns_prop_name, *dns1 ? ipaddr_to_string(*dns1) : "");
-        snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns2", interface);
-        property_set(dns_prop_name, *dns2 ? ipaddr_to_string(*dns2) : "");
         return 0;
     } else {
         snprintf(errmsg, sizeof(errmsg), "DHCP result was %s", prop_value);

libnetutils/dhcpclient.c

@@ -36,8 +36,8 @@
 
 #include <dirent.h>
 
-#include <netutils/ifc.h>
 #include "dhcpmsg.h"
+#include "ifc_utils.h"
 #include "packet.h"
 
 #define VERBOSE 2
@@ -85,12 +85,16 @@ int fatal(const char *reason)
 //    exit(1);
 }
 
-const char *ipaddr(in_addr_t addr)
+const char *ipaddr(uint32_t addr)
 {
-    struct in_addr in_addr;
-
-    in_addr.s_addr = addr;
-    return inet_ntoa(in_addr);
+    static char buf[32];
+
+    sprintf(buf,"%d.%d.%d.%d",
+            addr & 255,
+            ((addr >> 8) & 255),
+            ((addr >> 16) & 255),
+            (addr >> 24));
+    return buf;
 }
 
 typedef struct dhcp_info dhcp_info;
@@ -124,11 +128,31 @@ void get_dhcp_info(uint32_t *ipaddr, uint32_t *gateway, uint32_t *mask,
     *lease = last_good_info.lease;
 }
 
-static int dhcp_configure(const char *ifname, dhcp_info *info)
+static int ifc_configure(const char *ifname, dhcp_info *info)
 {
+    char dns_prop_name[PROPERTY_KEY_MAX];
+
+    if (ifc_set_addr(ifname, info->ipaddr)) {
+        printerr("failed to set ipaddr %s: %s\n", ipaddr(info->ipaddr), strerror(errno));
+        return -1;
+    }
+    if (ifc_set_mask(ifname, info->netmask)) {
+        printerr("failed to set netmask %s: %s\n", ipaddr(info->netmask), strerror(errno));
+        return -1;
+    }
+    if (ifc_create_default_route(ifname, info->gateway)) {
+        printerr("failed to set default route %s: %s\n", ipaddr(info->gateway), strerror(errno));
+        return -1;
+    }
+
+    snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns1", ifname);
+    property_set(dns_prop_name, info->dns1 ? ipaddr(info->dns1) : "");
+    snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns2", ifname);
+    property_set(dns_prop_name, info->dns2 ? ipaddr(info->dns2) : "");
+
     last_good_info = *info;
-    return ifc_configure(ifname, info->ipaddr, info->netmask, info->gateway,
-                         info->dns1, info->dns2);
+
+    return 0;
 }
 
 static const char *dhcp_type_to_name(uint32_t type)
@@ -425,7 +449,7 @@ int dhcp_init_ifc(const char *ifname)
                 printerr("timed out\n");
                 if ( info.type == DHCPOFFER ) {
                     printerr("no acknowledgement from DHCP server\nconfiguring %s with offered parameters\n", ifname);
-                    return dhcp_configure(ifname, &info);
+                    return ifc_configure(ifname, &info);
                 }
                 errno = ETIME;
                 close(s);
@@ -506,7 +530,7 @@ int dhcp_init_ifc(const char *ifname)
             if (info.type == DHCPACK) {
                 printerr("configuring %s\n", ifname);
                 close(s);
-                return dhcp_configure(ifname, &info);
+                return ifc_configure(ifname, &info);
             } else if (info.type == DHCPNAK) {
                 printerr("configuration request denied\n");
                 close(s);

libnetutils/ifc_utils.c

@@ -27,8 +27,6 @@
 #include <arpa/inet.h>
 
 #include <linux/if.h>
-#include <linux/if_ether.h>
-#include <linux/if_arp.h>
 #include <linux/sockios.h>
 #include <linux/route.h>
 #include <linux/wireless.h>
@@ -47,7 +45,7 @@
 static int ifc_ctl_sock = -1;
 void printerr(char *fmt, ...);
 
-static const char *ipaddr_to_string(in_addr_t addr)
+static const char *ipaddr_to_string(uint32_t addr)
 {
     struct in_addr in_addr;
 
@@ -90,7 +88,7 @@ int ifc_get_hwaddr(const char *name, void *ptr)
     r = ioctl(ifc_ctl_sock, SIOCGIFHWADDR, &ifr);
     if(r < 0) return -1;
 
-    memcpy(ptr, &ifr.ifr_hwaddr.sa_data, ETH_ALEN);
+    memcpy(ptr, &ifr.ifr_hwaddr.sa_data, 6);
     return 0;    
 }
 
@@ -145,17 +143,6 @@ int ifc_set_addr(const char *name, in_addr_t addr)
     return ioctl(ifc_ctl_sock, SIOCSIFADDR, &ifr);
 }
 
-int ifc_set_hwaddr(const char *name, const void *ptr)
-{
-    int r;
-    struct ifreq ifr;
-    ifc_init_ifr(name, &ifr);
-
-    ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-    memcpy(&ifr.ifr_hwaddr.sa_data, ptr, ETH_ALEN);
-    return ioctl(ifc_ctl_sock, SIOCSIFHWADDR, &ifr);
-}
-
 int ifc_set_mask(const char *name, in_addr_t mask)
 {
     struct ifreq ifr;
@@ -442,9 +429,9 @@ ifc_configure(const char *ifname,
 
     ifc_close();
 
-    snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns1", ifname);
+    snprintf(dns_prop_name, sizeof(dns_prop_name), "dhcp.%s.dns1", ifname);
     property_set(dns_prop_name, dns1 ? ipaddr_to_string(dns1) : "");
-    snprintf(dns_prop_name, sizeof(dns_prop_name), "net.%s.dns2", ifname);
+    snprintf(dns_prop_name, sizeof(dns_prop_name), "dhcp.%s.dns2", ifname);
     property_set(dns_prop_name, dns2 ? ipaddr_to_string(dns2) : "");
 
     return 0;

libnetutils/ifc_utils.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0 
+ *
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+#ifndef _IFC_UTILS_H_
+#define _IFC_UTILS_H_
+
+int ifc_init(void);
+
+int ifc_get_ifindex(const char *name, int *if_indexp);
+int ifc_get_hwaddr(const char *name, void *ptr);
+
+int ifc_up(const char *name);
+int ifc_down(const char *name);
+
+int ifc_set_addr(const char *name, unsigned addr);
+int ifc_set_mask(const char *name, unsigned mask);
+
+int ifc_create_default_route(const char *name, unsigned addr);
+
+int ifc_get_info(const char *name, unsigned *addr, unsigned *mask, unsigned *flags);
+
+#endif

netcfg/netcfg.c

@@ -19,26 +19,34 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <dirent.h>
-#include <netinet/ether.h>
-
-#include <netutils/ifc.h>
-#include <netutils/dhcp.h>
 
 static int verbose = 0;
 
+int ifc_init();
+void ifc_close();
+int ifc_up(char *iname);
+int ifc_down(char *iname);
+int ifc_remove_host_routes(char *iname);
+int ifc_remove_default_route(char *iname);
+int ifc_get_info(const char *name, unsigned *addr, unsigned *mask, unsigned *flags);
+int do_dhcp(char *iname);
 
 void die(const char *reason)
 {
     perror(reason);
     exit(1);
 }
 
-const char *ipaddr(in_addr_t addr)
+const char *ipaddr(unsigned addr)
 {
-    struct in_addr in_addr;
-
-    in_addr.s_addr = addr;
-    return inet_ntoa(in_addr);
+    static char buf[32];
+
+    sprintf(buf,"%d.%d.%d.%d", 
+            addr & 255,
+            ((addr >> 8) & 255),
+            ((addr >> 16) & 255), 
+            (addr >> 24));
+    return buf;
 }
 
 void usage(void)
@@ -78,15 +86,6 @@ int dump_interfaces(void)
     return 0;
 }
 
-int set_hwaddr(const char *name, const char *asc) {
-    struct ether_addr *addr = ether_aton(asc);
-    if (!addr) {
-        printf("Failed to parse '%s'\n", asc);
-        return -1;
-    }
-    return ifc_set_hwaddr(name, addr->ether_addr_octet);
-}
-
 struct 
 {
     const char *name;
@@ -98,7 +97,6 @@ struct
     { "down",   1, ifc_down },
     { "flhosts",  1, ifc_remove_host_routes },
     { "deldefault", 1, ifc_remove_default_route },
-    { "hwaddr", 2, set_hwaddr },
     { 0, 0, 0 },
 };