--- autoconf/ast_check_pwlib.m4.orig 2009-01-14 13:54:09.000000000 +0100 +++ autoconf/ast_check_pwlib.m4 2009-01-31 12:03:08.000000000 +0100 @@ -103,12 +103,12 @@ else AC_CHECK_HEADER(/usr/local/include/ptlib.h, HAS_PWLIB=1, ) if test "${HAS_PWLIB:-unset}" != "unset" ; then - AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin) - if test "${PTLIB_CONFIG:-unset}" = "unset" ; then - AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/share/pwlib/make) - fi + AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin$PATH_SEPARATOR/usr/local/share/pwlib/make) PWLIB_INCDIR="/usr/local/include" - PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir` + PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null` + if test "${PWLIB_LIBDIR:-unset}" = "unset"; then + PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null` + fi if test "${PWLIB_LIBDIR:-unset}" = "unset"; then if test "x$LIB64" != "x"; then PWLIB_LIBDIR="/usr/local/lib64" @@ -121,9 +121,12 @@ else AC_CHECK_HEADER(/usr/include/ptlib.h, HAS_PWLIB=1, ) if test "${HAS_PWLIB:-unset}" != "unset" ; then - AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make) + AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin$PATH_SEPARATOR/usr/share/pwlib/make) PWLIB_INCDIR="/usr/include" - PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir` + PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null` + if test "${PWLIB_LIBDIR:-unset}" = "unset"; then + PWLIB_LIBDIR=`${PTLIB_CONFIG} --ptlibdir 2>/dev/null` + fi if test "${PWLIB_LIBDIR:-unset}" = "unset"; then if test "x$LIB64" != "x"; then PWLIB_LIBDIR="/usr/lib64" @@ -188,8 +191,14 @@ ]) AC_DEFUN([AST_CHECK_PWLIB_VERSION], [ + if test "x$7" != "x"; then + VNAME="$7" + else + VNAME="$2_VERSION" + fi + if test "${HAS_$2:-unset}" != "unset"; then - $2_VERSION=`grep "$2_VERSION" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` + $2_VERSION=`grep "$VNAME" ${$2_INCDIR}/$3 | sed -e 's/[[[:space:]]]\{1,\}/ /g' | cut -f3 -d ' ' | sed -e 's/"//g'` $2_MAJOR_VERSION=`echo ${$2_VERSION} | cut -f1 -d.` $2_MINOR_VERSION=`echo ${$2_VERSION} | cut -f2 -d.` $2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.` --- configure.ac.orig 2009-01-31 11:57:11.000000000 +0100 +++ configure.ac 2009-02-06 10:58:37.000000000 +0100 @@ -1273,7 +1273,7 @@ PWLIBDIR="${PWLIB_DIR}" fi AST_CHECK_PWLIB() - AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2]) + AST_CHECK_PWLIB_VERSION([PWLib], [PWLIB], [ptbuildopts.h], [1], [9], [2], [P[[WT]]LIB_VERSION]) if test "${HAS_PWLIB:-unset}" != "unset"; then AST_CHECK_PWLIB_PLATFORM() @@ -1283,7 +1283,7 @@ AST_CHECK_PWLIB_BUILD([PWLib], [PWLIB], [Define if your system has the PWLib libraries.], [#include "ptlib.h"], - [BOOL q = PTime::IsDaylightSavings();]) + [int q = (int) PTime::IsDaylightSavings();]) fi fi --- channels/h323/ast_h323.h.orig 2009-01-14 13:47:25.000000000 +0100 +++ channels/h323/ast_h323.h 2009-02-06 14:14:34.000000000 +0100 @@ -29,6 +29,13 @@ #ifndef AST_H323_H #define AST_H323_H +#include +#if ! defined(P_USE_STANDARD_CXX_BOOL) && !defined(P_USE_INTEGER_BOOL) +typedef BOOL PBoolean; +#define PTrue TRUE +#define PFalse FALSE +#endif + #define VERSION(a,b,c) ((a)*10000+(b)*100+(c)) class MyH323EndPoint : public H323EndPoint @@ -38,16 +45,16 @@ public: MyH323EndPoint(); int MyMakeCall(const PString &, PString &, void *_callReference, void *_opts); - BOOL ClearCall(const PString &, H323Connection::CallEndReason reason); - BOOL ClearCall(const PString &); + PBoolean ClearCall(const PString &, H323Connection::CallEndReason reason); + PBoolean ClearCall(const PString &); void OnClosedLogicalChannel(H323Connection &, const H323Channel &); void OnConnectionEstablished(H323Connection &, const PString &); void OnConnectionCleared(H323Connection &, const PString &); virtual H323Connection * CreateConnection(unsigned, void *, H323Transport *, H323SignalPDU *); void SendUserTone(const PString &, char); - BOOL OnConnectionForwarded(H323Connection &, const PString &, const H323SignalPDU &); - BOOL ForwardConnection(H323Connection &, const PString &, const H323SignalPDU &); + PBoolean OnConnectionForwarded(H323Connection &, const PString &, const H323SignalPDU &); + PBoolean ForwardConnection(H323Connection &, const PString &, const H323SignalPDU &); void SetEndpointTypeInfo( H225_EndpointType & info ) const; void SetGateway(void); PStringArray SupportedPrefixes; @@ -69,31 +76,31 @@ const H323SignalPDU &, H323SignalPDU &); void OnReceivedReleaseComplete(const H323SignalPDU &); - BOOL OnAlerting(const H323SignalPDU &, const PString &); - BOOL OnSendReleaseComplete(H323SignalPDU &); - BOOL OnReceivedSignalSetup(const H323SignalPDU &); - BOOL OnReceivedFacility(const H323SignalPDU &); - BOOL OnSendSignalSetup(H323SignalPDU &); - BOOL OnStartLogicalChannel(H323Channel &); - BOOL OnClosingLogicalChannel(H323Channel &); + PBoolean OnAlerting(const H323SignalPDU &, const PString &); + PBoolean OnSendReleaseComplete(H323SignalPDU &); + PBoolean OnReceivedSignalSetup(const H323SignalPDU &); + PBoolean OnReceivedFacility(const H323SignalPDU &); + PBoolean OnSendSignalSetup(H323SignalPDU &); + PBoolean OnStartLogicalChannel(H323Channel &); + PBoolean OnClosingLogicalChannel(H323Channel &); virtual void SendUserInputTone(char tone, unsigned duration = 0, unsigned logicalChannel = 0, unsigned rtpTimestamp = 0); virtual void OnUserInputTone(char, unsigned, unsigned, unsigned); virtual void OnUserInputString(const PString &value); - BOOL OnReceivedProgress(const H323SignalPDU &); - BOOL MySendProgress(); + PBoolean OnReceivedProgress(const H323SignalPDU &); + PBoolean MySendProgress(); void OnSendCapabilitySet(H245_TerminalCapabilitySet &); void OnSetLocalCapabilities(); void SetCapabilities(int, int, void *, int); - BOOL OnReceivedCapabilitySet(const H323Capabilities &, const H245_MultiplexCapability *, + PBoolean OnReceivedCapabilitySet(const H323Capabilities &, const H245_MultiplexCapability *, H245_TerminalCapabilitySetReject &); void SetCause(int _cause) { cause = _cause; }; - virtual BOOL StartControlChannel(const H225_TransportAddress & h245Address); - void SetCallOptions(void *opts, BOOL isIncoming); - void SetCallDetails(void *callDetails, const H323SignalPDU &setupPDU, BOOL isIncoming); + virtual PBoolean StartControlChannel(const H225_TransportAddress & h245Address); + void SetCallOptions(void *opts, PBoolean isIncoming); + void SetCallDetails(void *callDetails, const H323SignalPDU &setupPDU, PBoolean isIncoming); virtual H323Connection::CallEndReason SendSignalSetup(const PString&, const H323TransportAddress&); #ifdef TUNNELLING - virtual BOOL HandleSignalPDU(H323SignalPDU &pdu); - BOOL EmbedTunneledInfo(H323SignalPDU &pdu); + virtual PBoolean HandleSignalPDU(H323SignalPDU &pdu); + PBoolean EmbedTunneledInfo(H323SignalPDU &pdu); #endif PString sourceAliases; @@ -107,7 +114,7 @@ int transfer_capability; WORD sessionId; - BOOL bridging; + PBoolean bridging; #ifdef TUNNELLING int remoteTunnelOptions; int tunnelOptions; @@ -135,8 +142,8 @@ ~MyH323_ExternalRTPChannel(); /* Overrides */ - BOOL Start(void); - BOOL OnReceivedAckPDU(const H245_H2250LogicalChannelAckParameters & param); + PBoolean Start(void); + PBoolean OnReceivedAckPDU(const H245_H2250LogicalChannelAckParameters & param); protected: BYTE payloadCode; --- channels/h323/ast_h323.cxx.orig 2009-01-14 13:47:25.000000000 +0100 +++ channels/h323/ast_h323.cxx 2009-02-06 14:10:08.000000000 +0100 @@ -57,13 +57,11 @@ } #endif -#include "chan_h323.h" #include "ast_h323.h" +#include "chan_h323.h" #include "cisco-h225.h" #include "caps_h323.h" -#include - #if PWLIB_MAJOR * 10000 + PWLIB_MINOR * 100 + PWLIB_BUILD >= 1 * 10000 + 12 * 100 + 0 #define SKIP_PWLIB_PIPE_BUG_WORKAROUND 1 #endif @@ -330,7 +328,7 @@ terminalType = e_GatewayOnly; } -BOOL MyH323EndPoint::ClearCall(const PString & token, H323Connection::CallEndReason reason) +PBoolean MyH323EndPoint::ClearCall(const PString & token, H323Connection::CallEndReason reason) { if (h323debug) { #ifdef PTRACING @@ -342,7 +340,7 @@ return H323EndPoint::ClearCall(token, reason); } -BOOL MyH323EndPoint::ClearCall(const PString & token) +PBoolean MyH323EndPoint::ClearCall(const PString & token) { if (h323debug) { cout << "\t-- ClearCall: Request to clear call with token " << token << endl; @@ -370,7 +368,7 @@ H323EndPoint::OnClosedLogicalChannel(connection, channel); } -BOOL MyH323EndPoint::OnConnectionForwarded(H323Connection & connection, +PBoolean MyH323EndPoint::OnConnectionForwarded(H323Connection & connection, const PString & forwardParty, const H323SignalPDU & pdu) { @@ -380,7 +378,7 @@ return FALSE; } -BOOL MyH323EndPoint::ForwardConnection(H323Connection & connection, +PBoolean MyH323EndPoint::ForwardConnection(H323Connection & connection, const PString & forwardParty, const H323SignalPDU & pdu) { @@ -574,9 +572,9 @@ return; } -BOOL MyH323Connection::OnReceivedProgress(const H323SignalPDU &pdu) +PBoolean MyH323Connection::OnReceivedProgress(const H323SignalPDU &pdu) { - BOOL isInband; + PBoolean isInband; unsigned pi; if (!H323Connection::OnReceivedProgress(pdu)) { @@ -602,7 +600,7 @@ return connectionState != ShuttingDownConnection; } -BOOL MyH323Connection::MySendProgress() +PBoolean MyH323Connection::MySendProgress() { /* The code taken from H323Connection::AnsweringCall() but ALWAYS send PROGRESS message, including slow start operations */ @@ -682,7 +680,7 @@ return ((pi || (fastStartState != FastStartDisabled)) ? AnswerCallDeferredWithMedia : AnswerCallDeferred); } -BOOL MyH323Connection::OnAlerting(const H323SignalPDU & alertingPDU, const PString & username) +PBoolean MyH323Connection::OnAlerting(const H323SignalPDU & alertingPDU, const PString & username) { if (h323debug) { cout << "\t=-= In OnAlerting for call " << GetCallReference() @@ -691,7 +689,7 @@ } if (on_progress) { - BOOL isInband; + PBoolean isInband; unsigned alertingPI; if (!alertingPDU.GetQ931().GetProgressIndicator(alertingPI)) { @@ -715,7 +713,7 @@ return connectionState != ShuttingDownConnection; } -void MyH323Connection::SetCallOptions(void *o, BOOL isIncoming) +void MyH323Connection::SetCallOptions(void *o, PBoolean isIncoming) { call_options_t *opts = (call_options_t *)o; @@ -744,7 +742,7 @@ tunnelOptions = opts->tunnelOptions; } -void MyH323Connection::SetCallDetails(void *callDetails, const H323SignalPDU &setupPDU, BOOL isIncoming) +void MyH323Connection::SetCallDetails(void *callDetails, const H323SignalPDU &setupPDU, PBoolean isIncoming) { PString sourceE164; PString destE164; @@ -839,7 +837,7 @@ } #ifdef TUNNELLING -static BOOL FetchInformationElements(Q931 &q931, const PBYTEArray &data) +static PBoolean FetchInformationElements(Q931 &q931, const PBYTEArray &data) { PINDEX offset = 0; @@ -897,9 +895,9 @@ return TRUE; } -static BOOL FetchCiscoTunneledInfo(Q931 &q931, const H323SignalPDU &pdu) +static PBoolean FetchCiscoTunneledInfo(Q931 &q931, const H323SignalPDU &pdu) { - BOOL res = FALSE; + PBoolean res = FALSE; const H225_H323_UU_PDU &uuPDU = pdu.m_h323_uu_pdu; if(uuPDU.HasOptionalField(H225_H323_UU_PDU::e_nonStandardControl)) { @@ -916,7 +914,7 @@ CISCO_H225_H323_UU_NonStdInfo c; PPER_Stream strm(data); if (c.Decode(strm)) { - BOOL haveIEs = FALSE; + PBoolean haveIEs = FALSE; if (h323debug) cout << setprecision(0) << "H323_UU_NonStdInfo = " << c << endl; if (c.HasOptionalField(CISCO_H225_H323_UU_NonStdInfo::e_protoParam)) { @@ -941,19 +939,19 @@ return res; } -static BOOL EmbedCiscoTunneledInfo(H323SignalPDU &pdu) +static PBoolean EmbedCiscoTunneledInfo(H323SignalPDU &pdu) { const static struct { Q931::InformationElementCodes ie; - BOOL dontDelete; + PBoolean dontDelete; } codes[] = { { Q931::RedirectingNumberIE, }, { Q931::FacilityIE, }, // { Q931::CallingPartyNumberIE, TRUE }, }; - BOOL res = FALSE; - BOOL notRedirOnly = FALSE; + PBoolean res = FALSE; + PBoolean notRedirOnly = FALSE; Q931 tmpQ931; Q931 &q931 = pdu.GetQ931(); @@ -1011,9 +1009,9 @@ static const char OID_QSIG[] = "1.3.12.9"; -static BOOL FetchQSIGTunneledInfo(Q931 &q931, const H323SignalPDU &pdu) +static PBoolean FetchQSIGTunneledInfo(Q931 &q931, const H323SignalPDU &pdu) { - BOOL res = FALSE; + PBoolean res = FALSE; const H225_H323_UU_PDU &uuPDU = pdu.m_h323_uu_pdu; if (uuPDU.HasOptionalField(H225_H323_UU_PDU::e_tunnelledSignallingMessage)) { const H225_H323_UU_PDU_tunnelledSignallingMessage &sig = uuPDU.m_tunnelledSignallingMessage; @@ -1061,7 +1059,7 @@ return NULL; } -static BOOL QSIGTunnelRequested(H323SignalPDU &pdu) +static PBoolean QSIGTunnelRequested(H323SignalPDU &pdu) { H225_EndpointType *epType = GetEndpointType(pdu); if (epType) { @@ -1080,7 +1078,7 @@ return FALSE; } -static BOOL EmbedQSIGTunneledInfo(H323SignalPDU &pdu) +static PBoolean EmbedQSIGTunneledInfo(H323SignalPDU &pdu) { const static Q931::InformationElementCodes codes[] = { Q931::RedirectingNumberIE, Q931::FacilityIE }; @@ -1105,7 +1103,7 @@ (*epType).m_supportedTunnelledProtocols.SetSize(0); } H225_ArrayOf_TunnelledProtocol &protos = (*epType).m_supportedTunnelledProtocols; - BOOL addQSIG = TRUE; + PBoolean addQSIG = TRUE; for (int i = 0; i < protos.GetSize(); ++i) { if ((protos[i].GetTag() == H225_TunnelledProtocol_id::e_tunnelledProtocolObjectID) && @@ -1137,7 +1135,7 @@ return TRUE; } -BOOL MyH323Connection::EmbedTunneledInfo(H323SignalPDU &pdu) +PBoolean MyH323Connection::EmbedTunneledInfo(H323SignalPDU &pdu) { if ((tunnelOptions & H323_TUNNEL_QSIG) || (remoteTunnelOptions & H323_TUNNEL_QSIG)) EmbedQSIGTunneledInfo(pdu); @@ -1148,7 +1146,7 @@ } /* Handle tunneled messages */ -BOOL MyH323Connection::HandleSignalPDU(H323SignalPDU &pdu) +PBoolean MyH323Connection::HandleSignalPDU(H323SignalPDU &pdu) { if (pdu.GetQ931().HasIE(Q931::UserUserIE)) { Q931 tunneledInfo; @@ -1183,7 +1181,7 @@ } #endif -BOOL MyH323Connection::OnReceivedSignalSetup(const H323SignalPDU & setupPDU) +PBoolean MyH323Connection::OnReceivedSignalSetup(const H323SignalPDU & setupPDU) { call_details_t cd; @@ -1219,7 +1217,7 @@ return H323Connection::OnReceivedSignalSetup(setupPDU); } -BOOL MyH323Connection::OnSendSignalSetup(H323SignalPDU & setupPDU) +PBoolean MyH323Connection::OnSendSignalSetup(H323SignalPDU & setupPDU) { call_details_t cd; @@ -1269,7 +1267,7 @@ return H323Connection::OnSendSignalSetup(setupPDU); } -static BOOL BuildFastStartList(const H323Channel & channel, +static PBoolean BuildFastStartList(const H323Channel & channel, H225_ArrayOf_PASN_OctetString & array, H323Channel::Directions reverseDirection) { @@ -1458,7 +1456,7 @@ signallingChannel->SetWriteTimeout(100); - BOOL connectFailed = !signallingChannel->Connect(); + PBoolean connectFailed = !signallingChannel->Connect(); // Lock while checking for shutting down. if (!Lock()) @@ -1533,14 +1531,14 @@ setupPDU.GetQ931().GetCalledPartyNumber(remotePartyNumber); fastStartState = FastStartDisabled; - BOOL set_lastPDUWasH245inSETUP = FALSE; + PBoolean set_lastPDUWasH245inSETUP = FALSE; if (h245Tunneling && doH245inSETUP) { h245TunnelTxPDU = &setupPDU; // Try and start the master/slave and capability exchange through the tunnel // Note: this used to be disallowed but is now allowed as of H323v4 - BOOL ok = StartControlNegotiations(); + PBoolean ok = StartControlNegotiations(); h245TunnelTxPDU = NULL; @@ -1574,7 +1572,7 @@ } -BOOL MyH323Connection::OnSendReleaseComplete(H323SignalPDU & releaseCompletePDU) +PBoolean MyH323Connection::OnSendReleaseComplete(H323SignalPDU & releaseCompletePDU) { if (h323debug) { cout << "\t-- Sending RELEASE COMPLETE" << endl; @@ -1589,7 +1587,7 @@ return H323Connection::OnSendReleaseComplete(releaseCompletePDU); } -BOOL MyH323Connection::OnReceivedFacility(const H323SignalPDU & pdu) +PBoolean MyH323Connection::OnReceivedFacility(const H323SignalPDU & pdu) { if (h323debug) { cout << "\t-- Received Facility message... " << endl; @@ -1607,7 +1605,7 @@ return H323Connection::OnReceivedReleaseComplete(pdu); } -BOOL MyH323Connection::OnClosingLogicalChannel(H323Channel & channel) +PBoolean MyH323Connection::OnClosingLogicalChannel(H323Channel & channel) { if (h323debug) { cout << "\t-- Closing logical channel..." << endl; @@ -1679,7 +1677,7 @@ on_setcapabilities(GetCallReference(), (const char *)callToken); } -BOOL MyH323Connection::OnReceivedCapabilitySet(const H323Capabilities & remoteCaps, +PBoolean MyH323Connection::OnReceivedCapabilitySet(const H323Capabilities & remoteCaps, const H245_MultiplexCapability * muxCap, H245_TerminalCapabilitySetReject & reject) { @@ -1825,7 +1823,7 @@ /** This callback function is invoked once upon creation of each * channel for an H323 session */ -BOOL MyH323Connection::OnStartLogicalChannel(H323Channel & channel) +PBoolean MyH323Connection::OnStartLogicalChannel(H323Channel & channel) { /* Increase the count of channels we have open */ channelsOpen++; @@ -1955,7 +1953,7 @@ } } -BOOL MyH323Connection::StartControlChannel(const H225_TransportAddress & h245Address) +PBoolean MyH323Connection::StartControlChannel(const H225_TransportAddress & h245Address) { // Check that it is an IP address, all we support at the moment if (h245Address.GetTag() != H225_TransportAddress::e_ipAddress @@ -2032,7 +2030,7 @@ } } -BOOL MyH323_ExternalRTPChannel::Start(void) +PBoolean MyH323_ExternalRTPChannel::Start(void) { /* Call ancestor first */ if (!H323_ExternalRTPChannel::Start()) { @@ -2059,7 +2057,7 @@ return TRUE; } -BOOL MyH323_ExternalRTPChannel::OnReceivedAckPDU(const H245_H2250LogicalChannelAckParameters & param) +PBoolean MyH323_ExternalRTPChannel::OnReceivedAckPDU(const H245_H2250LogicalChannelAckParameters & param) { if (h323debug) { cout << " MyH323_ExternalRTPChannel::OnReceivedAckPDU" << endl; @@ -2429,7 +2427,7 @@ int h323_soft_hangup(const char *data) { PString token(data); - BOOL result; + PBoolean result; cout << "Soft hangup" << endl; result = endPoint->ClearCall(token); return result; --- channels/h323/caps_h323.cxx.orig 2009-02-06 14:11:52.000000000 +0100 +++ channels/h323/caps_h323.cxx 2009-02-06 14:12:01.000000000 +0100 @@ -64,7 +64,7 @@ /* * Capability: G.723.1 */ -AST_G7231Capability::AST_G7231Capability(int rx_frames, BOOL annexA_) +AST_G7231Capability::AST_G7231Capability(int rx_frames, PBoolean annexA_) : H323AudioCapability(rx_frames, 4) { annexA = annexA_; @@ -101,7 +101,7 @@ return H245_AudioCapability::e_g7231; } -BOOL AST_G7231Capability::OnSendingPDU(H245_AudioCapability & cap, +PBoolean AST_G7231Capability::OnSendingPDU(H245_AudioCapability & cap, unsigned packetSize) const { cap.SetTag(H245_AudioCapability::e_g7231); @@ -111,7 +111,7 @@ return TRUE; } -BOOL AST_G7231Capability::OnReceivedPDU(const H245_AudioCapability & cap, +PBoolean AST_G7231Capability::OnReceivedPDU(const H245_AudioCapability & cap, unsigned & packetSize) { if (cap.GetTag() != H245_AudioCapability::e_g7231) { @@ -204,7 +204,7 @@ return H245_AudioCapability::e_gsmFullRate; } -BOOL AST_GSM0610Capability::OnSendingPDU(H245_AudioCapability & cap, +PBoolean AST_GSM0610Capability::OnSendingPDU(H245_AudioCapability & cap, unsigned packetSize) const { cap.SetTag(H245_AudioCapability::e_gsmFullRate); @@ -215,7 +215,7 @@ return TRUE; } -BOOL AST_GSM0610Capability::OnReceivedPDU(const H245_AudioCapability & cap, +PBoolean AST_GSM0610Capability::OnReceivedPDU(const H245_AudioCapability & cap, unsigned & packetSize) { if (cap.GetTag() != H245_AudioCapability::e_gsmFullRate) --- channels/h323/caps_h323.h.orig 2009-02-06 14:11:49.000000000 +0100 +++ channels/h323/caps_h323.h 2009-02-06 14:12:03.000000000 +0100 @@ -26,17 +26,17 @@ PCLASSINFO(AST_G7231Capability, H323AudioCapability); public: - AST_G7231Capability(int rx_frames = 7, BOOL annexA = TRUE); + AST_G7231Capability(int rx_frames = 7, PBoolean annexA = TRUE); Comparison Compare(const PObject & obj) const; virtual PObject * Clone() const; virtual H323Codec * CreateCodec(H323Codec::Direction direction) const; virtual unsigned GetSubType() const; virtual PString GetFormatName() const; - virtual BOOL OnSendingPDU(H245_AudioCapability & pdu, unsigned packetSize) const; - virtual BOOL OnReceivedPDU(const H245_AudioCapability & pdu, unsigned & packetSize); + virtual PBoolean OnSendingPDU(H245_AudioCapability & pdu, unsigned packetSize) const; + virtual PBoolean OnReceivedPDU(const H245_AudioCapability & pdu, unsigned & packetSize); protected: - BOOL annexA; + PBoolean annexA; }; /**This class describes the (fake) G729 codec capability. @@ -114,8 +114,8 @@ /* Get the name of the media data format this class represents. */ virtual PString GetFormatName() const; - BOOL OnSendingPDU(H245_AudioCapability & pdu, unsigned packetSize) const; - BOOL OnReceivedPDU(const H245_AudioCapability & pdu, unsigned & packetSize); + PBoolean OnSendingPDU(H245_AudioCapability & pdu, unsigned packetSize) const; + PBoolean OnReceivedPDU(const H245_AudioCapability & pdu, unsigned & packetSize); protected: int comfortNoise; --- channels/h323/chan_h323.h.orig 2009-01-14 13:47:25.000000000 +0100 +++ channels/h323/chan_h323.h 2009-02-06 10:50:58.000000000 +0100 @@ -194,10 +194,6 @@ #define H323_DTMF_RFC2833 (1 << 0) #define H323_DTMF_INBAND (1 << 1) -#ifndef BOOL -#define BOOL int -#endif - #ifdef __cplusplus extern "C" { #endif --- channels/h323/cisco-h225.cxx.orig 2009-01-14 13:47:25.000000000 +0100 +++ channels/h323/cisco-h225.cxx 2009-02-06 14:12:17.000000000 +0100 @@ -61,7 +61,7 @@ } -BOOL CISCO_H225_RedirectIEinfo::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_RedirectIEinfo::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -137,7 +137,7 @@ } -BOOL CISCO_H225_ProgIndIEinfo::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_ProgIndIEinfo::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -217,7 +217,7 @@ } -BOOL CISCO_H225_QsigNonStdInfo::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_QsigNonStdInfo::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -300,7 +300,7 @@ } -BOOL CISCO_H225_CallMgrParam::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_CallMgrParam::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -379,7 +379,7 @@ } -BOOL CISCO_H225_CallPreserveParam::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_CallPreserveParam::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -458,7 +458,7 @@ } -BOOL CISCO_H225_CallSignallingParam::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_CallSignallingParam::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -535,7 +535,7 @@ } -BOOL CISCO_H225_CommonParam::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_CommonParam::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -611,7 +611,7 @@ } -BOOL CISCO_H225_ProgIndParam::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_ProgIndParam::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -687,7 +687,7 @@ } -BOOL CISCO_H225_ProtoParam::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_ProtoParam::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; @@ -789,7 +789,7 @@ } -BOOL CISCO_H225_H323_UU_NonStdInfo::Decode(PASN_Stream & strm) +PBoolean CISCO_H225_H323_UU_NonStdInfo::Decode(PASN_Stream & strm) { if (!PreambleDecode(strm)) return FALSE; --- channels/h323/cisco-h225.h.orig 2009-01-14 13:47:25.000000000 +0100 +++ channels/h323/cisco-h225.h 2009-02-06 14:12:41.000000000 +0100 @@ -30,7 +30,7 @@ PASN_OctetString m_redirectIE; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -55,7 +55,7 @@ PASN_OctetString m_progIndIE; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -81,7 +81,7 @@ PASN_OctetString m_rawMesg; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -107,7 +107,7 @@ PASN_OctetString m_enterpriseID; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -132,7 +132,7 @@ PASN_Boolean m_callPreserveIE; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -161,7 +161,7 @@ PASN_OctetString m_connectedNumber; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -186,7 +186,7 @@ CISCO_H225_RedirectIEinfo m_redirectIEinfo; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -211,7 +211,7 @@ CISCO_H225_ProgIndIEinfo m_progIndIEinfo; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -236,7 +236,7 @@ CISCO_H225_QsigNonStdInfo m_qsigNonStdInfo; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; @@ -281,7 +281,7 @@ CISCO_H225_CallPreserveParam m_callPreserveParam; PINDEX GetDataLength() const; - BOOL Decode(PASN_Stream & strm); + PBoolean Decode(PASN_Stream & strm); void Encode(PASN_Stream & strm) const; #ifndef PASN_NOPRINTON void PrintOn(ostream & strm) const; --- channels/h323/compat_h323.cxx.orig 2009-01-14 13:47:25.000000000 +0100 +++ channels/h323/compat_h323.cxx 2009-02-06 14:12:56.000000000 +0100 @@ -38,12 +38,12 @@ MyH323TransportTCP::MyH323TransportTCP( H323EndPoint & endpoint, PIPSocket::Address binding, - BOOL listen) + PBoolean listen) : H323TransportTCP(endpoint, binding, listen) { } -BOOL MyH323TransportTCP::Connect() +PBoolean MyH323TransportTCP::Connect() { if (IsListening()) return TRUE; @@ -91,7 +91,7 @@ } #endif -BOOL MyH323TransportUDP::DiscoverGatekeeper(H323Gatekeeper &gk, H323RasPDU &pdu, const H323TransportAddress &address) +PBoolean MyH323TransportUDP::DiscoverGatekeeper(H323Gatekeeper &gk, H323RasPDU &pdu, const H323TransportAddress &address) { PThread *thd = PThread::Current(); --- channels/h323/compat_h323.h.orig 2009-01-14 13:47:25.000000000 +0100 +++ channels/h323/compat_h323.h 2009-02-06 14:12:59.000000000 +0100 @@ -14,11 +14,11 @@ MyH323TransportTCP( H323EndPoint & endpoint, ///< H323 End Point object PIPSocket::Address binding = PIPSocket::GetDefaultIpAny(), ///< Local interface to use - BOOL listen = FALSE ///< Flag for need to wait for remote to connect + PBoolean listen = FALSE ///< Flag for need to wait for remote to connect ); /**Connect to the remote party. */ - virtual BOOL Connect(); + virtual PBoolean Connect(); }; #else #define MyH323TransportTCP H323TransportTCP @@ -35,7 +35,7 @@ WORD remotePort = 0): H323TransportUDP(endpoint, binding, localPort, remotePort) { } - virtual BOOL DiscoverGatekeeper(H323Gatekeeper &, + virtual PBoolean DiscoverGatekeeper(H323Gatekeeper &, H323RasPDU &, const H323TransportAddress &); protected: @@ -43,8 +43,8 @@ H323Gatekeeper *discoverGatekeeper; H323RasPDU *discoverPDU; const H323TransportAddress *discoverAddress; - BOOL discoverResult; - BOOL discoverReady; + PBoolean discoverResult; + PBoolean discoverReady; PMutex discoverMutex; };