diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-11 21:41:54 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-11 21:41:54 +0000 |
commit | 8605bf01043b4b9dd9244837f4c43873d51747e7 (patch) | |
tree | dd9066939862b03d9b16a5fa5b4d5a97d359632e | |
parent | 6f45949ca1c68eb72a518ae660716b391fa39e21 (diff) |
minor fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | ChangeLog | 2 | ||||
-rwxr-xr-x | channels/chan_sip.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,7 @@ 2005-11-11 Kevin P. Fleming <kpfleming@digium.com> + * channels/chan_sip.c (transmit_invite): remove useless debug message; don't try to add OSP tokens to OPTIONS pings + * apps/app_voicemail.c (close_mailbox): properly remove deleted messages at mailbox close time (issue #5663) 2005-11-11 Mark Spencer <markster@digium.com> diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 29fdfa23a..399e10149 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4845,11 +4845,9 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init) add_header(&req, "Referred-By", p->referred_by); } #ifdef OSP_SUPPORT - if (p->options && !ast_strlen_zero(p->options->osptoken)) { + if ((req.method != SIP_OPTIONS) && p->options && !ast_strlen_zero(p->options->osptoken)) { ast_log(LOG_DEBUG,"Adding OSP Token: %s\n", p->options->osptoken); add_header(&req, "P-OSP-Auth-Token", p->options->osptoken); - } else { - ast_log(LOG_DEBUG,"NOT Adding OSP Token\n"); } #endif if (p->options && !ast_strlen_zero(p->options->distinctive_ring)) |