[asterisk-commits] oej: trunk r42768 - /trunk/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Sep 11 14:24:35 2006
New Revision: 42768

URL: http://svn.digium.com/view/asterisk?rev=42768&view=rev
Log:
- Use enum for send-request reliability flags
- Make re-invites CRITICAL 

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=42768&r1=42767&r2=42768&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Sep 11 14:24:35 2006
@@ -6166,7 +6166,7 @@
 	/* Use this as the basis */
 	initialize_initreq(p, &req);
 	p->lastinvite = p->ocseq;
-	return send_request(p, &req, 1, p->ocseq);
+	return send_request(p, &req, XMIT_CRITICAL, p->ocseq);
 }
 
 /*! \brief Transmit reinvite with T38 SDP 
@@ -6188,7 +6188,7 @@
 	/* Use this as the basis */
 	initialize_initreq(p, &req);
 	p->lastinvite = p->ocseq;
-	return send_request(p, &req, 1, p->ocseq);
+	return send_request(p, &req, XMIT_CRITICAL, p->ocseq);
 }
 
 /*! \brief Check Contact: URI of SIP message */
@@ -6532,7 +6532,7 @@
 	if (!p->initreq.headers)
 		initialize_initreq(p, &req);
 	p->lastinvite = p->ocseq;
-	return send_request(p, &req, init ? 2 : 1, p->ocseq);
+	return send_request(p, &req, init ? XMIT_CRITICAL : XMIT_RELIABLE, p->ocseq);
 }
 
 /*! \brief Used in the SUBSCRIBE notification subsystem */
@@ -6693,7 +6693,7 @@
 	add_header_contentLength(&req, strlen(tmp));
 	add_line(&req, tmp);
 
-	return send_request(p, &req, 1, p->ocseq);
+	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
 }
 
 /*! \brief Notify user of messages waiting in voicemail
@@ -6732,15 +6732,15 @@
 
 	if (!p->initreq.headers) 
 		initialize_initreq(p, &req);
-	return send_request(p, &req, 1, p->ocseq);
-}
-
-/*! \brief Transmit SIP request */
+	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
+}
+
+/*! \brief Transmit SIP request unreliably */
 static int transmit_sip_request(struct sip_pvt *p, struct sip_request *req)
 {
 	if (!p->initreq.headers) 	/* Initialize first request before sending */
 		initialize_initreq(p, req);
-	return send_request(p, req, 0, p->ocseq);
+	return send_request(p, req, XMIT_UNRELIABLE, p->ocseq);
 }
 
 /*! \brief Notify a transferring party of the status of transfer */
@@ -6764,7 +6764,7 @@
 	if (!p->initreq.headers)
 		initialize_initreq(p, &req);
 
-	return send_request(p, &req, 1, p->ocseq);
+	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
 }
 
 /*! \brief Convert registration state status to string */
@@ -7041,7 +7041,7 @@
 	r->regattempts++;	/* Another attempt */
 	if (option_debug > 3)
 		ast_verbose("REGISTER attempt %d to %s@%s\n", r->regattempts, r->username, r->hostname);
-	return send_request(p, &req, 2, p->ocseq);
+	return send_request(p, &req, XMIT_CRITICAL, p->ocseq);
 }
 
 /*! \brief Transmit text with SIP MESSAGE method */
@@ -7051,7 +7051,7 @@
 
 	reqprep(&req, p, SIP_MESSAGE, 0, 1);
 	add_text(&req, text);
-	return send_request(p, &req, 1, p->ocseq);
+	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
 }
 
 /*! \brief Allocate SIP refer structure */
@@ -7124,7 +7124,7 @@
 	if (!ast_strlen_zero(p->our_contact))
 		add_header(&req, "Referred-By", p->our_contact);
 
-	return send_request(p, &req, 1, p->ocseq);
+	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
 	/* We should propably wait for a NOTIFY here until we ack the transfer */
 	/* Maybe fork a new thread and wait for a STATUS of REFER_200OK on the refer status before returning to app_transfer */
 
@@ -7143,7 +7143,7 @@
 
 	reqprep(&req, p, SIP_INFO, 0, 1);
 	add_digit(&req, digit);
-	return send_request(p, &req, 1, p->ocseq);
+	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
 }
 
 /*! \brief Send SIP INFO with video update request */
@@ -7153,7 +7153,7 @@
 
 	reqprep(&req, p, SIP_INFO, 0, 1);
 	add_vidupdate(&req);
-	return send_request(p, &req, 1, p->ocseq);
+	return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
 }
 
 /*! \brief Transmit generic SIP request */