Revision
15712
Author
gmaruzz
Date
2009-11-29 06:04:42 -0600 (Sun, 29 Nov 2009)

Log Message

gsmopen: updated to new API

Modified Paths

Diff

Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (15711 => 15712)


--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp	2009-11-29 08:28:28 UTC (rev 15711)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp	2009-11-29 12:04:42 UTC (rev 15712)
@@ -197,7 +197,7 @@
 static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
 													switch_event_t *var_event,
 													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags);
+													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause);
 static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
 static switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
 static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
@@ -970,7 +970,7 @@
 static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session,
 													switch_event_t *var_event,
 													switch_caller_profile_t *outbound_profile,
-													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags)
+													switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause)
 {
 	private_t *tech_pvt = NULL;
 	if ((*new_session = switch_core_session_request(gsmopen_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) {
@@ -2423,28 +2423,7 @@
 
 }
 
-#ifdef NOTDEF
-int sms_incoming(private_t * tech_pvt, char *value)
-{
-	char sms_buf[512];
-	switch_event_t *event;
 
-	DEBUGA_GSMOPEN("received SMS >>>%s<<< on interface %s\n", GSMOPEN_P_LOG, value, tech_pvt->name);
-
-	switch_snprintf(sms_buf, sizeof(sms_buf), "incoming SMS on %s\n", tech_pvt->name);
-
-	if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_INCOMING_SMS) == SWITCH_STATUS_SUCCESS) {
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_info", sms_buf);
-		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "interface_name", tech_pvt->name);
-		switch_event_add_body(event, "%s\n\n", tech_pvt->sms_message);
-		switch_event_fire(&event);
-	}
-
-	return 0;
-}
-#endif // NOTDEF
-
-
 SWITCH_STANDARD_API(sendsms_function)
 {
 	char *mycmd = NULL, *argv[3] = { 0 };
@@ -2510,7 +2489,7 @@
 	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: DATE=%s, SENDER=%s, BODY=%s\n", GSMOPEN_P_LOG, tech_pvt->name, tech_pvt->sms_date, tech_pvt->sms_sender,
+	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);
 
 	if (!zstr(tech_pvt->session_uuid_str)) {