diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-12 15:00:31 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-12 15:00:31 +0000 |
| commit | 72647010938385cbe5a98a85eef6b395682838a6 (patch) | |
| tree | 41690357a5f0983317f88d16a013b72966c1d375 | |
| parent | b43b965c5ed9ef509d95c0954ad96f00e0f6f9b7 (diff) | |
Merged revisions 168485 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r168485 | mmichelson | 2009-01-12 09:00:00 -0600 (Mon, 12 Jan 2009) | 13 lines
Merged revisions 168482 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r168482 | mmichelson | 2009-01-12 08:58:25 -0600 (Mon, 12 Jan 2009) | 5 lines
I am reverting the fix made in revision 168128 (and its upward merges)
after being contacted by Olle Johansson and being shown how this fix is
incorrect. Thanks to Olle for clearing this up for me.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168486 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f2419acd7..92f3e7829 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13820,7 +13820,6 @@ static void handle_request_info(struct sip_pvt *p, struct sip_request *req) unsigned int event; const char *c = get_header(req, "Content-Type"); - check_via(p, req); /* Need to check the media/type */ if (!strcasecmp(c, "application/dtmf-relay") || !strcasecmp(c, "application/vnd.nortelnetworks.digits")) { @@ -16141,7 +16140,6 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str char *eventid = NULL; char *sep; - check_via(p, req); if( (sep = strchr(event, ';')) ) { /* XXX bug here - overwriting string ? */ *sep++ = '\0'; eventid = sep; @@ -16280,7 +16278,6 @@ static int handle_request_options(struct sip_pvt *p, struct sip_request *req) (this needs to be fixed in 1.4 as well) */ - check_via(p, req); if (p->lastinvite) { /* if this is a request in an active dialog, just confirm that the dialog exists. */ transmit_response_with_allow(p, "200 OK", req, 0); @@ -17576,7 +17573,6 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int int res = 0; - check_via(p, req); if (req->debug) ast_verbose("Call %s got a SIP call transfer from %s: (REFER)!\n", p->callid, ast_test_flag(&p->flags[0], SIP_OUTGOING) ? "callee" : "caller"); @@ -18063,7 +18059,6 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req) static int handle_request_message(struct sip_pvt *p, struct sip_request *req) { if (!req->ignore) { - check_via(p, req); if (req->debug) ast_verbose("Receiving message!\n"); receive_message(p, req); |