aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-16 19:59:54 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-16 19:59:54 +0000
commit28aa6a86d62ae6022215a39ee5ea2b56a06eb709 (patch)
tree32548a2c22d6582809fc8c17d37b8020bba79837
parent9004f943013c5c167020174d1228bf4ecad07b2f (diff)
Use responses rather then replies even though they mean the same thing.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@45265 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c16
-rw-r--r--configs/sip.conf.sample2
2 files changed, 9 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d7983cca4..9d6477636 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -373,7 +373,7 @@ static int global_rtpkeepalive = 0;
static int global_reg_timeout = DEFAULT_REGISTRATION_TIMEOUT;
static int global_regattempts_max = 0;
-static int global_ignoreoodreplies = 1;
+static int global_ignoreoodresponses = 1;
/* Object counters */
static int suserobjs = 0;
@@ -3241,8 +3241,8 @@ static struct sip_pvt *find_call(struct sip_request *req, struct sockaddr_in *si
}
ast_mutex_unlock(&iflock);
- /* If this is a response and we have ignoring of out of dialog replies turned, then drop it */
- 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;
p = sip_alloc(callid, sin, 1, intended_method);
@@ -8311,7 +8311,7 @@ static int sip_show_settings(int fd, int argc, char *argv[])
ast_cli(fd, " Videosupport: %s\n", videosupport ? "Yes" : "No");
ast_cli(fd, " AutoCreatePeer: %s\n", autocreatepeer ? "Yes" : "No");
ast_cli(fd, " Allow unknown access: %s\n", global_allowguest ? "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, " Promsic. redir: %s\n", ast_test_flag(&global_flags, SIP_PROMISCREDIR) ? "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");
@@ -11955,11 +11955,11 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask
ast_set_flag(mask, SIP_PROMISCREDIR);
ast_set2_flag(flags, ast_true(v->value), SIP_PROMISCREDIR);
res = 1;
- } 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;
@@ -12612,7 +12612,7 @@ static int reload_config(void)
tos = 0;
expiry = DEFAULT_EXPIRY;
global_allowguest = 1;
- global_ignoreoodreplies = 1;
+ global_ignoreoodresponses = 1;
/* Read the [general] config section of sip.conf (or from realtime config) */
v = ast_variable_browse(cfg, "general");
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index d51a765d0..c6e8c1355 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -111,7 +111,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; for any reason, always reject with '401 Unauthorized'
; instead of letting the requester know whether there was
; a matching user or peer for their request
-;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
; NoOp priority 1 extension for a given peer who registers or unregisters with