diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-16 15:03:49 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-16 15:03:49 +0000 |
| commit | afc4ff93833cc2f3790429eda0c581271f589885 (patch) | |
| tree | 51458603471c8e1cfca43f17050ed60a23431fb6 /channels | |
| parent | f298b7dc446587c2706528a795caecbe0ca9a144 (diff) | |
- CANCEL is never authenticated (according to the RFC)
- Update docs on canreinvite. "nonat" is the recommended setting for most users with
phones behind a NAT.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@47733 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0ed6f0827..e480ad70f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3304,7 +3304,7 @@ static int sip_hangup(struct ast_channel *ast) /* Do we need a timer here if we don't hear from them at all? */ } else { /* Send a new request: CANCEL */ - transmit_request_with_auth(p, SIP_CANCEL, p->ocseq, XMIT_RELIABLE, FALSE); + transmit_request(p, SIP_CANCEL, p->ocseq, XMIT_RELIABLE, FALSE); /* Actually don't destroy us yet, wait for the 487 on our original INVITE, but do set an autodestruct just in case we never get it. */ needdestroy = 0; @@ -11444,11 +11444,11 @@ static void check_pendings(struct sip_pvt *p) if (ast_test_flag(&p->flags[0], SIP_PENDINGBYE)) { /* if we can't BYE, then this is really a pending CANCEL */ if (!ast_test_flag(&p->flags[0], SIP_CAN_BYE)) - transmit_request_with_auth(p, SIP_CANCEL, p->ocseq, 1, 0); + transmit_request(p, SIP_CANCEL, p->ocseq, XMIT_RELIABLE, FALSE); /* Actually don't destroy us yet, wait for the 487 on our original INVITE, but do set an autodestruct just in case we never get it. */ else - transmit_request_with_auth(p, SIP_BYE, 0, 1, 1); + transmit_request_with_auth(p, SIP_BYE, 0, XMIT_RELIABLE, TRUE); ast_clear_flag(&p->flags[0], SIP_PENDINGBYE); sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); } else if (ast_test_flag(&p->flags[0], SIP_NEEDREINVITE)) { |