diff options
| author | Olle Johansson <oej@edvina.net> | 2008-07-08 10:02:12 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2008-07-08 10:02:12 +0000 |
| commit | 01214ba763c868d61e1c094454727400de977e01 (patch) | |
| tree | b75322532172bd4c45c0f9a06ef02372b8df72da | |
| parent | c969c0f24b4ee33e2c195646918e1358de799bf6 (diff) | |
Merged revisions 128950 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r128950 | oej | 2008-07-08 11:52:21 +0200 (Tis, 08 Jul 2008) | 11 lines
Don't hangup the call if we can't resolve the Contact if there's a proxy
route set for the call.
----
This comment was added a while ago and today it hit me badly.
/* OEJ: Possible issue that may need a check:
If we have a proxy route between us and the device,
should we care about resolving the contact
or should we just send it?
*/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index df545f834..4f71133d2 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15182,21 +15182,17 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru if (outgoing) { update_call_counter(p, DEC_CALL_RINGING); parse_ok_contact(p, req); + /* Save Record-Route for any later requests we make on this dialogue */ + if (!reinvite) + build_route(p, req, 1); + if(set_address_from_contact(p)) { /* Bad contact - we don't know how to reach this device */ /* We need to ACK, but then send a bye */ - /* OEJ: Possible issue that may need a check: - If we have a proxy route between us and the device, - should we care about resolving the contact - or should we just send it? - */ - if (!req->ignore) + if (!p->route && !req->ignore) ast_set_flag(&p->flags[0], SIP_PENDINGBYE); } - /* Save Record-Route for any later requests we make on this dialogue */ - if (!reinvite) - build_route(p, req, 1); } if (p->owner && (p->owner->_state == AST_STATE_UP) && (bridgepeer = ast_bridged_channel(p->owner))) { /* if this is a re-invite */ |