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

Merged revisions 182722 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r182722 | jpeeler | 2009-03-17 15:47:31 -0500 (Tue, 17 Mar 2009) | 15 lines
  
  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/branches/1.6.0@182723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-03-17 20:51:06 +00:00
parent 24fc141a78
commit 3e6a72ae73
8 changed files with 154 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
channels/h323/ast_h323.h
View File

@@ -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 <h450/h450pdu.h>
#else
#include <h450pdu.h>
#endif
class MyH4504Handler : public H4504Handler
{
@@ -186,6 +184,4 @@ private:
};
#endif
#include "compat_h323.h"
#endif /* !defined AST_H323_H */