From 6e8d96fcd1d69366d3577be035d04bb0a2e19daf Mon Sep 17 00:00:00 2001 From: Automerge Script Date: Wed, 4 Apr 2007 16:51:41 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@60117 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f87d9f9794..87fce1a847 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12096,20 +12096,17 @@ static struct ast_channel *sip_request_call(const char *type, int format, void * /*! \brief handle_common_options: Handle flag-type options common to users and peers ---*/ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask, struct ast_variable *v) { - int res = 0; + int res = 1; if (!strcasecmp(v->name, "trustrpid")) { ast_set_flag(mask, SIP_TRUSTRPID); ast_set2_flag(flags, ast_true(v->value), SIP_TRUSTRPID); - res = 1; } else if (!strcasecmp(v->name, "sendrpid")) { ast_set_flag(mask, SIP_SENDRPID); ast_set2_flag(flags, ast_true(v->value), SIP_SENDRPID); - res = 1; } else if (!strcasecmp(v->name, "useclientcode")) { ast_set_flag(mask, SIP_USECLIENTCODE); ast_set2_flag(flags, ast_true(v->value), SIP_USECLIENTCODE); - res = 1; } else if (!strcasecmp(v->name, "dtmfmode")) { ast_set_flag(mask, SIP_DTMF); ast_clear_flag(flags, SIP_DTMF); @@ -12196,8 +12193,8 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask } else if (!strcasecmp(v->name, "promiscredir")) { ast_set_flag(mask, SIP_PROMISCREDIR); ast_set2_flag(flags, ast_true(v->value), SIP_PROMISCREDIR); - res = 1; - } + } else + res = 0; return res; } -- 2.47.2