Author: rizzo
Date: Sun Jul 22 14:08:37 2007
New Revision: 76371
URL: http://svn.digium.com/view/asterisk?view=rev&rev=76371
Log:
comment and slightly restructure handle_request() in the part that handles
responses, so that there is a common exit point.
Mark two places where probably we could return -1 instead of 0 to report
an error to the caller.
(change triggered by investigations on how the 'SIP_PKT_IGNORE' field was used).
nothing to backport from this commit
Modified:
trunk/channels/chan_sip.c
Modified: trunk/channels/chan_sip.c
URL:
http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=76371&r1=76370&r2=76371
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sun Jul 22 14:08:37 2007
@@ -15700,26 +15700,34 @@
/* Find out SIP method for incoming request */
if (req->method == SIP_RESPONSE) { /* Response to our request */
/* When we get here, we know this is a SIP dialog where we've
sent
- a request and have a response, or at least get a response
- within an existing dialog */
- /* Response to our request -- Do some sanity checks */
+ * a request and have a response, or at least get a response
+ * within an existing dialog. Do some sanity checks, then
+ * possibly process the request. In all cases, there function
+ * terminates at the end of this block
+ */
+ int ret = 0;
+
if (p->ocseq < seqno) {
ast_debug(1, "Ignoring out of order response %d
(expecting %d)\n", seqno, p->ocseq);
- return -1;
+ ret = -1;
} else if (p->ocseq != seqno) {
/* ignore means "don't do anything with it" but still
have to
- respond appropriately */
+ * respond appropriately.
+ * But in this case this is a response already, so we
really
+ * have nothing to do with this message, and even
setting the
+ * ignore flag is pointless.
+ */
req->ignore = 1;
append_history(p, "Ignore", "Ignoring this
retransmit\n");
} else if (e) {
e = ast_skip_blanks(e);
if (sscanf(e, "%d %n", &respid, &len) != 1) {
ast_log(LOG_WARNING, "Invalid response:
'%s'\n", e);
- } else {
- if (respid <= 0) {
- ast_log(LOG_WARNING, "Invalid SIP
response code: '%d'\n", respid);
- return 0;
- }
+ /* XXX maybe should do ret = -1; */
+ } else if (respid <= 0) {
+ ast_log(LOG_WARNING, "Invalid SIP response
code: '%d'\n", respid);
+ /* XXX maybe should do ret = -1; */
+ } else { /* finally, something worth processing */
/* More SIP ridiculousness, we have to ignore
bogus contacts in 100 etc responses */
if ((respid == 200) || ((respid >= 300) &&
(respid <= 399)))
extract_uri(p, req);
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
