diff options
author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-07 14:48:32 +0000 |
---|---|---|
committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-07 14:48:32 +0000 |
commit | 8c428efa57e6a7699c26fcfe72ab5a53274ff786 (patch) | |
tree | 2c62b569f26cef6dfe565c7e7e946c14782069c7 /channels/h323 | |
parent | d2747c97ad264252b06ca01aa67bf314a0f3b822 (diff) |
Merged revisions 44684 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44684 | pcadach | 2006-10-07 20:39:34 +0600 (Сбт, 07 Окт 2006) | 1 line
Propagate caller's transfer capability too
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44686 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323')
-rw-r--r-- | channels/h323/ast_h323.cxx | 18 | ||||
-rw-r--r-- | channels/h323/ast_h323.h | 1 | ||||
-rw-r--r-- | channels/h323/chan_h323.h | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx index f574482c6..8d316c7c4 100644 --- a/channels/h323/ast_h323.cxx +++ b/channels/h323/ast_h323.cxx @@ -554,6 +554,7 @@ MyH323Connection::MyH323Connection(MyH323EndPoint & ep, unsigned callReference, dtmfMode = 0; dtmfCodec[0] = dtmfCodec[1] = (RTP_DataFrame::PayloadTypes)0; redirect_reason = -1; + transfer_capability = -1; #ifdef TUNNELLING tunnelOptions = remoteTunnelOptions = 0; #endif @@ -735,6 +736,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; } @@ -768,6 +772,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)) { @@ -795,13 +801,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); } @@ -1228,6 +1241,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); diff --git a/channels/h323/ast_h323.h b/channels/h323/ast_h323.h index 339329560..39af427ae 100644 --- a/channels/h323/ast_h323.h +++ b/channels/h323/ast_h323.h @@ -109,6 +109,7 @@ public: int cid_ton; PString rdnis; int redirect_reason; + int transfer_capability; WORD sessionId; BOOL bridging; diff --git a/channels/h323/chan_h323.h b/channels/h323/chan_h323.h index 378df1edc..62b670fda 100644 --- a/channels/h323/chan_h323.h +++ b/channels/h323/chan_h323.h @@ -52,6 +52,7 @@ typedef struct call_options { int redirect_reason; int presentation; int type_of_number; + int transfer_capability; int fastStart; int h245Tunneling; int silenceSuppression; @@ -118,6 +119,7 @@ typedef struct call_details { int redirect_reason; int presentation; int type_of_number; + int transfer_capability; char *sourceIp; } call_details_t; |