kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagate caller's transfer capability too

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Cadach
2006-10-07 14:39:34 +00:00
parent f480d547cc
commit e2676b1098
4 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_h323.c
View File

@@ -644,9 +644,13 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout)
} else
pvt->options.redirect_reason = -1;
pvt->options.transfer_capability = c->transfercapability;
/* indicate that this is an outgoing call */
pvt->outgoing = 1;
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Requested transfer capability: 0x%.2x - %s\n", c->transfercapability, ast_transfercapability2str(c->transfercapability));
if (h323debug)
ast_log(LOG_DEBUG, "Placing outgoing call to %s, %d\n", called_addr, pvt->options.dtmfcodec);
ast_mutex_unlock(&pvt->lock);
@@ -1075,6 +1079,8 @@ static struct ast_channel *__oh323_new(struct oh323_pvt *pvt, int state, const c
if (!ast_strlen_zero(pvt->exten) && strcmp(pvt->exten, "s")) {
ch->cid.cid_dnid = strdup(pvt->exten);
}
if (pvt->cd.transfer_capability >= 0)
ch->transfercapability = pvt->cd.transfer_capability;
ast_setstate(ch, state);
if (state != AST_STATE_DOWN) {
if (ast_pbx_start(ch)) {
@@ -1100,6 +1106,7 @@ static struct oh323_pvt *oh323_alloc(int callid)
}
memset(pvt, 0, sizeof(struct oh323_pvt));
pvt->cd.redirect_reason = -1;
pvt->cd.transfer_capability = -1;
/* Ensure the call token is allocated for outgoing call */
if (!callid) {
if ((pvt->cd).call_token == NULL) {

18
channels/h323/ast_h323.cxx
View File

@@ -544,6 +544,7 @@ MyH323Connection::MyH323Connection(MyH323EndPoint & ep, unsigned callReference,
dtmfMode = 0;
dtmfCodec = (RTP_DataFrame::PayloadTypes)0;
redirect_reason = -1;
transfer_capability = -1;
#ifdef TUNNELLING
tunnelOptions = remoteTunnelOptions = 0;
#endif
@@ -723,6 +724,9 @@ void MyH323Connection::SetCallOptions(void *o, BOOL isIncoming)
}
cid_presentation = opts->presentation;
cid_ton = opts->type_of_number;
if (opts->transfer_capability >= 0) {
transfer_capability = opts->transfer_capability;
}
}
tunnelOptions = opts->tunnelOptions;
}
@@ -756,6 +760,8 @@ void MyH323Connection::SetCallDetails(void *callDetails, const H323SignalPDU &se
PString redirect_number;
unsigned redirect_reason;
unsigned plan, type, screening, presentation;
Q931::InformationTransferCapability capability;
unsigned transferRate, codingStandard, userInfoLayer1;
/* Fetch presentation and type information about calling party's number */
if (setupPDU.GetQ931().GetCallingPartyNumber(sourceName, &plan, &type, &presentation, &screening, 0, 0)) {
@@ -783,13 +789,20 @@ void MyH323Connection::SetCallDetails(void *callDetails, const H323SignalPDU &se
GetSignallingChannel()->GetRemoteAddress().GetIpAndPort(Ip, sourcePort);
cd->sourceIp = strdup((const char *)Ip.AsString());
if(setupPDU.GetQ931().GetRedirectingNumber(redirect_number, NULL, NULL, NULL, NULL, &redirect_reason, 0, 0, 0)) {
if (setupPDU.GetQ931().GetRedirectingNumber(redirect_number, NULL, NULL, NULL, NULL, &redirect_reason, 0, 0, 0)) {
cd->redirect_number = strdup((const char *)redirect_number);
cd->redirect_reason = redirect_reason;
}
else
cd->redirect_reason = -1;
/* Fetch Q.931's transfer capability */
if (((Q931 &)setupPDU.GetQ931()).GetBearerCapabilities(capability, transferRate, &codingStandard, &userInfoLayer1))
cd->transfer_capability = ((unsigned int)capability & 0x1f) | (codingStandard << 5);
else
cd->transfer_capability = 0x00; /* ITU coding of Speech */
/* Don't show local username as called party name */
SetDisplayName(cd->call_dest_e164);
}
@@ -1216,6 +1229,9 @@ BOOL MyH323Connection::OnSendSignalSetup(H323SignalPDU & setupPDU)
setupPDU.GetQ931().SetIE(Q931::RedirectingNumberIE, IE);
}
if (transfer_capability)
setupPDU.GetQ931().SetBearerCapabilities((Q931::InformationTransferCapability)(transfer_capability & 0x1f), 1, ((transfer_capability >> 5) & 3));
SetCallDetails(&cd, setupPDU, FALSE);
int res = on_outgoing_call(&cd);

1
channels/h323/ast_h323.h
View File

@@ -104,6 +104,7 @@ public:
int cid_ton;
PString rdnis;
int redirect_reason;
int transfer_capability;
WORD sessionId;
BOOL bridging;

2
channels/h323/chan_h323.h
View File

@@ -48,6 +48,7 @@ typedef struct call_options {
int redirect_reason;
int presentation;
int type_of_number;
int transfer_capability;
int fastStart;
int h245Tunneling;
int silenceSuppression;
@@ -113,6 +114,7 @@ typedef struct call_details {
int redirect_reason;
int presentation;
int type_of_number;
int transfer_capability;
char *sourceIp;
} call_details_t;