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

don't send OSP tokens do devices that are not OSP aware (issue #5093)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-09-01 22:06:23 +00:00
parent dd88d578fd
commit 421ceff171
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_osp.c
View File

@@ -506,6 +506,7 @@ int ast_osp_lookup(struct ast_channel *chan, char *provider, char *extension, ch
char tmp[256]="", *l, *n;
OSPTCALLID *callid;
OSPE_DEST_PROT prot;
OSPE_DEST_OSP_ENABLED ospenabled;
result->handle = -1;
result->numresults = 0;
@@ -569,7 +570,12 @@ int ast_osp_lookup(struct ast_channel *chan, char *provider, char *extension, ch
ast_log(LOG_DEBUG, "Got destination '%s' and called: '%s' calling: '%s' for '%s' (provider '%s')\n",
destination, callednum, callingnum, extension, provider);
do {
if (!OSPPTransactionIsDestOSPEnabled (result->handle, &ospenabled) && (ospenabled == OSPE_OSP_FALSE)) {
result->token[0] = 0;
}
else {
ast_base64encode(result->token, token, tokenlen, sizeof(result->token) - 1);
}
if ((strlen(destination) > 2) && !OSPPTransactionGetDestProtocol(result->handle, &prot)) {
res = 1;
/* Strip leading and trailing brackets */
@@ -638,6 +644,7 @@ int ast_osp_next(struct ast_osp_result *result, int cause)
char destination[2048]="";
char token[2000];
OSPE_DEST_PROT prot;
OSPE_DEST_OSP_ENABLED ospenabled;
result->tech[0] = '\0';
result->dest[0] = '\0';
@@ -652,7 +659,12 @@ int ast_osp_next(struct ast_osp_result *result, int cause)
result->numresults--;
if (!OSPPTransactionGetNextDestination(result->handle, OSPC_FAIL_INCOMPATIBLE_DEST, 0, NULL, NULL, &timelimit, &callidlen, callidstr,
sizeof(callednum), callednum, sizeof(callingnum), callingnum, sizeof(destination), destination, 0, NULL, &tokenlen, token)) {
if (!OSPPTransactionIsDestOSPEnabled (result->handle, &ospenabled) && (ospenabled == OSPE_OSP_FALSE)) {
result->token[0] = 0;
}
else {
ast_base64encode(result->token, token, tokenlen, sizeof(result->token) - 1);
}
if ((strlen(destination) > 2) && !OSPPTransactionGetDestProtocol(result->handle, &prot)) {
res = 1;
/* Strip leading and trailing brackets */