sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- remove some unnecessary casts and braces;

Browse source 
- add braces around a nested 'if'
- use S_OR and '?' to remove some duplicated function calls;
- replace nested 'if' with &&
- move out a common term in a sequence of 'if'
- add a comment on a potentially dangerous string manipulation



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo 2006-04-14 23:20:29 +00:00
parent f32e294300
commit d043954dc1
1 changed files with 36 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
res/res_features.c
View file

@ -138,7 +138,7 @@ struct parkeduser {
static struct parkeduser *parkinglot; static struct parkeduser *parkinglot;
AST_MUTEX_DEFINE_STATIC(parking_lock); AST_MUTEX_DEFINE_STATIC(parking_lock); /* protects all static variables above */
static pthread_t parking_thread; static pthread_t parking_thread;
@ -197,9 +197,9 @@ static void *ast_bridge_call_thread(void *data)
struct ast_bridge_thread_obj *tobj = data; struct ast_bridge_thread_obj *tobj = data;
tobj->chan->appl = "Transferred Call"; tobj->chan->appl = "Transferred Call";
tobj->chan->data = (char *) tobj->peer->name; tobj->chan->data = tobj->peer->name;
tobj->peer->appl = "Transferred Call"; tobj->peer->appl = "Transferred Call";
tobj->peer->data = (char *) tobj->chan->name; tobj->peer->data = tobj->chan->name;
if (tobj->chan->cdr) { if (tobj->chan->cdr) {
ast_cdr_reset(tobj->chan->cdr, NULL); ast_cdr_reset(tobj->chan->cdr, NULL);
ast_cdr_setdestchan(tobj->chan->cdr, tobj->peer->name); ast_cdr_setdestchan(tobj->chan->cdr, tobj->peer->name);
@ -214,7 +214,6 @@ static void *ast_bridge_call_thread(void *data)
ast_hangup(tobj->peer); ast_hangup(tobj->peer);
tobj->chan = tobj->peer = NULL; tobj->chan = tobj->peer = NULL;
free(tobj); free(tobj);
tobj=NULL;
return NULL; return NULL;
} }
@ -244,9 +243,8 @@ static int adsi_announce_park(struct ast_channel *chan, int parkingnum)
snprintf(tmp, sizeof(tmp), "Parked on %d", parkingnum); snprintf(tmp, sizeof(tmp), "Parked on %d", parkingnum);
message[0] = tmp; message[0] = tmp;
res = adsi_load_session(chan, NULL, 0, 1); res = adsi_load_session(chan, NULL, 0, 1);
if (res == -1) { if (res == -1)
return res; return res;
}
return adsi_print(chan, message, justify, 1); return adsi_print(chan, message, justify, 1);
} }
@ -307,18 +305,9 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
/* Remember what had been dialed, so that if the parking /* Remember what had been dialed, so that if the parking
expires, we try to come back to the same place */ expires, we try to come back to the same place */
if (!ast_strlen_zero(chan->macrocontext)) ast_copy_string(pu->context, S_OR(chan->macrocontext, chan->context), sizeof(pu->context));
ast_copy_string(pu->context, chan->macrocontext, sizeof(pu->context)); ast_copy_string(pu->exten, S_OR(chan->macroexten, chan->exten), sizeof(pu->exten));
else pu->priority = chan->macropriority ? chan->macropriority : chan->priority;
ast_copy_string(pu->context, chan->context, sizeof(pu->context));
if (!ast_strlen_zero(chan->macroexten))
ast_copy_string(pu->exten, chan->macroexten, sizeof(pu->exten));
else
ast_copy_string(pu->exten, chan->exten, sizeof(pu->exten));
if (chan->macropriority)
pu->priority = chan->macropriority;
else
pu->priority = chan->priority;
pu->next = parkinglot; pu->next = parkinglot;
parkinglot = pu; parkinglot = pu;
/* If parking a channel directly, don't quiet yet get parking running on it */ /* If parking a channel directly, don't quiet yet get parking running on it */
@ -344,20 +333,17 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
); );
if (peer) { if (peer) {
if (adsipark && adsi_available(peer)) { if (adsipark && adsi_available(peer))
adsi_announce_park(peer, pu->parkingnum); adsi_announce_park(peer, pu->parkingnum);
} if (adsipark && adsi_available(peer))
if (adsipark && adsi_available(peer)) {
adsi_unload_session(peer); adsi_unload_session(peer);
} }
}
con = ast_context_find(parking_con); con = ast_context_find(parking_con);
if (!con) { if (!con) {
con = ast_context_create(NULL, parking_con, registrar); con = ast_context_create(NULL, parking_con, registrar);
if (!con) { if (!con)
ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con); ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con);
} }
}
if (con) { if (con) {
snprintf(exten, sizeof(exten), "%d", x); snprintf(exten, sizeof(exten), "%d", x);
ast_add_extension2(con, 1, exten, 1, NULL, NULL, parkedcall, strdup(exten), FREE, registrar); ast_add_extension2(con, 1, exten, 1, NULL, NULL, parkedcall, strdup(exten), FREE, registrar);
@ -493,9 +479,10 @@ static int builtin_automonitor(struct ast_channel *chan, struct ast_channel *pee
snprintf(args, len, "%s|%s|m", (touch_format) ? touch_format : "wav", touch_filename); snprintf(args, len, "%s|%s|m", (touch_format) ? touch_format : "wav", touch_filename);
} }
for( x = 0; x < strlen(args); x++) for( x = 0; x < strlen(args); x++) {
if (args[x] == '/') if (args[x] == '/')
args[x] = '-'; args[x] = '-';
}
if (option_verbose > 3) if (option_verbose > 3)
ast_verbose(VERBOSE_PREFIX_3 "User hit '%s' to record call. filename: %s\n", code, args); ast_verbose(VERBOSE_PREFIX_3 "User hit '%s' to record call. filename: %s\n", code, args);
@ -586,11 +573,7 @@ static int builtin_blindtransfer(struct ast_channel *chan, struct ast_channel *p
the thread dies -- We have to be careful now though. We are responsible for the thread dies -- We have to be careful now though. We are responsible for
hanging up the channel, else it will never be hung up! */ hanging up the channel, else it will never be hung up! */
if (transferer == peer) return (transferer == peer) ? AST_PBX_KEEPALIVE : AST_PBX_NO_HANGUP_PEER;
res = AST_PBX_KEEPALIVE;
else
res = AST_PBX_NO_HANGUP_PEER;
return res;
} else { } else {
ast_log(LOG_WARNING, "Unable to park call %s\n", transferee->name); ast_log(LOG_WARNING, "Unable to park call %s\n", transferee->name);
} }
@ -783,11 +766,10 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
tobj->peer = newchan; tobj->peer = newchan;
tobj->bconfig = *config; tobj->bconfig = *config;
if (!ast_strlen_zero(xfersound) && !ast_streamfile(newchan, xfersound, newchan->language)) { if (!ast_strlen_zero(xfersound) && !ast_streamfile(newchan, xfersound, newchan->language) &&
if (ast_waitstream(newchan, "") < 0) { ast_waitstream(newchan, "") < 0) {
ast_log(LOG_WARNING, "Failed to play courtesy tone!\n"); ast_log(LOG_WARNING, "Failed to play courtesy tone!\n");
} }
}
ast_bridge_call_thread_launch(tobj); ast_bridge_call_thread_launch(tobj);
} else { } else {
ast_hangup(xferchan); ast_hangup(xferchan);
@ -908,7 +890,8 @@ static int feature_exec_app(struct ast_channel *chan, struct ast_channel *peer,
AST_LIST_LOCK(&feature_list); AST_LIST_LOCK(&feature_list);
AST_LIST_TRAVERSE(&feature_list,feature,feature_entry) { AST_LIST_TRAVERSE(&feature_list,feature,feature_entry) {
if (!strcasecmp(feature->exten,code)) break; if (!strcasecmp(feature->exten,code))
break;
} }
AST_LIST_UNLOCK(&feature_list); AST_LIST_UNLOCK(&feature_list);
@ -1294,6 +1277,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
peer->cdr = NULL; peer->cdr = NULL;
} }
for (;;) { for (;;) {
struct ast_channel *other; /* used later */
if (config->feature_timer) if (config->feature_timer)
start = ast_tvnow(); start = ast_tvnow();
@ -1361,51 +1345,39 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
res = -1; res = -1;
break; break;
} }
if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_RINGING)) { /* many things should be sent to the 'other' channel */
if (who == chan) other = (who == chan) ? peer : chan;
ast_indicate(peer, AST_CONTROL_RINGING); if (f->frametype == AST_FRAME_CONTROL) {
else if (f->subclass == AST_CONTROL_RINGING)
ast_indicate(chan, AST_CONTROL_RINGING); ast_indicate(other, AST_CONTROL_RINGING);
} else if (f->subclass == -1)
if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == -1)) { ast_indicate(other, -1);
if (who == chan) else if (f->subclass == AST_CONTROL_FLASH)
ast_indicate(peer, -1); ast_indicate(other, AST_CONTROL_FLASH);
else else if (f->subclass == AST_CONTROL_OPTION) {
ast_indicate(chan, -1);
}
if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_FLASH)) {
if (who == chan)
ast_indicate(peer, AST_CONTROL_FLASH);
else
ast_indicate(chan, AST_CONTROL_FLASH);
}
if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_OPTION)) {
aoh = f->data; aoh = f->data;
/* Forward option Requests */ /* Forward option Requests */
if (aoh && (aoh->flag == AST_OPTION_FLAG_REQUEST)) { if (aoh && (aoh->flag == AST_OPTION_FLAG_REQUEST))
if (who == chan) ast_channel_setoption(other, ntohs(aoh->option), aoh->data, f->datalen - sizeof(struct ast_option_header), 0);
ast_channel_setoption(peer, ntohs(aoh->option), aoh->data, f->datalen - sizeof(struct ast_option_header), 0);
else
ast_channel_setoption(chan, ntohs(aoh->option), aoh->data, f->datalen - sizeof(struct ast_option_header), 0);
} }
} }
/* check for '*', if we find it it's time to disconnect */ /* check for '*', if we find it it's time to disconnect */
if (f && (f->frametype == AST_FRAME_DTMF)) { if (f && (f->frametype == AST_FRAME_DTMF)) {
char *featurecode; char *featurecode;
int sense; int sense;
struct ast_channel *other;
hadfeatures = hasfeatures; hadfeatures = hasfeatures;
/* This cannot overrun because the longest feature is one shorter than our buffer */ /* This cannot overrun because the longest feature is one shorter than our buffer */
if (who == chan) { if (who == chan) {
other = peer;
sense = FEATURE_SENSE_CHAN; sense = FEATURE_SENSE_CHAN;
featurecode = chan_featurecode; featurecode = chan_featurecode;
} else { } else {
other = chan;
sense = FEATURE_SENSE_PEER; sense = FEATURE_SENSE_PEER;
featurecode = peer_featurecode; featurecode = peer_featurecode;
} }
/* append the event to featurecode. we rely on the string being zero-filled, and
* not overflowing it. XXX how do we guarantee the latter ?
*/
featurecode[strlen(featurecode)] = f->subclass; featurecode[strlen(featurecode)] = f->subclass;
config->feature_timer = backup_config.feature_timer; config->feature_timer = backup_config.feature_timer;
res = ast_feature_interpret(chan, peer, config, featurecode, sense); res = ast_feature_interpret(chan, peer, config, featurecode, sense);