diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2009-12-14 18:18:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-14 18:18:28 -0800 |
| commit | ea036dec458fb61e8c6ff880f52575cce59f6851 (patch) | |
| tree | 8b664f14f37c9aceb9ebc0f8c056bdb9a2568199 | |
| parent | 311add489e4a1712d201c3b83fa364d5569e6788 (diff) | |
| parent | 2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93 (diff) | |
| download | system_core-ea036dec458fb61e8c6ff880f52575cce59f6851.tar.gz system_core-ea036dec458fb61e8c6ff880f52575cce59f6851.tar.bz2 system_core-ea036dec458fb61e8c6ff880f52575cce59f6851.zip | |
am 2ed5a457: am 9363b7d5: dhcp: Add hostname support
Merge commit '2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93'
* commit '2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93':
dhcp: Add hostname support
| -rw-r--r-- | libnetutils/dhcp_utils.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libnetutils/dhcp_utils.c b/libnetutils/dhcp_utils.c index bad2e2ff..0f8a6c43 100644 --- a/libnetutils/dhcp_utils.c +++ b/libnetutils/dhcp_utils.c @@ -24,8 +24,9 @@ #include <cutils/properties.h> -static const char DAEMON_NAME[] = "dhcpcd"; -static const char DAEMON_PROP_NAME[] = "init.svc.dhcpcd"; +static const char DAEMON_NAME[] = "dhcpcd"; +static const char DAEMON_PROP_NAME[] = "init.svc.dhcpcd"; +static const char HOSTNAME_PROP_NAME[] = "net.hostname"; static const char DHCP_PROP_NAME_PREFIX[] = "dhcp"; static const int NAP_TIME = 1; /* wait for 1 second at a time */ /* when polling for property values */ @@ -129,6 +130,7 @@ int dhcp_do_request(const char *interface, { char result_prop_name[PROPERTY_KEY_MAX]; char prop_value[PROPERTY_VALUE_MAX] = {'\0'}; + char daemon_cmd[PROPERTY_VALUE_MAX * 2]; const char *ctrl_prop = "ctl.start"; const char *desired_status = "running"; @@ -139,7 +141,13 @@ int dhcp_do_request(const char *interface, property_set(result_prop_name, ""); /* Start the daemon and wait until it's ready */ - property_set(ctrl_prop, DAEMON_NAME); + if (property_get(HOSTNAME_PROP_NAME, prop_value, NULL) && (prop_value[0] != '\0')) + snprintf(daemon_cmd, sizeof(daemon_cmd), "%s:-h %s %s", DAEMON_NAME, + prop_value, interface); + else + snprintf(daemon_cmd, sizeof(daemon_cmd), "%s:%s", DAEMON_NAME, interface); + memset(prop_value, '\0', PROPERTY_VALUE_MAX); + property_set(ctrl_prop, daemon_cmd); if (wait_for_property(DAEMON_PROP_NAME, desired_status, 10) < 0) { snprintf(errmsg, sizeof(errmsg), "%s", "Timed out waiting for dhcpcd to start"); return -1; |