diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0a486da58..5071d7b91 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -541,7 +541,7 @@ static enum transfermodes global_allowtransfer; /*!< SIP Refer restriction schem static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263; static int noncodeccapability = AST_RTP_DTMF; -static int global_ignoreoodreplies = 1; +static int global_ignoreoodresponses = 1; /* Object counters */ static int suserobjs = 0; /*!< Static users */ @@ -4269,7 +4269,8 @@ static struct sip_pvt *find_call(struct sip_request *req, struct sockaddr_in *si } ast_mutex_unlock(&iflock); - if (req->method == SIP_RESPONSE && global_ignoreoodreplies) + /* If this is a response and we have ignoring of out of dialog responses turned on, then drop it */ + if (req->method == SIP_RESPONSE && global_ignoreoodresponses) return NULL; /* Allocate new call */ @@ -10013,7 +10014,7 @@ static int sip_show_settings(int fd, int argc, char *argv[]) ast_cli(fd, " Allow subscriptions: %s\n", ast_test_flag(&global_flags[1], SIP_PAGE2_ALLOWSUBSCRIBE) ? "Yes" : "No"); ast_cli(fd, " Allow overlap dialing: %s\n", ast_test_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP) ? "Yes" : "No"); ast_cli(fd, " Promsic. redir: %s\n", ast_test_flag(&global_flags[0], SIP_PROMISCREDIR) ? "Yes" : "No"); - ast_cli(fd, " Drop misc replies: %s\n", global_ignoreoodreplies ? "Yes" : "No"); + ast_cli(fd, " Drop misc responses: %s\n", global_ignoreoodresponses ? "Yes" : "No"); ast_cli(fd, " SIP domain support: %s\n", AST_LIST_EMPTY(&domain_list) ? "No" : "Yes"); ast_cli(fd, " Call to non-local dom.: %s\n", allow_external_domains ? "Yes" : "No"); ast_cli(fd, " URI user is phone no: %s\n", ast_test_flag(&global_flags[0], SIP_USEREQPHONE) ? "Yes" : "No"); @@ -15033,11 +15034,11 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask } else if (!strcasecmp(v->name, "rfc2833compensate")) { ast_set_flag(&mask[1], SIP_PAGE2_RFC2833_COMPENSATE); ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_RFC2833_COMPENSATE); - } else if (!strcasecmp(v->name, "ignoreoodreplies")) { + } else if (!strcasecmp(v->name, "ignoreoodresponses")) { if (ast_true(v->value)) - global_ignoreoodreplies = 1; + global_ignoreoodresponses = 1; else - global_ignoreoodreplies = 0; + global_ignoreoodresponses = 0; } return res; @@ -15716,7 +15717,7 @@ static int reload_config(enum channelreloadreason reason) ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWSUBSCRIBE); /* Default for peers, users: TRUE */ ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP); /* Default for peers, users: TRUE */ ast_set_flag(&global_flags[1], SIP_PAGE2_RTUPDATE); - global_ignoreoodreplies = 1; + global_ignoreoodresponses = 1; /* Initialize some reasonable defaults at SIP reload (used both for channel and as default for peers and users */ ast_copy_string(default_context, DEFAULT_CONTEXT, sizeof(default_context)); |