ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Read domain name from dhcp system prop

Browse source 
This property is set by the dhcpcd daemon.

bug:6799630
Change-Id: I21002e286819cff420ec72e3857764e5f58ecfe4
This commit is contained in:
Robert Greenwalt 2012-11-13 10:56:01 -08:00
parent 258a0a5ac1
commit 6ecbdca4c1
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libnetutils/dhcp_utils.c
View file

@ -92,7 +92,8 @@ static int fill_ip_info(const char *interface,
char *dns2,
char *server,
uint32_t *lease,
char *vendorInfo)
char *vendorInfo,
char *domain)
{
char prop_name[PROPERTY_KEY_MAX];
char prop_value[PROPERTY_VALUE_MAX];
@ -153,6 +154,10 @@ static int fill_ip_info(const char *interface,
p2p_interface);
property_get(prop_name, vendorInfo, NULL);
snprintf(prop_name, sizeof(prop_name), "%s.%s.domain", DHCP_PROP_NAME_PREFIX,
p2p_interface);
property_get(prop_name, domain, NULL);
return 0;
}
@ -181,7 +186,8 @@ int dhcp_do_request(const char *interface,
char *dns2,
char *server,
uint32_t *lease,
char *vendorInfo)
char *vendorInfo,
char *domain)
{
char result_prop_name[PROPERTY_KEY_MAX];
char daemon_prop_name[PROPERTY_KEY_MAX];
@ -233,7 +239,7 @@ int dhcp_do_request(const char *interface,
if (strcmp(prop_value, "ok") == 0) {
char dns_prop_name[PROPERTY_KEY_MAX];
if (fill_ip_info(interface, ipaddr, gateway, prefixLength,
dns1, dns2, server, lease, vendorInfo) == -1) {
dns1, dns2, server, lease, vendorInfo, domain) == -1) {
return -1;
}
@ -331,7 +337,8 @@ int dhcp_do_request_renew(const char *interface,
char *dns2,
char *server,
uint32_t *lease,
char *vendorInfo)
char *vendorInfo,
char *domain)
{
char result_prop_name[PROPERTY_KEY_MAX];
char prop_value[PROPERTY_VALUE_MAX] = {'\0'};
@ -368,7 +375,7 @@ int dhcp_do_request_renew(const char *interface,
}
if (strcmp(prop_value, "ok") == 0) {
fill_ip_info(interface, ipaddr, gateway, prefixLength,
dns1, dns2, server, lease, vendorInfo);
dns1, dns2, server, lease, vendorInfo, domain);
return 0;
} else {
snprintf(errmsg, sizeof(errmsg), "DHCP Renew result was %s", prop_value);