From 99f52e9ef4b7161cb366db91b0661f3fa7285e51 Mon Sep 17 00:00:00 2001 From: Olle Johansson Date: Mon, 13 Oct 2008 15:36:44 +0000 Subject: [PATCH] Merged revisions 148471 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r148471 | oej | 2008-10-13 17:32:55 +0200 (MÃ¥n, 13 Okt 2008) | 4 lines Sending a 403 after a 200 is considered very bad. (found at SIPit) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148472 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 50 +++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 335d3e8e25..eb86a1e074 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10904,35 +10904,37 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct sockaddr 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; + } } + } } }