kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added custom info support.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@232738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
TransNexus OSP Development
2009-12-03 03:56:14 +00:00
parent e5aa8cad9b
commit 8c69320c87
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/app_osplookup.c
View File

@@ -273,6 +273,7 @@ enum osp_authpolicy {
#define OSP_DEF_DESTINATIONS ((unsigned int)5) /* OSP default max number of destinations */ #define OSP_DEF_DESTINATIONS ((unsigned int)5) /* OSP default max number of destinations */
#define OSP_DEF_TIMELIMIT ((unsigned int)0) /* OSP default duration limit, no limit */ #define OSP_DEF_TIMELIMIT ((unsigned int)0) /* OSP default duration limit, no limit */
#define OSP_DEF_PROTOCOL OSP_PROT_SIP /* OSP default destination protocol, SIP */ #define OSP_DEF_PROTOCOL OSP_PROT_SIP /* OSP default destination protocol, SIP */
#define OSP_MAX_CUSTOMINFO ((unsigned int)8) /* OSP max number of custom info */
/* OSP Provider */ /* OSP Provider */
struct osp_provider { struct osp_provider {
@@ -1154,6 +1155,7 @@ static int osp_create_callid(
* \param snetid Source network ID * \param snetid Source network ID
* \param np NP parameters * \param np NP parameters
* \param div SIP Diversion header parameters * \param div SIP Diversion header parameters
* \param cinfo Custom info
* \param results Lookup results * \param results Lookup results
* \return 1 Found , 0 No route, -1 Error * \return 1 Found , 0 No route, -1 Error
*/ */
@@ -1166,6 +1168,7 @@ static int osp_lookup(
const char* snetid, const char* snetid,
struct osp_npparam* np, struct osp_npparam* np,
struct osp_diversion* div, struct osp_diversion* div,
const char* cinfo[],
struct osp_results* results) struct osp_results* results)
{ {
int res; int res;
@@ -1223,6 +1226,14 @@ static int osp_lookup(
osp_convert_inout(div->host, host, sizeof(host)); osp_convert_inout(div->host, host, sizeof(host));
OSPPTransactionSetDiversion(results->outhandle, div->user, host); OSPPTransactionSetDiversion(results->outhandle, div->user, host);
if (cinfo != NULL) {
for (i = 0; i < OSP_MAX_CUSTOMINFO; i++) {
if (!ast_strlen_zero(cinfo[i])) {
OSPPTransactionSetCustomInfo(results->outhandle, i, cinfo[i]);
}
}
}
callidnum = 0; callidnum = 0;
callids[0] = NULL; callids[0] = NULL;
for (i = 0; i < OSP_CALLID_MAXNUM; i++) { for (i = 0; i < OSP_CALLID_MAXNUM; i++) {
@@ -1921,6 +1932,8 @@ static int osplookup_exec(
const char* snetid = ""; const char* snetid = "";
struct osp_npparam np; struct osp_npparam np;
struct osp_diversion div; struct osp_diversion div;
unsigned int i;
const char* cinfo[OSP_MAX_CUSTOMINFO] = { NULL };
char buffer[OSP_TOKSTR_SIZE]; char buffer[OSP_TOKSTR_SIZE];
struct osp_results results; struct osp_results results;
const char* status; const char* status;
@@ -2000,6 +2013,22 @@ static int osplookup_exec(
div.user = ast_var_value(current); div.user = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINDIVHOST")) { } else if (!strcasecmp(ast_var_name(current), "OSPINDIVHOST")) {
div.host = ast_var_value(current); div.host = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO1")) {
cinfo[0] = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO2")) {
cinfo[1] = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO3")) {
cinfo[2] = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO4")) {
cinfo[3] = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO5")) {
cinfo[4] = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO6")) {
cinfo[5] = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO7")) {
cinfo[6] = ast_var_value(current);
} else if (!strcasecmp(ast_var_name(current), "OSPINCUSTOMINFO8")) {
cinfo[7] = ast_var_value(current);
} }
} }
ast_debug(1, "OSPLookup: source device '%s'\n", srcdev); ast_debug(1, "OSPLookup: source device '%s'\n", srcdev);
@@ -2011,12 +2040,17 @@ static int osplookup_exec(
ast_debug(1, "OSPLookup: OSPINNPDI '%d'\n", np.npdi); ast_debug(1, "OSPLookup: OSPINNPDI '%d'\n", np.npdi);
ast_debug(1, "OSPLookup: OSPINDIVUSER '%s'\n", div.user); ast_debug(1, "OSPLookup: OSPINDIVUSER '%s'\n", div.user);
ast_debug(1, "OSPLookup: OSPINDIVHOST'%s'\n", div.host); ast_debug(1, "OSPLookup: OSPINDIVHOST'%s'\n", div.host);
for (i = 0; i < OSP_MAX_CUSTOMINFO; i++) {
if (!ast_strlen_zero(cinfo[i])) {
ast_debug(1, "OSPLookup: OSPINCUSTOMINFO%d '%s'\n", i, cinfo[i]);
}
}
if ((cres = ast_autoservice_start(chan)) < 0) { if ((cres = ast_autoservice_start(chan)) < 0) {
return -1; return -1;
} }
if ((res = osp_lookup(provider, callidtypes, srcdev, chan->cid.cid_num, args.exten, snetid, &np, &div, &results)) > 0) { if ((res = osp_lookup(provider, callidtypes, srcdev, chan->cid.cid_num, args.exten, snetid, &np, &div, cinfo, &results)) > 0) {
status = AST_OSP_SUCCESS; status = AST_OSP_SUCCESS;
} else { } else {
results.tech[0] = '\0'; results.tech[0] = '\0';