[svn-commits] trunk r36679 - /trunk/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Sun Jul  2 14:53:54 2006
New Revision: 36679

URL: http://svn.digium.com/view/asterisk?rev=36679&view=rev
Log:
Issue #7421 - Hold status not working fully. Thanks jmls for a good job debugging!

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=36679&r1=36678&r2=36679&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sun Jul  2 14:53:54 2006
@@ -5152,7 +5152,7 @@
 /*! \brief Add route header into request per learned route */
 static void add_route(struct sip_request *req, struct sip_route *route)
 {
-	char r[256], *p;
+	char r[BUFSIZ], *p;
 	int n, rem = sizeof(r);
 
 	if (!route)
@@ -12953,7 +12953,8 @@
 			break;
 		case AST_STATE_UP:
 			if (option_debug > 1)
-				ast_log(LOG_DEBUG, "%s: New call is UP.... \n", c->name);
+				ast_log(LOG_DEBUG, "%s: This call is UP.... \n", c->name);
+
 			if (p->t38.state == T38_PEER_REINVITE) {
 				struct ast_channel *bridgepeer = NULL;
 				struct sip_pvt *bridgepvt = NULL;
@@ -13000,6 +13001,8 @@
 						ast_log(LOG_DEBUG,"T38 state changed to %d on channel %s\n", p->t38.state, p->owner ? p->owner->name : "<none>");
 				}
 			} else if (p->t38.state == T38_DISABLED) { /* Channel doesn't have T38 offered or enabled */
+				int sendok = TRUE;
+
 				/* If we are bridged to a channel that has T38 enabled than this is a case of RTP re-invite after T38 session */
 				/* so handle it here (re-invite other party to RTP) */
 				struct ast_channel *bridgepeer = NULL;
@@ -13007,6 +13010,7 @@
 				if ((bridgepeer = ast_bridged_channel(p->owner))) {
 					if (!strcasecmp(bridgepeer->tech->type, sip_tech.type)) {
 						bridgepvt = (struct sip_pvt*)bridgepeer->tech_pvt;
+						/* Does the bridged peer have T38 ? */
 						if (bridgepvt->t38.state == T38_ENABLED) {
 							ast_log(LOG_WARNING, "RTP re-invite after T38 session not handled yet !\n");
 							/* Insted of this we should somehow re-invite the other side of the bridge to RTP */
@@ -13015,13 +13019,14 @@
 							else
 								transmit_response_reliable(p, "488 Not Acceptable Here (unsupported)", req);
 							ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
-						} else {
-							/* No bridged peer with T38 enabled*/
-							transmit_response_with_sdp(p, "200 OK", req, XMIT_CRITICAL);
-						}
+							sendok = FALSE;
+						} 
+						/* No bridged peer with T38 enabled*/
 					}
-				} else	/* No bridged peer */
+				} 
+				if (sendok)
 					transmit_response_with_sdp(p, "200 OK", req, XMIT_CRITICAL);
+
 			}
 			break;
 		default: