summaryrefslogtreecommitdiffstats
path: root/libnetutils/dhcp_utils.c
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-08-18 11:16:00 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-08-18 11:16:00 -0700
commit58b64acef07e6426914a8cb2d972778fbe138655 (patch)
tree62a31bcf71d748419086767014c834c37d10af1a /libnetutils/dhcp_utils.c
parent838336fa61f2f06898322f059570708def823398 (diff)
downloadsystem_core-58b64acef07e6426914a8cb2d972778fbe138655.zip
system_core-58b64acef07e6426914a8cb2d972778fbe138655.tar.gz
system_core-58b64acef07e6426914a8cb2d972778fbe138655.tar.bz2
Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
This reverts commit c88e09cb98fb3690c3cf49f5a825532e0d9bf300.
Diffstat (limited to 'libnetutils/dhcp_utils.c')
-rw-r--r--libnetutils/dhcp_utils.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/libnetutils/dhcp_utils.c b/libnetutils/dhcp_utils.c
index cb0960f..0f8a6c4 100644
--- a/libnetutils/dhcp_utils.c
+++ b/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);