summaryrefslogtreecommitdiff
path: root/apps/app_osplookup.c
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2012-10-29 21:27:09 +0000
committerMark Michelson <mmichelson@digium.com>2012-10-29 21:27:09 +0000
commitda85f8489f76d50989f1f030eea7b13dc1fda52d (patch)
tree2d73dea0a4ccd82b65bc8f35012cf1e5a66c2a8e /apps/app_osplookup.c
parent1eb14dbff8bb10caba4e7bd6ebb284056d328821 (diff)
Make evaluation of channel variables consistently case-sensitive.
Due to inconsistencies in how variable names were evaluated, the decision was made to make all evaluations case-sensitive. See the UPGRADE.txt file or https://wiki.asterisk.org/wiki/display/AST/Case+Sensitivity for more details. (closes issue ASTERISK-20163) reported by Matt Jordan Review: https://reviewboard.asterisk.org/r/2160 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_osplookup.c')
-rw-r--r--apps/app_osplookup.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 88edbd51a..b37a2ae63 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -2281,9 +2281,9 @@ static int ospauth_exec(
headp = ast_channel_varshead(chan);
AST_LIST_TRAVERSE(headp, current, entries) {
- if (!strcasecmp(ast_var_name(current), "OSPINPEERIP")) {
+ if (!strcmp(ast_var_name(current), "OSPINPEERIP")) {
source = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINTOKEN")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINTOKEN")) {
token = ast_var_value(current);
}
}
@@ -2405,69 +2405,69 @@ static int osplookup_exec(
headp = ast_channel_varshead(chan);
AST_LIST_TRAVERSE(headp, current, entries) {
- if (!strcasecmp(ast_var_name(current), "OSPINACTUALSRC")) {
+ if (!strcmp(ast_var_name(current), "OSPINACTUALSRC")) {
actualsrc = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINPEERIP")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINPEERIP")) {
srcdev = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINTECH")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINTECH")) {
ast_copy_string(results.intech, ast_var_value(current), sizeof(results.intech));
- } else if (!strcasecmp(ast_var_name(current), "OSPINHANDLE")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINHANDLE")) {
if (sscanf(ast_var_value(current), "%30d", &results.inhandle) != 1) {
results.inhandle = OSP_INVALID_HANDLE;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPINTIMELIMIT")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINTIMELIMIT")) {
if (sscanf(ast_var_value(current), "%30d", &results.intimelimit) != 1) {
results.intimelimit = OSP_DEF_TIMELIMIT;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPINNETWORKID")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINNETWORKID")) {
snetid = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINNPRN")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINNPRN")) {
np.rn = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINNPCIC")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINNPCIC")) {
np.cic = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINNPDI")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINNPDI")) {
if (ast_true(ast_var_value(current))) {
np.npdi = 1;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPINSPID")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINSPID")) {
np.opname[OSPC_OPNAME_SPID] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINOCN")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINOCN")) {
np.opname[OSPC_OPNAME_OCN] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINSPN")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINSPN")) {
np.opname[OSPC_OPNAME_SPN] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINALTSPN")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINALTSPN")) {
np.opname[OSPC_OPNAME_ALTSPN] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINMCC")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINMCC")) {
np.opname[OSPC_OPNAME_MCC] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINMNC")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINMNC")) {
np.opname[OSPC_OPNAME_MNC] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINTOHOST")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINTOHOST")) {
ast_copy_string(results.dest, ast_var_value(current), sizeof(results.dest));
- } else if (!strcasecmp(ast_var_name(current), "OSPINRPIDUSER")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINRPIDUSER")) {
headers.rpiduser = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINPAIUSER")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINPAIUSER")) {
headers.paiuser = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINDIVUSER")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINDIVUSER")) {
headers.divuser = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINDIVHOST")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINDIVHOST")) {
headers.divhost = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINPCIUSER")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINPCIUSER")) {
headers.pciuser = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO1")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINCUSTOMINFO1")) {
cinfo[0] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO2")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINCUSTOMINFO2")) {
cinfo[1] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO3")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINCUSTOMINFO3")) {
cinfo[2] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO4")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINCUSTOMINFO4")) {
cinfo[3] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO5")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINCUSTOMINFO5")) {
cinfo[4] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO6")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINCUSTOMINFO6")) {
cinfo[5] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO7")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINCUSTOMINFO7")) {
cinfo[6] = ast_var_value(current);
- } else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO8")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINCUSTOMINFO8")) {
cinfo[7] = ast_var_value(current);
}
}
@@ -2669,23 +2669,23 @@ static int ospnext_exec(
headp = ast_channel_varshead(chan);
AST_LIST_TRAVERSE(headp, current, entries) {
- if (!strcasecmp(ast_var_name(current), "OSPINHANDLE")) {
+ if (!strcmp(ast_var_name(current), "OSPINHANDLE")) {
if (sscanf(ast_var_value(current), "%30d", &results.inhandle) != 1) {
results.inhandle = OSP_INVALID_HANDLE;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPOUTHANDLE")) {
+ } else if (!strcmp(ast_var_name(current), "OSPOUTHANDLE")) {
if (sscanf(ast_var_value(current), "%30d", &results.outhandle) != 1) {
results.outhandle = OSP_INVALID_HANDLE;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPINTIMELIMIT")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINTIMELIMIT")) {
if (sscanf(ast_var_value(current), "%30d", &results.intimelimit) != 1) {
results.intimelimit = OSP_DEF_TIMELIMIT;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPOUTCALLIDTYPES")) {
+ } else if (!strcmp(ast_var_name(current), "OSPOUTCALLIDTYPES")) {
if (sscanf(ast_var_value(current), "%30d", &callidtypes) != 1) {
callidtypes = OSP_CALLID_UNDEF;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPDESTREMAILS")) {
+ } else if (!strcmp(ast_var_name(current), "OSPDESTREMAILS")) {
if (sscanf(ast_var_value(current), "%30d", &results.numdests) != 1) {
results.numdests = 0;
}
@@ -2833,25 +2833,25 @@ static int ospfinished_exec(
headp = ast_channel_varshead(chan);
AST_LIST_TRAVERSE(headp, current, entries) {
- if (!strcasecmp(ast_var_name(current), "OSPINHANDLE")) {
+ if (!strcmp(ast_var_name(current), "OSPINHANDLE")) {
if (sscanf(ast_var_value(current), "%30d", &inhandle) != 1) {
inhandle = OSP_INVALID_HANDLE;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPOUTHANDLE")) {
+ } else if (!strcmp(ast_var_name(current), "OSPOUTHANDLE")) {
if (sscanf(ast_var_value(current), "%30d", &outhandle) != 1) {
outhandle = OSP_INVALID_HANDLE;
}
} else if (!recorded &&
- (!strcasecmp(ast_var_name(current), "OSPAUTHSTATUS") ||
- !strcasecmp(ast_var_name(current), "OSPLOOKUPSTATUS") ||
- !strcasecmp(ast_var_name(current), "OSPNEXTSTATUS")))
+ (!strcmp(ast_var_name(current), "OSPAUTHSTATUS") ||
+ !strcmp(ast_var_name(current), "OSPLOOKUPSTATUS") ||
+ !strcmp(ast_var_name(current), "OSPNEXTSTATUS")))
{
- if (strcasecmp(ast_var_value(current), AST_OSP_SUCCESS)) {
+ if (strcmp(ast_var_value(current), AST_OSP_SUCCESS)) {
recorded = 1;
}
- } else if (!strcasecmp(ast_var_name(current), "OSPINAUDIOQOS")) {
+ } else if (!strcmp(ast_var_name(current), "OSPINAUDIOQOS")) {
ast_copy_string(inqos, ast_var_value(current), sizeof(inqos));
- } else if (!strcasecmp(ast_var_name(current), "OSPOUTAUDIOQOS")) {
+ } else if (!strcmp(ast_var_name(current), "OSPOUTAUDIOQOS")) {
ast_copy_string(outqos, ast_var_value(current), sizeof(outqos));
}
}