minor fixes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7079 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/ChangeLog b/ChangeLog
index f51ed4d..4dd599d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 29fdfa2..399e101 100755 (executable)
--- 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))