aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-08 09:52:21 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-08 09:52:21 +0000
commit18c085608df9bd285d8d17b17c6e0c5007ca9432 (patch)
treeee5c79d830206f048a883c40f6fd77b393b0ef2f /channels
parentaa07c1c205efb59c7455fc5e4ea59974d7c0ec71 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@128950 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7a73bf2c5..b2f5fd10b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12256,21 +12256,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 (!ast_test_flag(req, SIP_PKT_IGNORE))
+ if (!p->route && !ast_test_flag(req, SIP_PKT_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 */