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

Address Russell's comments on func_srv from reviewboard. 

* Change copyright date
* Place channel in autoservice when doing SRV lookup
* Get rid of trailing whitespace
* Change logic in load_module function



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@257025 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson 2010-04-13 16:15:36 +00:00
parent 69c252c290
commit fb0a4e5bd0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
funcs/func_srv.c
View File

@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 1999 - 2006 Digium, Inc.
* Copyright (C) 1999 - 2010 Digium, Inc.
*
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact
@ -99,14 +99,17 @@ static struct srv_context *srv_datastore_setup(const char *service, struct ast_c
return NULL;
}
ast_autoservice_start(chan);
if (ast_srv_lookup(&srds->context, service, &host, &port) < 0) {
ast_autoservice_stop(chan);
ast_log(LOG_NOTICE, "Error performing lookup of service '%s'\n", service);
ast_free(srds);
return NULL;
}
ast_autoservice_stop(chan);
strcpy(srds->id, service);
if (!(datastore = ast_datastore_alloc(&srv_result_datastore_info, srds->id))) {
ast_srv_cleanup(&srds->context);
ast_free(srds);
@ -245,12 +248,16 @@ static int unload_module(void)
static int load_module(void)
{
int res = AST_MODULE_LOAD_SUCCESS;
int res = ast_custom_function_register(&srv_query_function);
if (res < 0) {
return AST_MODULE_LOAD_DECLINE;
}
res = ast_custom_function_register(&srv_result_function);
if (res < 0) {
return AST_MODULE_LOAD_DECLINE;
}
res |= ast_custom_function_register(&srv_query_function);
res |= ast_custom_function_register(&srv_result_function);
return res;
return AST_MODULE_LOAD_SUCCESS;;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "SRV related dialplan functions");