diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-02 17:24:03 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-02 17:24:03 +0000 |
| commit | 1de5da674f0d26af33de9f2eaf6d9c012d22ea73 (patch) | |
| tree | b0bec7068847eb3fa1e8a42df3835ad07d197f48 /cdr | |
| parent | 597a4c356a13203e414d28ab3fd4c6a0fbee83b7 (diff) | |
Merged revisions 62689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r62689 | murf | 2007-05-02 11:10:50 -0600 (Wed, 02 May 2007) | 1 line
a)In chan_zap, set the clid, src fields in channel_alloc call. b)in the channel_alloc func, set the cid_num and name fields from the arglist[blush]. c) don't update the channel app & app data fields if you are in the 'h' extension. d)the load_module func in cdr_radius needs to return DECLINE, SUCCESS.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@62690 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_radius.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c index 5f6014ad9..99968ed31 100644 --- a/cdr/cdr_radius.c +++ b/cdr/cdr_radius.c @@ -239,6 +239,7 @@ static int unload_module(void) static int load_module(void) { struct ast_config *cfg; + int res; const char *tmp; if ((cfg = ast_config_load(cdr_config))) { @@ -257,16 +258,17 @@ static int load_module(void) /* read radiusclient-ng config file */ if (!(rh = rc_read_config(radiuscfg))) { ast_log(LOG_NOTICE, "Cannot load radiusclient-ng configuration file %s.\n", radiuscfg); - return -1; + return AST_MODULE_LOAD_DECLINE; } /* read radiusclient-ng dictionaries */ if (rc_read_dictionary(rh, rc_conf_str(rh, "dictionary"))) { ast_log(LOG_NOTICE, "Cannot load radiusclient-ng dictionary file.\n"); - return -1; + return AST_MODULE_LOAD_DECLINE; } - return ast_cdr_register(name, desc, radius_log); + res = ast_cdr_register(name, desc, radius_log); + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "RADIUS CDR Backend"); |