Revision
15137
Author
gmaruzz
Date
2009-10-10 12:25:54 -0500 (Sat, 10 Oct 2009)

Log Message

gsmopen: disposing of sms_receiving_program, obsoleted by MESSAGE event

Modified Paths

Diff

Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h (15136 => 15137)


--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h	2009-10-10 16:46:54 UTC (rev 15136)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h	2009-10-10 17:25:54 UTC (rev 15137)
@@ -397,12 +397,12 @@
 
 	int unread_sms_msg_id;
 	int reading_sms_msg;
-	char sms_message[4800];
+	//char sms_message[4800];
 	char sms_sender[256];
 	char sms_date[256];
 	char sms_body[4800];
 	int sms_cnmi_not_supported;
-	char sms_receiving_program[256];
+	//char sms_receiving_program[256];
 
 
 	struct timeval call_incoming_time;
@@ -561,5 +561,5 @@
 
 void gsmopen_store_boost(char *s, double *boost);
 int gsmopen_sound_boost(void *data, int samples_num, double boost);
-int sms_incoming(private_t * tech_pvt, char *value);
+int sms_incoming(private_t * tech_pvt);
 int gsmopen_ring(private_t * tech_pvt);

Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.c (15136 => 15137)


--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.c	2009-10-10 16:46:54 UTC (rev 15136)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.c	2009-10-10 17:25:54 UTC (rev 15137)
@@ -913,7 +913,7 @@
 
 						memset(at_command, 0, sizeof(at_command));
 						sprintf(at_command, "AT+CMGR=%d", tech_pvt->unread_sms_msg_id);
-						memset(tech_pvt->sms_message, 0, sizeof(tech_pvt->sms_message));
+						//memset(tech_pvt->sms_message, 0, sizeof(tech_pvt->sms_message));
 
 						tech_pvt->reading_sms_msg = 1;
 						res = gsmopen_serial_write_AT_ack(tech_pvt, at_command);
@@ -933,6 +933,9 @@
 							ERRORA("AT+CMGD (Delete SMS) do not got OK from the phone, message sent was:|||%s|||\n", GSMOPEN_P_LOG, at_command);
 						}
 
+						res = sms_incoming(tech_pvt);
+
+#if 0
 						if (strlen(tech_pvt->sms_message)) {
 							//FIXME manager_event(EVENT_FLAG_SYSTEM, "GSMOPENincomingsms",
 							//FIXME "Interface: %s\r\nSMS_Message: %s\r\n", tech_pvt->name,
@@ -978,6 +981,7 @@
 									 GSMOPEN_P_LOG, tech_pvt->sms_message);
 							}
 						}
+#endif //0
 #if 1							//is this one needed? maybe it can interrupt an incoming call that is just to announce itself
 						if (tech_pvt->phone_callflow == CALLFLOW_CALL_IDLE && tech_pvt->interface_state == GSMOPEN_STATE_DOWN && tech_pvt->owner == NULL) {
 							/* we're not in a call, neither calling */
@@ -1369,9 +1373,9 @@
 								//ERRORA("END_CONTENT inside_comma=%d, inside_quote=%d, we're at=%s\n", GSMOPEN_P_LOG, inside_comma, inside_quote, &tech_pvt->line_array.result[i][c]);
 								DEBUGA_GSMOPEN("%d content=%s\n", GSMOPEN_P_LOG, which_field, content);
 
-								strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								strncat(tech_pvt->sms_message, content, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+								//strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+								//strncat(tech_pvt->sms_message, content, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+								//strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
 
 								memset(content2, '\0', sizeof(content2));
 								if (which_field == 1) {
@@ -1381,10 +1385,10 @@
 									strncpy(content2, content, sizeof(content2));
 								}
 
-								strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								if (!err)
-									strncat(tech_pvt->sms_message, content2, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-								strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+								//strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+								//if (!err)
+									//strncat(tech_pvt->sms_message, content2, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+								//strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
 								memset(content, '\0', sizeof(content));
 								d = 0;
 								if (which_field == 1) {
@@ -1412,21 +1416,21 @@
 				}				//it was the +CMGR answer from the cellphone
 				else {
 					DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
-					strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-					strncat(tech_pvt->sms_message, tech_pvt->line_array.result[i], ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-					strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+					//strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+					//strncat(tech_pvt->sms_message, tech_pvt->line_array.result[i], ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+					//strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
 
 					memset(sms_body, '\0', sizeof(sms_body));
 					err = ucs2_to_utf8(tech_pvt, tech_pvt->line_array.result[i], sms_body, sizeof(sms_body));
 					DEBUGA_GSMOPEN("body=%s\n", GSMOPEN_P_LOG, sms_body);
 					strncpy(tech_pvt->sms_body, sms_body, sizeof(tech_pvt->sms_body));
 
-					strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-					if (!err)
-						strncat(tech_pvt->sms_message, sms_body, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
-					strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+					//strncat(tech_pvt->sms_message, "---", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+					//if (!err)
+						//strncat(tech_pvt->sms_message, sms_body, ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
+					//strncat(tech_pvt->sms_message, "|||", ((sizeof(tech_pvt->sms_message) - strlen(tech_pvt->sms_message)) - 1));
 
-					DEBUGA_GSMOPEN("sms_message=%s\n", GSMOPEN_P_LOG, tech_pvt->sms_message);
+					//DEBUGA_GSMOPEN("sms_message=%s\n", GSMOPEN_P_LOG, tech_pvt->sms_message);
 				}				//it was the UCS2 from cellphone
 
 			}					//we were reading the SMS

Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c (15136 => 15137)


--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c	2009-10-10 16:46:54 UTC (rev 15136)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.c	2009-10-10 17:25:54 UTC (rev 15137)
@@ -1214,7 +1214,7 @@
 			char *at_indicator_callsetupincoming_string = "CIEV: 6;1";
 			char *at_indicator_callsetupoutgoing_string = "CIEV: 6;2";
 			char *at_indicator_callsetupremoteringing_string = "CIEV: 6;3";
-			char *sms_receiving_program = "/usr/local/bin/ciapalo";
+			//char *sms_receiving_program = "/usr/local/bin/ciapalo";
 			char *alsacname = "plughw:1";
 			char *alsapname = "plughw:1";
 			char *at_early_audio = "0";
@@ -1365,8 +1365,8 @@
 					at_indicator_callsetupoutgoing_string = val;
 				} else if (!strcasecmp(var, "at_indicator_callsetupremoteringing_string")) {
 					at_indicator_callsetupremoteringing_string = val;
-				} else if (!strcasecmp(var, "sms_receiving_program")) {
-					sms_receiving_program = val;
+				//} else if (!strcasecmp(var, "sms_receiving_program")) {
+					//sms_receiving_program = val;
 				} else if (!strcasecmp(var, "alsacname")) {
 					alsacname = val;
 				} else if (!strcasecmp(var, "alsapname")) {
@@ -1547,7 +1547,7 @@
 				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupoutgoing_string, at_indicator_callsetupoutgoing_string);
 				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].at_indicator_callsetupremoteringing_string,
 								  at_indicator_callsetupremoteringing_string);
-				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].sms_receiving_program, sms_receiving_program);
+				//switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].sms_receiving_program, sms_receiving_program);
 				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].alsacname, alsacname);
 				switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].alsapname, alsapname);
 
@@ -2492,13 +2492,13 @@
 
 
 
-int sms_incoming(private_t * tech_pvt, char *value)
+int sms_incoming(private_t * tech_pvt)
 {
 	switch_event_t *event;
 	switch_core_session_t *session = NULL;
 	int event_sent_to_esl = 0;
 
-	DEBUGA_GSMOPEN("received SMS on interface %s: %s\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_message);
+	//DEBUGA_GSMOPEN("received SMS on interface %s: %s\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_message);
 	DEBUGA_GSMOPEN("received SMS on interface %s: DATE=%s, SENDER=%s, BODY=%s\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_date, tech_pvt->sms_sender,
 				   tech_pvt->sms_body);
 
@@ -2559,7 +2559,7 @@
 		switch_core_session_rwunlock(session);
 	}
 	//memset(&tech_pvt->chatmessages[which], '\0', sizeof(&tech_pvt->chatmessages[which]) );
-	memset(tech_pvt->sms_message, '\0', sizeof(tech_pvt->sms_message));
+	//memset(tech_pvt->sms_message, '\0', sizeof(tech_pvt->sms_message));
 	return 0;
 }