Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Optimize variable lookups (bug #3541)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Mark Spencer 21 years ago
parent 08d9c1a10c
commit ad369fa974
1 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File

106
pbx.c
Unescape View File

@ -862,37 +862,65 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
else else
*ret+=strlen(*ret)+offset; *ret+=strlen(*ret)+offset;
(*ret)[offset2] = '\0'; (*ret)[offset2] = '\0';
} else if (c && !strcmp(var, "CALLERIDNUM")) { } else if (c && !strncmp(var, "CALL", 4)) {
if (c->cid.cid_num) { if (!strncmp(var + 4, "ER", 2)) {
strncpy(workspace, c->cid.cid_num, workspacelen - 1); if (!strncmp(var + 6, "ID", 2)) {
*ret = workspace; if (!var[8]) {
} else /* CALLERID */
*ret = NULL; if (c->cid.cid_num) {
} else if (c && !strcmp(var, "CALLERANI")) { if (c->cid.cid_name) {
if (c->cid.cid_ani) { snprintf(workspace, workspacelen, "\"%s\" <%s>", c->cid.cid_name, c->cid.cid_num);
strncpy(workspace, c->cid.cid_ani, workspacelen - 1); } else {
*ret = workspace; strncpy(workspace, c->cid.cid_num, workspacelen - 1);
} else }
*ret = NULL; *ret = workspace;
} else if (c && !strcmp(var, "CALLERIDNAME")) { } else if (c->cid.cid_name) {
if (c->cid.cid_name) { strncpy(workspace, c->cid.cid_name, workspacelen - 1);
strncpy(workspace, c->cid.cid_name, workspacelen - 1); *ret = workspace;
*ret = workspace; } else
} else *ret = NULL;
*ret = NULL; } else if (!strcmp(var + 8, "NUM")) {
} else if (c && !strcmp(var, "CALLERID")) { /* CALLERIDNUM */
if (c->cid.cid_num) { if (c->cid.cid_num) {
if (c->cid.cid_name) { strncpy(workspace, c->cid.cid_num, workspacelen - 1);
snprintf(workspace, workspacelen, "\"%s\" <%s>", c->cid.cid_name, c->cid.cid_num); *ret = workspace;
} else { } else
strncpy(workspace, c->cid.cid_num, workspacelen - 1); *ret = NULL;
} else if (!strcmp(var + 8, "NAME")) {
/* CALLERIDNAME */
if (c->cid.cid_name) {
strncpy(workspace, c->cid.cid_name, workspacelen - 1);
*ret = workspace;
} else
*ret = NULL;
}
} else if (!strcmp(var + 6, "ANI")) {
/* CALLERANI */
if (c->cid.cid_ani) {
strncpy(workspace, c->cid.cid_ani, workspacelen - 1);
*ret = workspace;
} else
*ret = NULL;
} }
*ret = workspace; } else if (!strncmp(var + 4, "ING", 3)) {
} else if (c->cid.cid_name) { if (!strcmp(var + 7, "PRES")) {
strncpy(workspace, c->cid.cid_name, workspacelen - 1); /* CALLINGPRES */
*ret = workspace; snprintf(workspace, workspacelen, "%d", c->cid.cid_pres);
} else *ret = workspace;
*ret = NULL; } else if (!strcmp(var + 7, "ANI2")) {
/* CALLINGANI2 */
snprintf(workspace, workspacelen, "%d", c->cid.cid_ani2);
*ret = workspace;
} else if (!strcmp(var + 7, "TON")) {
/* CALLINGTON */
snprintf(workspace, workspacelen, "%d", c->cid.cid_ton);
*ret = workspace;
} else if (!strcmp(var + 7, "TNS")) {
/* CALLINGTNS */
snprintf(workspace, workspacelen, "%d", c->cid.cid_tns);
*ret = workspace;
}
}
} else if (c && !strcmp(var, "DNID")) { } else if (c && !strcmp(var, "DNID")) {
if (c->cid.cid_dnid) { if (c->cid.cid_dnid) {
strncpy(workspace, c->cid.cid_dnid, workspacelen - 1); strncpy(workspace, c->cid.cid_dnid, workspacelen - 1);
@ -924,25 +952,13 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
} else if (c && !strcmp(var, "PRIORITY")) { } else if (c && !strcmp(var, "PRIORITY")) {
snprintf(workspace, workspacelen, "%d", c->priority); snprintf(workspace, workspacelen, "%d", c->priority);
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "CALLINGPRES")) {
snprintf(workspace, workspacelen, "%d", c->cid.cid_pres);
*ret = workspace;
} else if (c && !strcmp(var, "CALLINGANI2")) {
snprintf(workspace, workspacelen, "%d", c->cid.cid_ani2);
*ret = workspace;
} else if (c && !strcmp(var, "CALLINGTON")) {
snprintf(workspace, workspacelen, "%d", c->cid.cid_ton);
*ret = workspace;
} else if (c && !strcmp(var, "CALLINGTNS")) {
snprintf(workspace, workspacelen, "%d", c->cid.cid_tns);
*ret = workspace;
} else if (c && !strcmp(var, "CHANNEL")) { } else if (c && !strcmp(var, "CHANNEL")) {
strncpy(workspace, c->name, workspacelen - 1); strncpy(workspace, c->name, workspacelen - 1);
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "EPOCH")) { } else if (!strcmp(var, "EPOCH")) {
snprintf(workspace, workspacelen, "%u",(int)time(NULL)); snprintf(workspace, workspacelen, "%u",(int)time(NULL));
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "DATETIME")) { } else if (!strcmp(var, "DATETIME")) {
thistime=time(NULL); thistime=time(NULL);
localtime_r(&thistime, &brokentime); localtime_r(&thistime, &brokentime);
snprintf(workspace, workspacelen, "%02d%02d%04d-%02d:%02d:%02d", snprintf(workspace, workspacelen, "%02d%02d%04d-%02d:%02d:%02d",
@ -954,7 +970,7 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
brokentime.tm_sec brokentime.tm_sec
); );
*ret = workspace; *ret = workspace;
} else if (c && !strcmp(var, "TIMESTAMP")) { } else if (!strcmp(var, "TIMESTAMP")) {
thistime=time(NULL); thistime=time(NULL);
localtime_r(&thistime, &brokentime); localtime_r(&thistime, &brokentime);
/* 20031130-150612 */ /* 20031130-150612 */

Write Preview
Loading…
Cancel
Save