kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 320059 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320059 | rmudgett | 2011-05-20 12:03:49 -0500 (Fri, 20 May 2011) | 1 line
  
  Misc comment cleanup in features.c.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-05-20 17:04:53 +00:00
parent ae091d166a
commit 2af231dd91
1 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main/features.c
View File

@@ -389,8 +389,9 @@ static char *parkedcall = "ParkedCall";
static char pickup_ext[AST_MAX_EXTENSION]; /*!< Call pickup extension */ static char pickup_ext[AST_MAX_EXTENSION]; /*!< Call pickup extension */
/*! \brief Description of one parked call, added to a list while active, then removed. /*!
The list belongs to a parkinglot * \brief Description of one parked call, added to a list while active, then removed.
* The list belongs to a parkinglot.
*/ */
struct parkeduser { struct parkeduser {
struct ast_channel *chan; /*!< Parking channel */ struct ast_channel *chan; /*!< Parking channel */
@@ -1025,7 +1026,8 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan, struct as
parkingexten = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "PARKINGEXTEN"), "")); parkingexten = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "PARKINGEXTEN"), ""));
ast_channel_unlock(chan); ast_channel_unlock(chan);
if (!ast_strlen_zero(parkingexten)) { if (!ast_strlen_zero(parkingexten)) {
/*!\note The API forces us to specify a numeric parking slot, even /*!
* \note The API forces us to specify a numeric parking slot, even
* though the architecture would tend to support non-numeric extensions * though the architecture would tend to support non-numeric extensions
* (as are possible with SIP, for example). Hence, we enforce that * (as are possible with SIP, for example). Hence, we enforce that
* limitation here. If extout was not numeric, we could permit * limitation here. If extout was not numeric, we could permit
@@ -1583,8 +1585,9 @@ static int builtin_parkcall(struct ast_channel *chan, struct ast_channel *peer,
return parkcall_helper(chan, peer, config, code, sense, NULL); return parkcall_helper(chan, peer, config, code, sense, NULL);
} }
/*! \brief Play message to both caller and callee in bridged call, plays synchronously, autoservicing the /*!
other channel during the message, so please don't use this for very long messages * \brief Play message to both caller and callee in bridged call, plays synchronously, autoservicing the
* other channel during the message, so please don't use this for very long messages
*/ */
static int play_message_in_bridged_call(struct ast_channel *caller_chan, struct ast_channel *callee_chan, const char *audiofile) static int play_message_in_bridged_call(struct ast_channel *caller_chan, struct ast_channel *callee_chan, const char *audiofile)
{ {
@@ -2898,7 +2901,6 @@ static int feature_interpret_helper(struct ast_channel *chan, struct ast_channel
* \retval res on success. * \retval res on success.
* \retval -1 on failure. * \retval -1 on failure.
*/ */
static int feature_interpret(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, const char *code, int sense) { static int feature_interpret(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, const char *code, int sense) {
char dynamic_features_buf[128]; char dynamic_features_buf[128];
@@ -3482,8 +3484,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
struct ast_channel *who; struct ast_channel *who;
char chan_featurecode[FEATURE_MAX_LEN + 1]=""; char chan_featurecode[FEATURE_MAX_LEN + 1]="";
char peer_featurecode[FEATURE_MAX_LEN + 1]=""; char peer_featurecode[FEATURE_MAX_LEN + 1]="";
char orig_channame[AST_MAX_EXTENSION]; char orig_channame[AST_CHANNEL_NAME];
char orig_peername[AST_MAX_EXTENSION]; char orig_peername[AST_CHANNEL_NAME];
int res; int res;
int diff; int diff;
int hasfeatures=0; int hasfeatures=0;
@@ -3813,7 +3815,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
ast_log(LOG_DEBUG, "Not passing DTMF through, since it may be a feature code\n"); ast_log(LOG_DEBUG, "Not passing DTMF through, since it may be a feature code\n");
} }
} }
} else if (f->frametype == AST_FRAME_DTMF) { } else if (f->frametype == AST_FRAME_DTMF_END) {
char *featurecode; char *featurecode;
int sense; int sense;
@@ -3866,7 +3868,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
config->feature_timer = 0; config->feature_timer = 0;
} else if (hasfeatures) { } else if (hasfeatures) {
if (config->timelimit) { if (config->timelimit) {
/* No warning next time - we are waiting for future */ /* No warning next time - we are waiting for feature code */
ast_set_flag(config, AST_FEATURE_WARNING_ACTIVE); ast_set_flag(config, AST_FEATURE_WARNING_ACTIVE);
} }
config->feature_start_time = ast_tvnow(); config->feature_start_time = ast_tvnow();
@@ -3877,7 +3879,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
} }
if (f) if (f)
ast_frfree(f); ast_frfree(f);
} }
ast_cel_report_event(chan, AST_CEL_BRIDGE_END, NULL, NULL, NULL); ast_cel_report_event(chan, AST_CEL_BRIDGE_END, NULL, NULL, NULL);
@@ -4723,8 +4724,10 @@ static int park_exec(struct ast_channel *chan, const char *data)
return park_exec_full(chan, data); return park_exec_full(chan, data);
} }
/*! \brief Unreference parkinglot object. If no more references, /*!
then go ahead and delete it */ * \brief Unreference parkinglot object. If no more references,
* then go ahead and delete it
*/
static void parkinglot_unref(struct ast_parkinglot *parkinglot) static void parkinglot_unref(struct ast_parkinglot *parkinglot)
{ {
int refcount = ao2_ref(parkinglot, -1); int refcount = ao2_ref(parkinglot, -1);