From 9dc40485f212e6adc3ff87f9bdbe1c68cddfde64 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 17 Mar 2009 20:47:31 +0000 Subject: Allow H.323 Plus library to be used in addition to the OpenH323 library Chan_h323 can now be compiled against both the previously supported versions of OpenH323 as well as the current H.323 Plus (version 1.20.2). The configure script has been modified to look in the default install location of h323 to hopefully help avoid using the environment variables OPENH323DIR and PWLIBDIR. Also, the CLI command "h323 show version" has been added which indicates which version of h323 is in use. (closes issue #11261) Reported by: vhatz Patches: asterisk-1.6.0.6-h323plus.patch uploaded by jthurman (license 614) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@182722 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/h323/ast_h323.h | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'channels/h323/ast_h323.h') diff --git a/channels/h323/ast_h323.h b/channels/h323/ast_h323.h index afc0f3d1b..b9e793c0f 100644 --- a/channels/h323/ast_h323.h +++ b/channels/h323/ast_h323.h @@ -151,26 +151,24 @@ protected: PIPSocket::Address localIpAddr; PIPSocket::Address remoteIpAddr; + /* Additional functions in order to have chan_h323 compile with H323Plus */ +#if VERSION(OPENH323_MAJOR, OPENH323_MINOR, OPENH323_BUILD) > VERSION(1,19,4) + BOOL OnReceivedAltPDU(const H245_ArrayOf_GenericInformation & alternate ); + BOOL OnSendingAltPDU(H245_ArrayOf_GenericInformation & alternate) const; + void OnSendOpenAckAlt(H245_ArrayOf_GenericInformation & alternate) const; + BOOL OnReceivedAckAltPDU(const H245_ArrayOf_GenericInformation & alternate); +#endif WORD localPort; WORD remotePort; }; -/** - * The MyProcess is a necessary descendant PProcess class so that the H323EndPoint - * objected to be created from within that class. (Solves the who owns main() problem). - */ -class MyProcess : public PProcess -{ - PCLASSINFO(MyProcess, PProcess); - -public: - MyProcess(); - ~MyProcess(); - void Main(); -}; - #ifdef H323_H450 + +#if VERSION(OPENH323_MAJOR, OPENH323_MINOR, OPENH323_BUILD) > VERSION(1,19,4) +#include +#else #include +#endif class MyH4504Handler : public H4504Handler { @@ -186,6 +184,4 @@ private: }; #endif -#include "compat_h323.h" - #endif /* !defined AST_H323_H */ -- cgit v1.2.3