42d41
< #include <lid.h>
44,47c43,50
< #include "h4501.h"
< #include "h4504.h"
< #include "h45011.h"
< #include "h450pdu.h"
---
> #include "h450/h4501.h"
> #include "h450/h4504.h"
> #include "h450/h45011.h"
> #include "h450/h450pdu.h"
> #endif
> 
> #ifdef H323_H460
> #include <h460/h4601.h>
63a67
> #include "compat_h323.h"
65c69,73
< /* PWlib Required Components  */
---
> ///////////////////////////////////////////////
> /* We have to have a PProcess running for the life of the instance to give
>  * h323plus a static instance of PProcess to get system information.
>  * This class is defined with PDECLARE_PROCESS().  See pprocess.h from pwlib.
>  */
67c75
< #define MINOR_VERSION 0
---
> #define MINOR_VERSION 19
69c77
< #define BUILD_NUMBER  0
---
> #define BUILD_NUMBER  6
70a79,88
> const char * h323manufact = "The NuFone Networks";
> const char * h323product  = "H.323 Channel Driver for Asterisk";
> 
> PDECLARE_PROCESS(MyProcess,PProcess,h323manufact,h323product,MAJOR_VERSION,MINOR_VERSION,BUILD_TYPE,BUILD_NUMBER)
> static MyProcess localProcess;  // active for the life of the DLL
> /* void MyProcess::Main()
> {
> }
> */
> ////////////////////////////////////////////////
81,85d98
< /** PWLib entry point */
< static MyProcess *localProcess = NULL;
< 
< static int _timerChangePipe[2];
< 
170,197d182
< /* Special class designed to call cleanup code on module destruction */
< class MyH323_Shutdown {
< 	public:
< 	MyH323_Shutdown() { };
< 	~MyH323_Shutdown()
< 	{
< 		h323_end_process();
< 	};
< };
< 
< MyProcess::MyProcess(): PProcess("The NuFone Networks",
< 			"H.323 Channel Driver for Asterisk",
< 			MAJOR_VERSION, MINOR_VERSION, BUILD_TYPE, BUILD_NUMBER)
< {
< 	/* Call shutdown when module being unload or asterisk has been stopped */
< 	static MyH323_Shutdown x;
< 
< 	/* Fix missed one in PWLib */
< 	PX_firstTimeStart = FALSE;
< 	Resume();
< }
< 
< MyProcess::~MyProcess()
< {
< 	_timerChangePipe[0] = timerChangePipe[0];
< 	_timerChangePipe[1] = timerChangePipe[1];
< }
< 
2191a2177,2201
> /* Addition of functions just to make the channel driver compile with H323Plus */
> 
> /* Alternate RTP port information for Same NAT */
> BOOL MyH323_ExternalRTPChannel::OnReceivedAltPDU(const H245_ArrayOf_GenericInformation & alternate )
> {
>  return TRUE;
> }
> 
> /* Alternate RTP port information for Same NAT */
> BOOL MyH323_ExternalRTPChannel::OnSendingAltPDU(H245_ArrayOf_GenericInformation & alternate) const
> {
>  return TRUE;
> }
> 
> /* Alternate RTP port information for Same NAT */
> void MyH323_ExternalRTPChannel::OnSendOpenAckAlt(H245_ArrayOf_GenericInformation & alternate) const
> {
> }
> 
> /* Alternate RTP port information for Same NAT */
> BOOL MyH323_ExternalRTPChannel::OnReceivedAckAltPDU(const H245_ArrayOf_GenericInformation & alternate)
> {
>  return TRUE;
> }
> 
2240,2241c2250,2251
< 	localProcess = new MyProcess();
< 	localProcess->Main();
---
>         endPoint = new MyH323EndPoint();
> 
2364c2374
< 	endPoint->RemoveAliasName(localProcess->GetUserName());
---
> 	endPoint->RemoveAliasName(PProcess::Current().GetName());
2616,2617d2625
< 		endPoint->ClearAllCalls();
< 		endPoint->RemoveListener(NULL);
2621,2632c2629,2632
< 	if (localProcess) {
< 		delete localProcess;
< 		localProcess = NULL;
< 		close(_timerChangePipe[0]);
< 		close(_timerChangePipe[1]);
< 	}
< 	if (logstream) {
< 		PTrace::SetLevel(0);
< 		PTrace::SetStream(&cout);
< 		delete logstream;
< 		logstream = NULL;
< 	}
---
>         if (logstream) {
>                 delete logstream;
>                 logstream = NULL;
>         }