Skip to content

Commit

Permalink
[debug] Use wrapper for system() calls. MER#1774
Browse files Browse the repository at this point in the history 
Calling system() function blocks usb-moded mainloop until the subprocess
finishes. Additionally usb-moded mostly does not check whether the
calls succeeded or not.

When in verbose mode, log execution of subprocesses.

If system() returns non-zero exit value, log a warning to indicate
potentially failed command execution.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
@spiiroin
spiiroin committed Mar 24, 2017
1 parent d5c5651 commit 2b01382
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 23 deletions.
18 changes: 9 additions & 9 deletions src/usb_moded-modesetting.c
View file
Expand Up @@ -194,7 +194,7 @@ static int set_mass_storage_mode(struct mode_list_elem *data)
usb_moded_unload_module(MODULE_MASS_STORAGE);
sprintf(command2, "modprobe %s luns=%d \n", MODULE_MASS_STORAGE, mountpoints);
log_debug("usb-load command = %s \n", command2);
ret = system(command2);
ret = usb_moded_system(command2);
if(ret)
return(ret);
}
Expand All @@ -209,14 +209,14 @@ static int set_mass_storage_mode(struct mode_list_elem *data)
else
mountpath = mounts[i];
umount: command = g_strconcat("mount | grep ", mountpath, NULL);
ret = system(command);
ret = usb_moded_system(command);
g_free(command);
if(!ret)
{
/* no check for / needed as that will fail to umount anyway */
command = g_strconcat("umount ", mountpath, NULL);
log_debug("unmount command = %s\n", command);
ret = system(command);
ret = usb_moded_system(command);
g_free(command);
if(ret != 0)
{
Expand Down Expand Up @@ -251,7 +251,7 @@ umount: command = g_strconcat("mount | grep ", mountpath, NULL);
{
sprintf(command2, "echo %i > /sys/devices/platform/musb_hdrc/gadget/gadget-lun%d/nofua", fua, i);
log_debug("usb lun = %s active\n", command2);
system(command2);
usb_moded_system(command2);
sprintf(command2, "/sys/devices/platform/musb_hdrc/gadget/gadget-lun%d/file", i);
log_debug("usb lun = %s active\n", command2);
write_to_file(command2, mounts[i]);
Expand Down Expand Up @@ -301,13 +301,13 @@ static int unset_mass_storage_mode(struct mode_list_elem *data)
else
mountpath = mounts[i];
command = g_strconcat("mount | grep ", mountpath, NULL);
ret = system(command);
ret = usb_moded_system(command);
g_free(command);
if(ret)
{
command = g_strconcat("mount ", mountpath, NULL);
log_debug("mount command = %s\n",command);
ret = system(command);
ret = usb_moded_system(command);
g_free(command);
/* mount returns 0 if success */
if(ret != 0 )
Expand All @@ -321,7 +321,7 @@ static int unset_mass_storage_mode(struct mode_list_elem *data)
{
command = g_strconcat("mount -t tmpfs tmpfs -o ro --size=512K ", mount, NULL);
log_debug("Total failure, mount ro tmpfs as fallback\n");
ret = system(command);
ret = usb_moded_system(command);
g_free(command);
}
usb_moded_send_error_signal(RE_MOUNT_FAILED);
Expand All @@ -342,7 +342,7 @@ static int unset_mass_storage_mode(struct mode_list_elem *data)
{
sprintf(command2, "echo \"\" > /sys/devices/platform/musb_hdrc/gadget/gadget-lun%d/file", i);
log_debug("usb lun = %s inactive\n", command2);
system(command2);
usb_moded_system(command2);
}
}
g_strfreev(mounts);
Expand Down Expand Up @@ -456,7 +456,7 @@ int set_dynamic_mode(void)
char command[256];

g_snprintf(command, 256, "ifdown %s ; ifup %s", data->network_interface, data->network_interface);
system(command);
usb_moded_system(command);
#else
usb_network_down(data);
network = usb_network_up(data);
Expand Down
26 changes: 13 additions & 13 deletions src/usb_moded-network.c
View file
Expand Up @@ -155,13 +155,13 @@ static int set_usb_ip_forward(struct mode_list_elem *data, struct ipforward_data
}
write_to_file("/proc/sys/net/ipv4/ip_forward", "1");
snprintf(command, 128, "/sbin/iptables -t nat -A POSTROUTING -o %s -j MASQUERADE", nat_interface);
system(command);
usb_moded_system(command);

snprintf(command, 128, "/sbin/iptables -A FORWARD -i %s -o %s -m state --state RELATED,ESTABLISHED -j ACCEPT", nat_interface, interface);
system(command);
usb_moded_system(command);

snprintf(command, 128, "/sbin/iptables -A FORWARD -i %s -o %s -j ACCEPT", interface, nat_interface);
system(command);
usb_moded_system(command);

free(interface);
free(nat_interface);
Expand All @@ -178,7 +178,7 @@ static void clean_usb_ip_forward(void)
connman_reset_state();
#endif
write_to_file("/proc/sys/net/ipv4/ip_forward", "0");
system("/sbin/iptables -F FORWARD");
usb_moded_system("/sbin/iptables -F FORWARD");
}

#ifdef OFONO
Expand Down Expand Up @@ -782,10 +782,10 @@ static int connman_wifi_power_control(DBusConnection *dbus_conn_connman, int on)

/* /net/connman/technology/wifi net.connman.Technology.SetProperty string:Powered variant:boolean:false */
if(wifistatus && !on)
system("/bin/dbus-send --print-reply --type=method_call --system --dest=net.connman /net/connman/technology/wifi net.connman.Technology.SetProperty string:Powered variant:boolean:false");
usb_moded_system("/bin/dbus-send --print-reply --type=method_call --system --dest=net.connman /net/connman/technology/wifi net.connman.Technology.SetProperty string:Powered variant:boolean:false");
if(wifistatus && on)
/* turn on wifi after tethering is over and wifi was on before */
system("/bin/dbus-send --print-reply --type=method_call --system --dest=net.connman /net/connman/technology/wifi net.connman.Technology.SetProperty string:Powered variant:boolean:true");
usb_moded_system("/bin/dbus-send --print-reply --type=method_call --system --dest=net.connman /net/connman/technology/wifi net.connman.Technology.SetProperty string:Powered variant:boolean:true");

return(0);
}
Expand Down Expand Up @@ -972,8 +972,8 @@ int usb_network_up(struct mode_list_elem *data)
const char *service = NULL;

/* make sure connman will recognize the gadget interface NEEDED? */
//system("/bin/dbus-send --print-reply --type=method_call --system --dest=net.connman /net/connman/technology/gadget net.connman.Technology.SetProperty string:Powered variant:boolean:true");
//system("/sbin/ifconfig rndis0 up");
//usb_moded_system("/bin/dbus-send --print-reply --type=method_call --system --dest=net.connman /net/connman/technology/gadget net.connman.Technology.SetProperty string:Powered variant:boolean:true");
//usb_moded_system("/sbin/ifconfig rndis0 up");

log_debug("waiting for connman to pick up interface\n");
sleep(1);
Expand Down Expand Up @@ -1089,25 +1089,25 @@ int usb_network_up(struct mode_list_elem *data)
if(!strcmp(ip, "dhcp"))
{
sprintf(command, "dhclient -d %s\n", interface);
ret = system(command);
ret = usb_moded_system(command);
if(ret != 0)
{
sprintf(command, "udhcpc -i %s\n", interface);
system(command);
usb_moded_system(command);
}

}
else
{
sprintf(command, "ifconfig %s %s %s\n", interface, ip, netmask);
system(command);
usb_moded_system(command);
}

/* TODO: Check first if there is a gateway set */
if(gateway)
{
sprintf(command, "route add default gw %s\n", gateway);
system(command);
usb_moded_system(command);
}

free(interface);
Expand Down Expand Up @@ -1179,7 +1179,7 @@ int usb_network_down(struct mode_list_elem *data)
return(0);

sprintf(command, "ifconfig %s down\n", interface);
system(command);
usb_moded_system(command);

/* dhcp client shutdown happens on disconnect automatically */
if(data->nat)
Expand Down
20 changes: 19 additions & 1 deletion src/usb_moded.c
View file
Expand Up @@ -1130,6 +1130,24 @@ void usb_moded_stop(int exitcode)
g_main_loop_quit(usb_moded_mainloop);
}

/** Wrapper to give visibility to blocking system() calls usb-moded is making
*/
int
usb_moded_system_(const char *file, int line, const char *func,
const char *command)
{
log_debug("EXEC %s; from %s:%d: %s()",
command, file, line, func);

int rc = system(command);

if( rc != 0 )
log_warning("EXEC %s; exit code is %d", command, rc);

return rc;
}


int main(int argc, char* argv[])
{
int opt = 0, opt_idx = 0;
Expand Down Expand Up @@ -1220,7 +1238,7 @@ int main(int argc, char* argv[])
* INITIALIZE
* - - - - - - - - - - - - - - - - - - - */

/* silence system() calls */
/* silence usb_moded_system() calls */
if(log_type != LOG_TO_STDERR || log_level != LOG_DEBUG )
{
freopen("/dev/null", "a", stdout);
Expand Down
3 changes: 3 additions & 0 deletions src/usb_moded.h
View file
Expand Up @@ -96,4 +96,7 @@ extern int cable_connection_delay;

void usb_moded_stop(int exitcode);

int usb_moded_system_(const char *file, int line, const char *func, const char *command);
#define usb_moded_system(command) usb_moded_system_(__FILE__,__LINE__,__FUNCTION__,(command))

#endif /* USB_MODED_H */

0 comments on commit 2b01382

Please sign in to comment.