From f479f81957f68c6ebd2000e99ef0f7a89617171d Mon Sep 17 00:00:00 2001
From: Philippe De Swert <philippe.deswert@jollamobile.com>
Date: Tue, 28 Apr 2015 10:47:46 +0300
Subject: [PATCH] [cleanup] Remove g_nokia code and the app killer

Remove old code related to g_nokia and remove the app killer that was in
use to recover control over the usb subsystem from badly behaving apps

Author: Thomas Perl <m@thp.io>
Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
---
 src/usb_moded-modules.c | 53 +----------------------------------------
 src/usb_moded-modules.h |  2 --
 2 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/src/usb_moded-modules.c b/src/usb_moded-modules.c
index a43ba7f..ed3bc6a 100644
--- a/src/usb_moded-modules.c
+++ b/src/usb_moded-modules.c
@@ -215,11 +215,6 @@ const char * usb_moded_find_module(void)
     
     while( getline(&text, &size, stream) >= 0 )
     {
-      if( strstr(text, "g_nokia") )
-      {
-	result = MODULE_NETWORK;
-	break;
-      }
       if( strstr(text, "g_file_storage") )
       {
 	result = MODULE_FILE_STORAGE;
@@ -258,9 +253,7 @@ const char * usb_moded_find_module(void)
 return result;
 #endif /* NO_KMOD */
   
-  if(module_state_check("g_nokia"))
-	return(MODULE_NETWORK);
-  else if(module_state_check("g_ether"))
+  if(module_state_check("g_ether"))
 	return(MODULE_DEVELOPER); 
   else if(module_state_check("g_ncm"))
 	return("g_ncm");
@@ -325,50 +318,6 @@ int usb_moded_module_cleanup(const char *module)
 		if(retry == 2)
 			break;
 	}
-	if(!strcmp(module, MODULE_NETWORK))
-	{
-		if(retry >= 2)
-		{	
-			/* we exited the loop due to max retry's. Module is not unloaded yet
-			   lets go for more extreme measures
-			   lsof, then various options of kill
-			*/
-			log_info("Oh noes the platform is on fire!\n");
-kill:		
-			/* DIRTY DESPERATE WORKAROUND */
-			/*system("for i in `lsof -t /dev/ttyGS*`; do cat /proc/$i/cmdline | sed 's/|//g' | sed "s/\x00/ /g" | awk '{ print $1 }' | xargs kill; done");
-			system("for i in `ps ax | grep phonet-at | grep -v grep | awk '{ print $1 }'`; do kill -9 $i ; done");*/
-			/* kill anything that still claims the usb tty's */
-			system("for i in `lsof -t /dev/ttyGS*`; do kill -s SIGTERM $i ; done");
-			system("for i in `lsof -t /dev/gc*`; do kill -s SIGTERM $i ; done");
-			system("for i in `lsof -t /dev/mtp*`; do kill -s SIGTERM $i ; done");
-			system("kill -s SIGTERM $(lsof -t /dev/usbacm");
-		        // SP: three passes and for loops in sh?
-		        // SP: system("kill -s SIGTERM $(lsof -t /dev/ttyGS* /dev/gc* /dev/mtp*") ?
-			// SP: or popen + kill loop?
-			/* try to unload again and give up if it did not work yet */
-			failure = usb_moded_unload_module(module);
-			if(failure && retry < 10)
-			{
-				retry++;
-			  // SP: NOTE: we have a root process in busyloop sending kill signals to
-			  // user processes? should we give them a chance to react?
-				goto kill;
-			  // SP: IMHO backwards goto is bad - a loop perhaps?
-			}
-			if(failure && retry == 10)
-			{
-				system("for i in `lsof -t /dev/ttyGS*`; do kill -9 $i ; done");
-				system("for i in `lsof -t /dev/gc*`; do kill -9 $i ; done");
-				system("for i in `lsof -t /dev/mtp*`; do kill -9 $i ; done");
-				/* try again since there seem to be hard to kill processes there */
-				system("killall -9 obexd");
-				system("killall -9 msycnd");
-				failure = usb_moded_unload_module(module);
-			}
-
-		}
-	}
 	if(!failure)
 		log_info("Module %s unloaded successfully\n", module);
 	else
diff --git a/src/usb_moded-modules.h b/src/usb_moded-modules.h
index 7654fef..f4df058 100644
--- a/src/usb_moded-modules.h
+++ b/src/usb_moded-modules.h
@@ -19,8 +19,6 @@
 */
 
 /* module name definitions */
-#define MODULE_NETWORK          "g_nokia"
-#define MODULE_NETWORK_MTP      "g_nokia"
 #define MODULE_MASS_STORAGE     "g_mass_storage"
 #define MODULE_FILE_STORAGE	"g_file_storage"
 #define MODULE_CHARGING		"g_mass_storage luns=1 stall=0 removable=1"