[Freeswitch-svn] [commit] r13088 - freeswitch/trunk/src/mod/endpoints/mod_sofia

[FreeSWITCH SVN]

Author: anthm
Date: Mon Apr 20 14:00:39 2009
New Revision: 13088

Log:
add sip info to event_socket gateway

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Mon Apr 20 14:00:39 2009
@@ -2899,7 +2899,6 @@
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find profile %s\n", profile_name);
 				return;
 			}
-
 			
 			nh = nua_handle(profile->nua, 
 							NULL, 
@@ -2909,7 +2908,10 @@
 							SIPTAG_CONTACT_STR(profile->url), 
 							TAG_END());
 			
+			nua_handle_bind(nh, &mod_sofia_globals.destroy_private);
+
 			nua_info(nh,
+					 NUTAG_WITH_THIS(profile->nua),
 					 TAG_IF(ct, SIPTAG_CONTENT_TYPE_STR(ct)), 
 					 TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)),
 					 TAG_END());

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Mon Apr 20 14:00:39 2009
@@ -3900,7 +3900,7 @@
 					}
 				} else {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n");
-					goto fail;
+					goto end;
 				}
 
 				if ((signal_ptr = switch_stristr("Duration=", sip->sip_payload->pl_data))) {
@@ -3916,7 +3916,7 @@
 				int tmp = atoi(sip->sip_payload->pl_data);
 				dtmf.digit = switch_rfc2833_to_char(tmp);
 			} else {
-				goto fail;
+				goto end;
 			}
 
 			if (dtmf.digit) {
@@ -3944,11 +3944,8 @@
 
 				/* Send 200 OK response */
 				nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
-
-				goto end;
-			} else {
-				goto fail;
 			}
+			goto end;
 		}
 
 		if ((clientcode_header = sofia_glue_get_unknown_header(sip, "x-clientcode"))) {
@@ -3956,8 +3953,6 @@
 				switch_channel_set_variable(channel, "call_clientcode", clientcode_header);
 				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Setting CMC to %s\n", clientcode_header);
 				nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
-			} else {
-				goto fail;
 			}
 			goto end;
 		}
@@ -3991,15 +3986,8 @@
 					}
 				}
 			}
-			goto end;
 		}
 	}
-	goto end;
-
-  fail:
-
-	/* *shrug* just ok it */
-	nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
 
  end:
 
@@ -4041,7 +4029,7 @@
 			}
 		}
 
-		if (sip->sip_payload->pl_data) {
+		if (sip->sip_payload && sip->sip_payload->pl_data) {
 			switch_event_add_body(event, "%s", sip->sip_payload->pl_data);
 		}
 
@@ -4049,6 +4037,8 @@
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dispatched freeswitch event for INFO\n");
 	}
 
+	nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
+
 	return;
 
 }