From 518c4b295df32cd8c804d54f6fd712cc271444b6 Mon Sep 17 00:00:00 2001
From: Olle Johansson <oej@edvina.net>
Date: Thu, 6 Apr 2006 21:18:12 +0000
Subject: [PATCH] Small changes to parse_sip_options
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18057 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c9cb7010ba..da6a2b99df 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1061,15 +1061,16 @@ static unsigned int parse_sip_options(struct sip_pvt *pvt, char *supported)
char *next, *sep;
char *temp = ast_strdupa(supported);
unsigned int profile = 0;
+ int i, found;
- if (ast_strlen_zero(supported) )
+ if (!pvt || ast_strlen_zero(supported) )
return 0;
if (option_debug > 2 && sipdebug)
ast_log(LOG_DEBUG, "Begin: parsing SIP \"Supported: %s\"\n", supported);
for (next = temp; next; next = sep) {
- int i, found = 0;
+ found = FALSE;
if ( (sep = strchr(next, ',')) != NULL)
*sep++ = '\0';
next = ast_skip_blanks(next);
@@ -1078,7 +1079,7 @@ static unsigned int parse_sip_options(struct sip_pvt *pvt, char *supported)
for (i=0; i < (sizeof(sip_options) / sizeof(sip_options[0])); i++) {
if (!strcasecmp(next, sip_options[i].text)) {
profile |= sip_options[i].id;
- found = 1;
+ found = TRUE;
if (option_debug > 2 && sipdebug)
ast_log(LOG_DEBUG, "Matched SIP option: %s\n", next);
break;
@@ -1087,11 +1088,8 @@ static unsigned int parse_sip_options(struct sip_pvt *pvt, char *supported)
if (!found && option_debug > 2 && sipdebug)
ast_log(LOG_DEBUG, "Found no match for SIP option: %s (Please file bug report!)\n", next);
}
- if (pvt) {
- pvt->sipoptions = profile;
- if (option_debug)
- ast_log(LOG_DEBUG, "* SIP extension value: %d for call %s\n", profile, pvt->callid);
- }
+
+ pvt->sipoptions = profile;
return profile;
}
--
GitLab