Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16235 => 16236)

--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp	2010-01-11 04:40:39 UTC (rev 16235)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp	2010-01-11 11:23:52 UTC (rev 16236)
@@ -35,7 +35,6 @@
  */
 
 #include "gsmopen.h"
-#define MDL_CHAT_PROTO "SMS"
 
 #if 0
 #ifdef WIN32
@@ -89,6 +88,7 @@
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_gsmopen_shutdown);
 SWITCH_MODULE_DEFINITION(mod_gsmopen, mod_gsmopen_load, mod_gsmopen_shutdown, NULL);
 SWITCH_END_EXTERN_C
+#define MDL_CHAT_PROTO "SMS"
 #if 1
 SWITCH_STANDARD_API(gsm_function);
 /* BEGIN: Changes here */
@@ -1870,12 +1870,10 @@
 
 	for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
 		tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
+			WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
 
 		if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
-
-
-
-			//alsa_shutdown(&globals.GSMOPEN_INTERFACES[interface_id]);
+			WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
 			globals.GSMOPEN_INTERFACES[interface_id].running = 0;
 			if (globals.GSMOPEN_INTERFACES[interface_id].gsmopen_signaling_thread) {
 #ifdef WIN32
@@ -1909,7 +1907,6 @@
 				WARNINGA("SHUTDOWN tech_pvt->controldevfd=%d\n", GSMOPEN_P_LOG, tech_pvt->controldevfd);
 			}
 #ifndef WIN32
-			WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
 			shutdown(tech_pvt->audiogsmopenpipe[0], 2);
 			close(tech_pvt->audiogsmopenpipe[0]);
 			shutdown(tech_pvt->audiogsmopenpipe[1], 2);
@@ -2463,7 +2460,6 @@
 	time_t now_timestamp;
 
 	//if (gsmopen_present(GSMopenHandles)) 
-	if (1) {
 		while (running && tech_pvt->running) {
 			int res;
 			//gsmopen_sleep(1000000); //1 sec
@@ -2515,11 +2511,6 @@
 				gsmopen_serial_getstatus_AT(tech_pvt);
 			}
 		}
-	} else {
-		ERRORA("GSM is not running, maybe crashed. Please run/restart GSM and relaunch GSMopen\n", GSMOPEN_P_LOG);
-		running = 0;
-		return NULL;
-	}
 	WARNINGA("EXIT\n", GSMOPEN_P_LOG);
 	//running = 0;
 	return NULL;
@@ -2664,7 +2655,7 @@
 
 
 #ifdef NOTDEF
-SWITCH_STANDARD_API(skypiax_chat_function)
+SWITCH_STANDARD_API(gsmopen_chat_function)
 {
 	char *mycmd = NULL, *argv[10] = { 0 };
 	int argc = 0;
@@ -2701,7 +2692,7 @@
 
 		}
 		if (!found) {
-			stream->write_function(stream, "ERROR: A Skypiax interface with name='%s' was not found\n", argv[0]);
+			stream->write_function(stream, "ERROR: A GSMopen interface with name='%s' was not found\n", argv[0]);
 			goto end;
 		} else {
 
@@ -2717,7 +2708,7 @@
 
 			//NOTICA("TEXT is: %s\n", GSMOPEN_P_LOG, (char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1] );
 			//snprintf(skype_msg, sizeof(skype_msg), "CHAT CREATE %s", argv[1]);
-			//skypiax_signaling_write(tech_pvt, skype_msg);
+			//gsmopen_signaling_write(tech_pvt, skype_msg);
 			//switch_sleep(100);
 		}
 	} else {
@@ -2734,7 +2725,7 @@
 			if (!strcmp(tech_pvt->chats[i].dialog_partner, argv[1])) {
 				snprintf(skype_msg, sizeof(skype_msg), "CHATMESSAGE %s %s", tech_pvt->chats[i].chatname,
 						 (char *) &cmd[strlen(argv[0]) + 1 + strlen(argv[1]) + 1]);
-				skypiax_signaling_write(tech_pvt, skype_msg);
+				gsmopen_signaling_write(tech_pvt, skype_msg);
 				found = 1;
 				break;
 			}