Merged revisions 369303 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r369303 | mmichelson | 2012-06-25 09:23:16 -0500 (Mon, 25 Jun 2012) | 14 lines

  Be more consistent with the return code for requests received from invalid domain.

  When Asterisk receives an INVITE from an external domain when allowexternaldomains=no
  send a 403 instead of a 404. This is consistent with Asterisk's behavior when receiving
  a REGISTER in this situation.

  (Closes issue ASTERISK-19601)
  Reported by Matthew Jordan
  Patches:
  	ASTERISK-19601-no401.patch uploaded by Mark Michelson (License #5049)
  ........

  Merged revisions 369302 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@369322 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 54528d80cd44c684f125fe561659fe3bf45d20d9..0ac36a139eea669e7a37da0c9bf492f85ddddce6 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -23589,8 +23589,6 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
                                 */
                                /* Fall through */
                        case SIP_GET_DEST_EXTEN_NOT_FOUND:
-                       case SIP_GET_DEST_REFUSED:
-                       default:
                                {
                                        char *decoded_exten = ast_strdupa(p->exten);
                                        transmit_response_reliable(p, "404 Not Found", req);
@@ -23599,6 +23597,10 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
                                                " '%s' rejected because extension not found in context '%s'.\n",
                                                S_OR(p->username, p->peername), ast_sockaddr_stringify(&p->recv), decoded_exten, p->context);
                                }
+                               break;
+                       case SIP_GET_DEST_REFUSED:
+                       default:
+                               transmit_response_reliable(p, "403 Forbidden", req);
                        } /* end switch */
 
                        p->invitestate = INV_COMPLETED;