|
|
@ -98,8 +98,8 @@ struct oh323_pvt {
|
|
|
|
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 */
|
|
|
|
struct ast_channel *owner; /* Who owns us */
|
|
|
|
struct ast_channel *owner; /* Who owns us */
|
|
|
|
int capability; /* Special capability */
|
|
|
|
int capability; /* audio capability */
|
|
|
|
int nonCodecCapability;
|
|
|
|
int nonCodecCapability; /* non-audio capability */
|
|
|
|
int outgoing; /* Outgoing or incoming call? */
|
|
|
|
int outgoing; /* Outgoing or incoming call? */
|
|
|
|
int nat; /* Are we talking to a NAT EP?*/
|
|
|
|
int nat; /* Are we talking to a NAT EP?*/
|
|
|
|
int bridge; /* Determine of we should native bridge or not*/
|
|
|
|
int bridge; /* Determine of we should native bridge or not*/
|
|
|
@ -110,7 +110,7 @@ struct oh323_pvt {
|
|
|
|
int amaflags; /* AMA Flags */
|
|
|
|
int amaflags; /* AMA Flags */
|
|
|
|
char callerid[80]; /* Caller*ID if available */
|
|
|
|
char callerid[80]; /* Caller*ID if available */
|
|
|
|
struct ast_rtp *rtp; /* RTP Session */
|
|
|
|
struct ast_rtp *rtp; /* RTP Session */
|
|
|
|
int dtmfmode;
|
|
|
|
int dtmfmode; /* What DTMF Mode is being used */
|
|
|
|
struct ast_dsp *vad; /* Used for in-band DTMF detection */
|
|
|
|
struct ast_dsp *vad; /* Used for in-band DTMF detection */
|
|
|
|
struct oh323_pvt *next; /* Next channel in list */
|
|
|
|
struct oh323_pvt *next; /* Next channel in list */
|
|
|
|
} *iflist = NULL;
|
|
|
|
} *iflist = NULL;
|
|
|
@ -805,7 +805,6 @@ static struct ast_channel *oh323_request(char *type, int format, void *data)
|
|
|
|
h323_set_id(h323id);
|
|
|
|
h323_set_id(h323id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
p = oh323_alloc(0);
|
|
|
|
p = oh323_alloc(0);
|
|
|
|
|
|
|
|
|
|
|
|
if (!p) {
|
|
|
|
if (!p) {
|
|
|
@ -822,6 +821,8 @@ static struct ast_channel *oh323_request(char *type, int format, void *data)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
p->nonCodecCapability &= ~AST_RTP_DTMF;
|
|
|
|
p->nonCodecCapability &= ~AST_RTP_DTMF;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* pass on our preferred codec to the H.323 stack */
|
|
|
|
|
|
|
|
h323_set_capability(format, dtmfmode);
|
|
|
|
|
|
|
|
|
|
|
|
if (ext) {
|
|
|
|
if (ext) {
|
|
|
|
strncpy(p->username, ext, sizeof(p->username) - 1);
|
|
|
|
strncpy(p->username, ext, sizeof(p->username) - 1);
|
|
|
|