[svn-commits] oej: branch 1.4 r64324 - /branches/1.4/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Mon May 14 14:26:50 2007
New Revision: 64324

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64324
Log:
Change -2 to XMIT_ERROR to clarify a bit more

Modified:
    branches/1.4/channels/chan_sip.c

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=64324&r1=64323&r2=64324
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Mon May 14 14:26:50 2007
@@ -153,6 +153,8 @@
 #ifndef TRUE
 #define TRUE     1
 #endif
+
+#define XMIT_ERROR		-2
 
 #define VIDEO_CODEC_MASK        0x1fc0000 /*!< Video codecs from H.261 thru AST_FORMAT_MAX_VIDEO */
 #ifndef IPTOS_MINCOST
@@ -1757,7 +1759,7 @@
 			case EHOSTUNREACH: 	/* Host can't be reached */
 			case ENETDOWN: 		/* Inteface down */
 			case ENETUNREACH:	/* Network failure */
-				res = -2;	/* Don't bother with trying to transmit again */
+				res = XMIT_ERROR;	/* Don't bother with trying to transmit again */
 		}
 	}
 	if (res != len)
@@ -1903,7 +1905,7 @@
 		append_history(pkt->owner, "ReTx", "%d %s", reschedule, pkt->data);
 		xmitres = __sip_xmit(pkt->owner, pkt->data, pkt->packetlen);
 		ast_mutex_unlock(&pkt->owner->lock);
-		if (xmitres == -2)
+		if (xmitres == XMIT_ERROR)
 			ast_log(LOG_WARNING, "Network error on retransmit in dialog %s\n", pkt->owner->callid);
 		else
 			return  reschedule;
@@ -1915,7 +1917,7 @@
 	} else if ((pkt->method == SIP_OPTIONS) && sipdebug) {
 			ast_log(LOG_WARNING, "Cancelling retransmit of OPTIONs (call id %s) \n", pkt->owner->callid);
 	}
-	if (xmitres == -2) {
+	if (xmitres == XMIT_ERROR) {
 		ast_log(LOG_WARNING, "Transmit error :: Cancelling transmission of transaction in call id %s \n", pkt->owner->callid);
 		append_history(pkt->owner, "XmitErr", "%s", (ast_test_flag(pkt, FLAG_FATAL)) ? "(Critical)" : "(Non-critical)");
 	} else
@@ -2001,7 +2003,7 @@
 
 	xmitres = __sip_xmit(pkt->owner, pkt->data, pkt->packetlen);	/* Send packet */
 
-	if (xmitres == -2) {	/* Serious network trouble, no need to try again */
+	if (xmitres == XMIT_ERROR) {	/* Serious network trouble, no need to try again */
 		append_history(pkt->owner, "XmitErr", "%s", (ast_test_flag(pkt, FLAG_FATAL)) ? "(Critical)" : "(Non-critical)");
 		ast_sched_del(sched, pkt->retransid);	/* No more retransmission */
 		pkt->retransid = -1;
@@ -2870,7 +2872,7 @@
 			if (option_debug > 1)
 				ast_log(LOG_DEBUG,"Our T38 capability (%d), joint T38 capability (%d)\n", p->t38.capability, p->t38.jointcapability);
 			xmitres = transmit_invite(p, SIP_INVITE, 1, 2);
-			if (xmitres == -2)
+			if (xmitres == XMIT_ERROR)
 				return -1;	/* Transmission error */
 
 			p->invitestate = INV_CALLING;
@@ -6445,7 +6447,7 @@
 }
 
 /*! \brief Used for 200 OK and 183 early media 
-	\return Will return -2 for network errors.
+	\return Will return XMIT_ERROR for network errors.
 */
 static int transmit_response_with_sdp(struct sip_pvt *p, const char *msg, const struct sip_request *req, enum xmittype reliable)
 {
@@ -7540,7 +7542,7 @@
 }
 
 /*! \brief Transmit generic SIP request 
-	returns -2 if transmit failed with a critical error (don't retry)
+	returns XMIT_ERROR if transmit failed with a critical error (don't retry)
 */
 static int transmit_request(struct sip_pvt *p, int sipmethod, int seqno, enum xmittype reliable, int newbranch)
 {
@@ -11974,7 +11976,7 @@
 			ast_queue_control(p->owner, AST_CONTROL_CONGESTION);
 		break;
 	}
-	if (xmitres == -2)
+	if (xmitres == XMIT_ERROR)
 		ast_log(LOG_WARNING, "Could not transmit message in dialog %s\n", p->callid);
 }
 
@@ -15311,7 +15313,7 @@
 	xmitres = transmit_invite(p, SIP_OPTIONS, 0, 2);
 #endif
 	gettimeofday(&peer->ps, NULL);
-	if (xmitres == -2)
+	if (xmitres == XMIT_ERROR)
 		sip_poke_noanswer(peer);	/* Immediately unreachable, network problems */
 	else
 		peer->pokeexpire = ast_sched_add(sched, DEFAULT_MAXMS * 2, sip_poke_noanswer, peer);