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

Merge "HACK: libnetutils: Remove parameters from dhcpcd service call"

Browse source
This commit is contained in:
Treehugger Robot 2016-05-19 01:02:39 +00:00 • committed by Gerrit Code Review
commit 97da9225d9
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libnetutils/dhcp_utils.c
View file

@ -243,12 +243,8 @@ int dhcp_start(const char *interface)
property_set(result_prop_name, ""); property_set(result_prop_name, "");
/* Start the daemon and wait until it's ready */ /* Start the daemon and wait until it's ready */
if (property_get(HOSTNAME_PROP_NAME, prop_value, NULL) && (prop_value[0] != '\0')) snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME,
snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:-f %s -h %s %s", DAEMON_NAME, p2p_interface);
p2p_interface, DHCP_CONFIG_PATH, prop_value, interface);
else
snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:-f %s %s", DAEMON_NAME,
p2p_interface, DHCP_CONFIG_PATH, interface);
memset(prop_value, '\0', PROPERTY_VALUE_MAX); memset(prop_value, '\0', PROPERTY_VALUE_MAX);
property_set(ctrl_prop, daemon_cmd); property_set(ctrl_prop, daemon_cmd);
if (wait_for_property(daemon_prop_name, desired_status, 10) < 0) { if (wait_for_property(daemon_prop_name, desired_status, 10) < 0) {
@ -288,7 +284,8 @@ int dhcp_stop(const char *interface)
DAEMON_PROP_NAME, DAEMON_PROP_NAME,
p2p_interface); p2p_interface);
snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, p2p_interface); snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME,
p2p_interface);
/* Stop the daemon and wait until it's reported to be stopped */ /* Stop the daemon and wait until it's reported to be stopped */
property_set(ctrl_prop, daemon_cmd); property_set(ctrl_prop, daemon_cmd);
@ -317,7 +314,8 @@ int dhcp_release_lease(const char *interface)
DAEMON_PROP_NAME, DAEMON_PROP_NAME,
p2p_interface); p2p_interface);
snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME, p2p_interface); snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME,
p2p_interface);
/* Stop the daemon and wait until it's reported to be stopped */ /* Stop the daemon and wait until it's reported to be stopped */
property_set(ctrl_prop, daemon_cmd); property_set(ctrl_prop, daemon_cmd);
@ -357,8 +355,8 @@ int dhcp_start_renew(const char *interface)
property_set(result_prop_name, ""); property_set(result_prop_name, "");
/* Start the renew daemon and wait until it's ready */ /* Start the renew daemon and wait until it's ready */
snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:%s", DAEMON_NAME_RENEW, snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s", DAEMON_NAME_RENEW,
p2p_interface, interface); p2p_interface);
memset(prop_value, '\0', PROPERTY_VALUE_MAX); memset(prop_value, '\0', PROPERTY_VALUE_MAX);
property_set(ctrl_prop, daemon_cmd); property_set(ctrl_prop, daemon_cmd);