kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

attempt to implement the passing of callerid. not tested

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeremy McNamara
2003-07-23 02:00:28 +00:00
parent da17bb3e97
commit a948d041fe
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
channels/h323/chan_h323.c
View File

@@ -87,7 +87,7 @@ static char secret[50];
/** Private structure of a OpenH323 channel */ /** Private structure of a OpenH323 channel */
struct oh323_pvt { struct oh323_pvt {
pthread_mutex_t lock; /* Channel private lock */ pthread_mutex_t lock; /* Channel private lock */
call_options_t call_opt; /* Options to be used during call setup */ call_options_t calloptions; /* Options to be used during call setup */
int alreadygone; /* Whether or not we've already been destroyed by or peer */ int alreadygone; /* Whether or not we've already been destroyed by or peer */
int needdestroy; /* if we need to be destroyed */ int needdestroy; /* if we need to be destroyed */
call_details_t cd; /* Call details */ call_details_t cd; /* Call details */
@@ -402,7 +402,12 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout)
memset(called_addr, 0, sizeof(dest)); memset(called_addr, 0, sizeof(dest));
memcpy(called_addr, dest, sizeof(called_addr)); memcpy(called_addr, dest, sizeof(called_addr));
res = h323_make_call(called_addr, &(p->cd), p->call_opt); /* Copy callerid, if there is any */
if (strlen(c->callerid)) {
p->calloptions.callerid = strdup(c->callerid);
}
res = h323_make_call(called_addr, &(p->cd), p->calloptions);
if (res) { if (res) {
ast_log(LOG_NOTICE, "h323_make_call failed(%s)\n", c->name); ast_log(LOG_NOTICE, "h323_make_call failed(%s)\n", c->name);

2
channels/h323/chan_h323.h
View File

@@ -84,6 +84,7 @@ struct oh323_alias {
PBX application and passed through make_call PBX application and passed through make_call
function*/ function*/
typedef struct call_options { typedef struct call_options {
const char *callerid;
int noFastStart; int noFastStart;
int noH245Tunnelling; int noH245Tunnelling;
int noSilenceSuppression; int noSilenceSuppression;
@@ -95,6 +96,7 @@ typedef struct call_options {
asterisk channels to acutal h.323 connections */ asterisk channels to acutal h.323 connections */
typedef struct call_details { typedef struct call_details {
unsigned int call_reference; unsigned int call_reference;
const char *call_token; const char *call_token;
const char *call_source_aliases; const char *call_source_aliases;
const char *call_dest_alias; const char *call_dest_alias;