From 6b6ff098ebf85e5f616fb4cc82e1aba2d7e5ff8c Mon Sep 17 00:00:00 2001 From: Jeremy McNamara Date: Sun, 11 Jan 2004 02:22:32 +0000 Subject: clean up code and remove install directive in h323/ Makefile git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1924 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/h323/ast_h323.h | 67 ++++-------------------------------------------- 1 file changed, 5 insertions(+), 62 deletions(-) (limited to 'channels/h323/ast_h323.h') diff --git a/channels/h323/ast_h323.h b/channels/h323/ast_h323.h index 00494c486..71fd38924 100755 --- a/channels/h323/ast_h323.h +++ b/channels/h323/ast_h323.h @@ -213,12 +213,13 @@ class MyH323EndPoint : public H323EndPoint { PStringArray SupportedPrefixes; - void SetEndpointTypeInfo( H225_EndpointType & info ) const; - void SetGateway(void); + void SetEndpointTypeInfo( H225_EndpointType & info ) const; + void SetGateway(void); + + H323TransportUDP *rasChannel; }; - class MyH323Connection : public H323Connection { PCLASSINFO(MyH323Connection, H323Connection); @@ -248,70 +249,13 @@ class MyH323Connection : public H323Connection { PString destE164; PIPSocket::Address externalIpAddress; // IP address of media server - PIPSocket::Address remoteIpAddress; // IP Address of remote endpoint + PIPSocket::Address remoteIpAddress; // IP Address of remote endpoint WORD externalPort; // local media server Data port (control is dataPort+1) WORD remotePort; // remote endpoint Data port (control is dataPort+1) WORD sessionId; BOOL bridging; // Used to help determine which IP to use }; - -#if 0 -class MyGatekeeperServer : public H323GatekeeperServer -{ - PCLASSINFO(MyGatekeeperServer, H323GatekeeperServer); - public: - MyGatekeeperServer(MyH323EndPoint & ep); - - // Overrides - virtual H323GatekeeperCall * CreateCall( - const OpalGloballyUniqueID & callIdentifier, - H323GatekeeperCall::Direction direction - ); - virtual BOOL TranslateAliasAddressToSignalAddress( - const H225_AliasAddress & alias, - H323TransportAddress & address - ); - - // new functions - BOOL Initialise(); - - private: - class RouteMap : public PObject { - PCLASSINFO(RouteMap, PObject); - public: - RouteMap( - const PString & alias, - const PString & host - ); - RouteMap( - const RouteMap & map - ) : alias(map.alias), regex(map.alias), host(map.host) { } - - void PrintOn( - ostream & strm - ) const; - - BOOL IsValid() const; - - BOOL IsMatch( - const PString & alias - ) const; - - const H323TransportAddress & GetHost() const { return host; } - - private: - PString alias; - PRegularExpression regex; - H323TransportAddress host; - }; - PList routes; - - PMutex reconfigurationMutex; -}; - -#endif - /** * The MyProcess is a necessary descendant PProcess class so that the H323EndPoint * objected to be created from within that class. (Who owns main() problem). @@ -322,7 +266,6 @@ class MyProcess : public PProcess { public: MyProcess(); - ~MyProcess(); void Main(); -- cgit v1.2.3