diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-09 21:57:01 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-09 21:57:01 +0000 |
| commit | 31057a16f7cc3bd004ce14394e88d418a0cc47b0 (patch) | |
| tree | 0958a76d8dba7cfa8b12ff384e34969449df5389 /channels/chan_sip.c | |
| parent | 2473b47929a702b6695fa98e4799f3194034b142 (diff) | |
Merged revisions 168193 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r168193 | mmichelson | 2009-01-09 15:53:26 -0600 (Fri, 09 Jan 2009) | 21 lines
Merged revisions 168128 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r168128 | mmichelson | 2009-01-09 14:08:04 -0600 (Fri, 09 Jan 2009) | 13 lines
Add check_via calls to more request handlers
INFO, NOTIFY, OPTIONS, REFER, and MESSAGE requests
were not checking the topmost Via to determine where
to send the response. Adding check_via calls to those
request handlers solves this.
(closes issue #13071)
Reported by: baron
Patches:
check_via.patch uploaded by baron (license 531)
Tested by: baron
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168195 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 448695024..92cc10fb4 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13820,6 +13820,7 @@ 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")) { @@ -16140,6 +16141,7 @@ 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; @@ -16278,6 +16280,7 @@ 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); @@ -17573,6 +17576,7 @@ 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"); @@ -18059,6 +18063,7 @@ 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); |