diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-16 20:06:18 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-16 20:06:18 +0000 |
commit | 04ad3844b957f27173160779f8e558d66dd5b8d4 (patch) | |
tree | ac82d1e6a2bbcbea6fc2d8de2c9177aeb286fdc5 | |
parent | 813a3bf9309c3beba5f3859b4f26bbeabd19f5fb (diff) |
Merged revisions 45265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45265 | file | 2006-10-16 15:59:54 -0400 (Mon, 16 Oct 2006) | 2 lines
Use responses rather then replies even though they mean the same thing.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@45280 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_sip.c | 15 | ||||
-rw-r--r-- | configs/sip.conf.sample | 3 |
2 files changed, 10 insertions, 8 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)); diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 5ea8b4d36..0422834b4 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -132,7 +132,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; contrary to the RFC3551 specification, the peer _should_ ; be negotiating AAL2-G726-32 instead :-( -;ignoreoodreplies = no ; If no then out of dialog replies will not be ignored +;ignoreoodresponses = no ; If no then out of dialog responses will not be ignored ; ; If regcontext is specified, Asterisk will dynamically create and destroy a @@ -168,6 +168,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; Useful to limit subscriptions to local extensions ; Settable per peer/user also ;notifyringing = yes ; Notify subscriptions on RINGING state + ;----------------------------------------- T.38 FAX PASSTHROUGH SUPPORT ----------------------- ; ; This setting is available in the [general] section as well as in device configurations. |