commit 6ecbdca4c19bc6f8eb371dd2c7a85fac06e1854d
author Robert Greenwalt <rgreenwalt@google.com> Tue Nov 13 10:56:01 2012 -0800
committer Robert Greenwalt <rgreenwalt@google.com> Tue Nov 13 12:04:09 2012 -0800
tree cf7b254f3f0ffc5027219d42857eb28cafb58e8b
parent 258a0a5ac175fabff764d925a460e009e121a361

Read domain name from dhcp system prop

This property is set by the dhcpcd daemon.

bug:6799630
Change-Id: I21002e286819cff420ec72e3857764e5f58ecfe4

libnetutils/dhcp_utils.c

diff --git a/libnetutils/dhcp_utils.c b/libnetutils/dhcp_utils.c
index d0ca90a..541d3fb 100644
--- a/libnetutils/dhcp_utils.c
+++ b/libnetutils/dhcp_utils.c
@@ -92,7 +92,8 @@
                      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 @@
             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 @@
                     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 @@
     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 @@
                     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 @@
     }
     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);