[svn-commits] oej: trunk r148471 - /trunk/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: oej
Date: Mon Oct 13 10:32:55 2008
New Revision: 148471

URL: http://svn.digium.com/view/asterisk?view=rev&rev=148471
Log:
Sending a 403 after a 200 is considered very bad.

(found at SIPit)

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=148471&r1=148470&r2=148471
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Oct 13 10:32:55 2008
@@ -11142,35 +11142,37 @@
 				if (sip_cancel_destroy(p))
 					ast_log(LOG_WARNING, "Unable to cancel SIP destruction.  Expect bad things.\n");
 
-				/* We have a successful registration attempt with proper authentication,
-				   now, update the peer */
-				switch (parse_register_contact(p, peer, req)) {
-				case PARSE_REGISTER_FAILED:
-					ast_log(LOG_WARNING, "Failed to parse contact info\n");
-					transmit_response_with_date(p, "400 Bad Request", req);
-					peer->lastmsgssent = -1;
-					res = 0;
-					break;
-				case PARSE_REGISTER_QUERY:
-					transmit_response_with_date(p, "200 OK", req);
-					peer->lastmsgssent = -1;
-					res = 0;
-					break;
-				case PARSE_REGISTER_UPDATE:
-					update_peer(peer, p->expiry);
-					/* Say OK and ask subsystem to retransmit msg counter */
-					transmit_response_with_date(p, "200 OK", req);
-					if (!ast_test_flag((&peer->flags[1]), SIP_PAGE2_SUBSCRIBEMWIONLY))
-						peer->lastmsgssent = -1;
-					res = 0;
-					break;
-				}
-
 				if (check_request_transport(peer, req)) {
 					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
 					transmit_response_with_date(p, "403 Forbidden", req);
 					res = AUTH_BAD_TRANSPORT;
+				} else {
+
+					/* We have a successful registration attempt with proper authentication,
+				   	now, update the peer */
+					switch (parse_register_contact(p, peer, req)) {
+					case PARSE_REGISTER_FAILED:
+						ast_log(LOG_WARNING, "Failed to parse contact info\n");
+						transmit_response_with_date(p, "400 Bad Request", req);
+						peer->lastmsgssent = -1;
+						res = 0;
+						break;
+					case PARSE_REGISTER_QUERY:
+						transmit_response_with_date(p, "200 OK", req);
+						peer->lastmsgssent = -1;
+						res = 0;
+						break;
+					case PARSE_REGISTER_UPDATE:
+						update_peer(peer, p->expiry);
+						/* Say OK and ask subsystem to retransmit msg counter */
+						transmit_response_with_date(p, "200 OK", req);
+						if (!ast_test_flag((&peer->flags[1]), SIP_PAGE2_SUBSCRIBEMWIONLY))
+							peer->lastmsgssent = -1;
+						res = 0;
+						break;
+					}
 				}
+
 			} 
 		}
 	}