From 8bc5bf82dfadcb7206614855068ea6ff4f620daa Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 12 Aug 2010 22:10:49 +0000 Subject: Merged revisions 282098 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r282098 | rmudgett | 2010-08-12 17:06:06 -0500 (Thu, 12 Aug 2010) | 7 lines Separate call completion config parameter allocation and default initialization. If you ever have a need to reset the call completion config parameters to defaults, now you can. And no Virginia, C++ idioms do not always work in C. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282099 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/ccss.c | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) (limited to 'main') diff --git a/main/ccss.c b/main/ccss.c index 2cf828470..4dcacd360 100644 --- a/main/ccss.c +++ b/main/ccss.c @@ -501,38 +501,45 @@ static int count_agents_cb(void *obj, void *arg, void *data, int flags) return 0; } -static const unsigned int CC_OFFER_TIMER_DEFAULT = 20u; -static const unsigned int CCNR_AVAILABLE_TIMER_DEFAULT = 7200u; -static const unsigned int CCBS_AVAILABLE_TIMER_DEFAULT = 4800u; -static const unsigned int CC_RECALL_TIMER_DEFAULT = 20u; -static const unsigned int CC_MAX_AGENTS_DEFAULT = 5u; -static const unsigned int CC_MAX_MONITORS_DEFAULT = 5u; -static const unsigned int GLOBAL_CC_MAX_REQUESTS_DEFAULT = 20u; +#define CC_OFFER_TIMER_DEFAULT 20 /* Seconds */ +#define CCNR_AVAILABLE_TIMER_DEFAULT 7200 /* Seconds */ +#define CCBS_AVAILABLE_TIMER_DEFAULT 4800 /* Seconds */ +#define CC_RECALL_TIMER_DEFAULT 20 /* Seconds */ +#define CC_MAX_AGENTS_DEFAULT 5 +#define CC_MAX_MONITORS_DEFAULT 5 +#define GLOBAL_CC_MAX_REQUESTS_DEFAULT 20 + +static const struct ast_cc_config_params cc_default_params = { + .cc_agent_policy = AST_CC_AGENT_NEVER, + .cc_monitor_policy = AST_CC_MONITOR_NEVER, + .cc_offer_timer = CC_OFFER_TIMER_DEFAULT, + .ccnr_available_timer = CCNR_AVAILABLE_TIMER_DEFAULT, + .ccbs_available_timer = CCBS_AVAILABLE_TIMER_DEFAULT, + .cc_recall_timer = CC_RECALL_TIMER_DEFAULT, + .cc_max_agents = CC_MAX_AGENTS_DEFAULT, + .cc_max_monitors = CC_MAX_MONITORS_DEFAULT, + .cc_callback_macro = "", + .cc_agent_dialstring = "", +}; + +void ast_cc_default_config_params(struct ast_cc_config_params *params) +{ + *params = cc_default_params; +} struct ast_cc_config_params *__ast_cc_config_params_init(const char *file, int line, const char *function) { #if defined(__AST_DEBUG_MALLOC) - struct ast_cc_config_params *params = __ast_calloc(1, sizeof(*params), file, line, function); + struct ast_cc_config_params *params = __ast_malloc(sizeof(*params), file, line, function); #else - struct ast_cc_config_params *params = ast_calloc(1, sizeof(*params)); + struct ast_cc_config_params *params = ast_malloc(sizeof(*params)); #endif if (!params) { return NULL; } - /* Yeah, I could use the get/set functions, but what's the point since - * I have direct access to the structure fields in this file. - */ - params->cc_agent_policy = AST_CC_AGENT_NEVER; - params->cc_monitor_policy = AST_CC_MONITOR_NEVER; - params->cc_offer_timer = CC_OFFER_TIMER_DEFAULT; - params->ccnr_available_timer = CCNR_AVAILABLE_TIMER_DEFAULT; - params->ccbs_available_timer = CCBS_AVAILABLE_TIMER_DEFAULT; - params->cc_recall_timer = CC_RECALL_TIMER_DEFAULT; - params->cc_max_agents = CC_MAX_AGENTS_DEFAULT; - params->cc_max_monitors = CC_MAX_MONITORS_DEFAULT; - /* No need to set cc_callback_macro since calloc will 0 it out anyway */ + ast_cc_default_config_params(params); return params; } -- cgit v1.2.3