[asterisk-commits] oej: branch oej/midcomstuff r53610 - /team/oej/midcomstuff/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Feb  8 12:27:08 2007
New Revision: 53610

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53610
Log:
Update

Modified:
    team/oej/midcomstuff/channels/chan_sip.c

Modified: team/oej/midcomstuff/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/midcomstuff/channels/chan_sip.c?view=diff&rev=53610&r1=53609&r2=53610
==============================================================================
--- team/oej/midcomstuff/channels/chan_sip.c (original)
+++ team/oej/midcomstuff/channels/chan_sip.c Thu Feb  8 12:27:08 2007
@@ -1548,7 +1548,7 @@
 static char *sip_get_username(void *p);
 static struct ast_channel *sip_channel_helper(void *p);
 static struct ast_channel *sip_bridged_channel_helper(void *p);
-static int sip_get_capability_helper(void *p, int *codec, int *dtmf_payload);
+static void sip_get_capability_helper(void *p, int *codec, int *dtmf_payload);
 static void sip_softhangup_helper(void *p);
 
 extern struct ast_sip_hook_cb *midcom_cb;
@@ -6663,12 +6663,14 @@
 	struct sip_request req;
 
 #ifdef SIP_MIDCOM
-	if (midcom_cb && !midcom_cb->transmit_reinvite_with_sdp_hook(p)) { 
-		ast_log(LOG_ERROR, "Failed transmit_reinvite_with_sdp_hook()\n");
-		if (p->owner)
-			ast_queue_hangup(p->owner);
-		else
-			ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
+	if (m_cb) {
+		if (!m_cb->transmit_reinvite_with_sdp_hook(p, p->redirip.sin_addr.s_addr?1:0, p->vredirip.sin_addr.s_addr?1:0)) {
+			ast_log(LOG_NOTICE, "Failed transmit_reinvite_with_sdp_hook()\n");
+			if (p->owner)
+				ast_queue_hangup(p->owner);
+			else
+				ast_set_flag(p, SIP_NEEDDESTROY);
+		}
 	}
 #endif