kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly deal with Caller*ID, document the new RTP Payload setting, remove compiler option that may confuse g++ and force chan_h323.so to be relinked on every compile

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeremy McNamara
2004-12-16 02:03:19 +00:00
parent 4082e265d6
commit 0155dee2fd
6 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
channels/h323/ast_h323.cpp
View File

@@ -237,16 +237,15 @@ int MyH323EndPoint::MakeCall(const PString & dest, PString & token, unsigned int
return 1;
}
*callReference = connection->GetCallReference();
if (opts->cid_num) {
connection->ast_cid_num = PString(opts->cid_num);
}
if (opts->cid_name) {
localAliasNames.RemoveAll();
connection->SetLocalPartyName(PString(opts->cid_name));
if (opts->cid_num) {
localAliasNames.AppendString(PString(opts->cid_num));
}
} else if (opts->cid_num) {
localAliasNames.RemoveAll();
connection->SetLocalPartyName(PString(opts->cid_num));
}
connection->ast_cid_name = PString(opts->cid_name);
connection->SetLocalPartyName(connection->ast_cid_name);
}
connection->dtmfCodec = (RTP_DataFrame::PayloadTypes)opts->dtmfcodec;
if (h323debug) {
@@ -700,6 +699,15 @@ BOOL MyH323Connection::OnSendSignalSetup(H323SignalPDU & setupPDU)
if (h323debug) {
cout << " -- Sending SETUP message" << endl;
}
if (!ast_cid_num.IsEmpty()) {
setupPDU.GetQ931().SetCallingPartyNumber(ast_cid_num);
}
if (!ast_cid_name.IsEmpty()) {
setupPDU.GetQ931().SetDisplayName(ast_cid_name);
}
sourceAliases = setupPDU.GetSourceAliases();
destAliases = setupPDU.GetDestinationAlias();