Author: derek Date: Wed Jan 31 03:57:39 2007 New Revision: 237 Modified: sofaswitch/trunk/voip/udpconnection.cxx sofaswitch/trunk/voip/udpconnection.h sofaswitch/trunk/voip/udpep.cxx sofaswitch/trunk/voip/udpep.h Log: Add in fixes to get it to compile with the current cvs. Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Wed Jan 31 03:57:39 2007 @@ -83,6 +83,13 @@ DecOpalUdpSsConnection(); } +BOOL OpalUdpSsConnection::OnIncomingConnection(unsigned int options, + OpalConnection::StringOptions *stringOptions) +{ + PTRACE(3, "UdpSsConnection\t " << *this << " onIncoming connection"); + return endpoint.OnIncomingConnection(*this, options, stringOptions); +} + BOOL OpalUdpSsConnection::SetUpConnection() { @@ -235,7 +242,8 @@ { PTRACE(3, "Initiate call "); phase = SetUpPhase; - if (!OnIncomingConnection()) + OpalConnection::StringOptions stringOptions; + if (!OnIncomingConnection(0, &stringOptions)) Release(EndedByCallerAbort); else { PTRACE(2, "UdpSs\tOutgoing call routed to " << ownerCall.GetPartyB() << " for " << *this); Modified: sofaswitch/trunk/voip/udpconnection.h ============================================================================== --- sofaswitch/trunk/voip/udpconnection.h (original) +++ sofaswitch/trunk/voip/udpconnection.h Wed Jan 31 03:57:39 2007 @@ -68,6 +68,12 @@ /**@name Overrides from OpalConnection */ //@{ + + /**Indicates this connection instance is about to join another connection + instance */ + virtual BOOL OnIncomingConnection(unsigned int, + OpalConnection::StringOptions*); + /**Start an outgoing connection. This function will initiate the connection to the remote entity, for example in H.323 it sends a SETUP, in SIP it sends an INVITE etc. Modified: sofaswitch/trunk/voip/udpep.cxx ============================================================================== --- sofaswitch/trunk/voip/udpep.cxx (original) +++ sofaswitch/trunk/voip/udpep.cxx Wed Jan 31 03:57:39 2007 @@ -187,6 +187,17 @@ } + +BOOL OpalUdpSsEndPoint::OnIncomingConnection(OpalConnection& conn, + unsigned int options, + OpalConnection::StringOptions *stringOptions) +{ + return manager.OnIncomingConnection(conn, options, stringOptions); +} + + + + BOOL OpalUdpSsEndPoint::OnShowOutgoing(const OpalUdpSsConnection & connection) { //PTime now; Modified: sofaswitch/trunk/voip/udpep.h ============================================================================== --- sofaswitch/trunk/voip/udpep.h (original) +++ sofaswitch/trunk/voip/udpep.h Wed Jan 31 03:57:39 2007 @@ -177,6 +177,10 @@ const PString & connectionToken /// Token of connection to accept call ); + /**A connection is coming in - or being added to this endpoint */ + virtual BOOL OnIncomingConnection(OpalConnection&, unsigned int, + OpalConnection::StringOptions*); + /**Call back to indicate that remote is ringing. If FALSE is returned the call is aborted.