--- openh323gk/Toolkit.h 2007-12-18 17:10:53.000000000 -0800 +++ openh323gk/Toolkit.h?revision=1.54 2007-12-26 00:35:33.000000000 -0800 @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////// // -// Toolkit class for the GnuGk +// Toolkit base class for the GnuGk // // This work is published under the GNU Public License (GPL) // see file COPYING for details. @@ -10,7 +10,7 @@ ////////////////////////////////////////////////////////////////// #ifndef TOOLKIT_H -#define TOOLKIT_H "@(#) $Id: Toolkit.h,v 1.55 2007/12/19 01:10:53 willamowius Exp $" +#define TOOLKIT_H "@(#) $Id: Toolkit.h,v 1.54 2007/11/19 20:15:34 willamowius Exp $" #include <vector> #include <ptlib/sockets.h> @@ -96,7 +96,6 @@ #endif class GkTimerManager; class CLIRewrite; - class Toolkit : public Singleton<Toolkit> { public: @@ -104,6 +103,12 @@ explicit Toolkit(); virtual ~Toolkit(); + /// returns #basic# for + virtual const PString GetName() const { return "basic"; } + + // by cwhuang + // The idea was got from OpenGatekeeper, + // but entirely implemented from scratch. :) class RouteTable { typedef PIPSocket::Address Address; typedef PIPSocket::InterfaceTable InterfaceTable; @@ -124,6 +129,9 @@ protected: class RouteEntry : public PIPSocket::RouteEntry { public: +#ifndef _WIN32 + PCLASSINFO( RouteEntry, PIPSocket::RouteEntry ) +#endif RouteEntry(const PString &); RouteEntry(const PIPSocket::RouteEntry &, const InterfaceTable &); bool Compare(const Address *) const; @@ -404,6 +412,8 @@ static void GetNetworkFromString(const PString &, PIPSocket::Address &, PIPSocket::Address &); + static PString CypherDecode(const PString &, const PString &, int); + /** you may add more extension codes in descendant classes. This codes will not be transferred * or something it will be the return code of some methods for handling switches easy. */ enum {