Author: derek Date: Thu Jan 4 23:24:35 2007 New Revision: 222 Modified: sofaswitch/trunk/voip/main.cxx sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/udpep.cxx sofaswitch/trunk/voip/udpep.h Log: Bring it up to date, so that it compiles with the latest openh323 code. Modified: sofaswitch/trunk/voip/main.cxx ============================================================================== --- sofaswitch/trunk/voip/main.cxx (original) +++ sofaswitch/trunk/voip/main.cxx Thu Jan 4 23:24:35 2007 @@ -45,7 +45,7 @@ #endif #include <lids/lidep.h> -#include <lids/ixjlid.h> + #include <ptclib/pstun.h> #include "main.h" Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Thu Jan 4 23:24:35 2007 @@ -54,7 +54,7 @@ #endif #include <lids/lidep.h> -#include <lids/ixjlid.h> + #include <ptclib/pstun.h> #ifdef OPAL_STATIC_LINK @@ -220,18 +220,11 @@ } cout << "TCP ports: " << GetTCPPortBase() << '-' << GetTCPPortMax() << "\n" - "UDP ports: " << GetUDPPortBase() << '-' << GetUDPPortMax() << "\n" - "RTP ports: " << GetRtpIpPortBase() << '-' << GetRtpIpPortMax() << "\n" - "RTP IP TOS: 0x" << hex << (unsigned)GetRtpIpTypeofService() << dec << "\n" - "STUN server: " << flush; - - if (args.HasOption("stun")) - SetSTUNServer(args.GetOptionString("stun")); - - if (stun != NULL) - cout << stun->GetServer() << " replies " << stun->GetNatTypeName(); - else - cout << "None"; + "UDP ports: " << GetUDPPortBase() << '-' << GetUDPPortMax() << "\n" + "RTP ports: " << GetRtpIpPortBase() << '-' << GetRtpIpPortMax() << "\n" + "RTP IP TOS: 0x" << hex << (unsigned)GetRtpIpTypeofService() << dec << "\n" << flush; + + cout << '\n'; Modified: sofaswitch/trunk/voip/udpep.cxx ============================================================================== --- sofaswitch/trunk/voip/udpep.cxx (original) +++ sofaswitch/trunk/voip/udpep.cxx Thu Jan 4 23:24:35 2007 @@ -64,7 +64,7 @@ { IncOpalUdpSsEndPoint(); PTRACE(3, "UdpSs\tCreated UDP sound system endpoint."); - connectionTokenIndex = 0; + connectionTokenIndex.SetValue(0); } @@ -79,7 +79,8 @@ BOOL OpalUdpSsEndPoint::MakeConnection(OpalCall & call, const PString & remoteParty, - void * userData) + void * userData, + unsigned int /*options*/) { // First strip of the prefix if present PINDEX prefixLength = 0; Modified: sofaswitch/trunk/voip/udpep.h ============================================================================== --- sofaswitch/trunk/voip/udpep.h (original) +++ sofaswitch/trunk/voip/udpep.h Thu Jan 4 23:24:35 2007 @@ -101,9 +101,10 @@ The default behaviour is pure. */ virtual BOOL MakeConnection( - OpalCall & call, /// Owner of connection - const PString & party, /// Remote party to call - void * userData = NULL /// Arbitrary data to pass to connection + OpalCall & call, ///< Owner of connection + const PString & party, ///< Remote party to call + void * userData = NULL, ///< Arbitrary data to pass to connection + unsigned int options = 0 ///< options to pass to conneciton ); /**Get the data formats this endpoint is capable of operating.