August 2007 - sofaswitch-svn@lists.freeswitch.org

[Sofaswitch-svn] [commit] r385 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 01 Aug '07

01 Aug '07

Author: derek Date: Wed Aug 1 19:18:46 2007 New Revision: 385 Modified: sofaswitch/trunk/callflow/src/python.cpp Log: Tidy up postion of input point. Modified: sofaswitch/trunk/callflow/src/python.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/python.cpp (original) +++ sofaswitch/trunk/callflow/src/python.cpp Wed Aug 1 19:18:46 2007 @@ -44,7 +44,7 @@ wxPoint pC(p1.x + 16, p1.y + 60); wxPoint pD(p1.x + 16, p1.y + 46); - DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose); + DrawArrow(dc, pB, ArrowDown, InputPointConnected(0) ? Connected : Loose); DrawArrow(dc, pC, ArrowDown, OutputPointConnected(0) ? Connected : Loose); dc.DrawLine(pA, pB); dc.DrawLine(pD, pC);

1 0

[Sofaswitch-svn] [commit] r384 - sofaswitch/trunk/voip
by SofaSWITCH SVN 01 Aug '07

01 Aug '07

Author: derek Date: Wed Aug 1 19:11:47 2007 New Revision: 384 Modified: sofaswitch/trunk/voip/comms.cxx Log: Send a message to say the call has been hungup. Modified: sofaswitch/trunk/voip/comms.cxx ============================================================================== --- sofaswitch/trunk/voip/comms.cxx (original) +++ sofaswitch/trunk/voip/comms.cxx Wed Aug 1 19:11:47 2007 @@ -239,6 +239,10 @@ void Comms::AdviseCallRelease() { + PTRACE(3, "Advise of call hangup on " << GetOurId() << " and " << remoteController); + PString advise = PString("Hangup ") + GetOurId(); + SendThisMessageTo(advise, remoteController); + PWaitAndSignal m(opalCallLock); if (myOpalCall != NULL) { myOpalCall->SafeDereference();

1 0

[Sofaswitch-svn] [commit] r383 - sofaswitch/trunk/voip
by SofaSWITCH SVN 01 Aug '07

01 Aug '07

Author: derek Date: Wed Aug 1 18:00:24 2007 New Revision: 383 Modified: sofaswitch/trunk/voip/udpsound.cxx Log: reporting thing. Modified: sofaswitch/trunk/voip/udpsound.cxx ============================================================================== --- sofaswitch/trunk/voip/udpsound.cxx (original) +++ sofaswitch/trunk/voip/udpsound.cxx Wed Aug 1 18:00:24 2007 @@ -82,7 +82,7 @@ return FALSE; } - PTRACE(3, "Sound\t open for a direction of " << dir << " and for " << GetSSLabel(isSource)); + PTRACE(3, "MEDIASound\t open for a direction of " << dir << " and for " << GetSSLabel(isSource)); os_handle = 65535; //This is way bigger than it will ever go. //However, it will pass all the pwlib tests of > 0 @@ -101,28 +101,29 @@ BOOL UdpSoundChannel::Write(const void * buffer, PINDEX amount) { - PTRACE(6, "Write " << amount << " bytes to the socket"); + PTRACE(6, "MEDIA\tWrite " << amount << " bytes to the socket"); if (!IsOpen()) { - PTRACE(3, "Write failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); return FALSE; } BOOL res = audioSocket.Write(buffer, amount); if (res) { - PTRACE(5, "Write succeeded"); + PTRACE(5, "MEDIA\tWrite succeeded"); } else { WORD dPort; PIPSocket::Address destination; audioSocket.GetSendAddress(destination, dPort); - PTRACE(5, "Write destination is " << destination << " : " << dPort); - PTRACE(5, "That write failed " << audioSocket.GetErrorText()); + PTRACE(5, "MEDIA\tWrite destination is " << destination << " : " << dPort); + PTRACE(5, "MEDIA\tThat write failed " << audioSocket.GetErrorText()); } delay.Delay(amount / 16); lastWriteCount = amount; - + + PTRACE(5, "MEDIA\tWrite to socket return " << audioSocket.IsOpen()); return audioSocket.IsOpen(); } @@ -130,21 +131,21 @@ BOOL UdpSoundChannel::Read(void * buffer, PINDEX amount) { if (!IsOpen()) { - PTRACE(3, "Read failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tRead failed as this sound channel is closed"); return FALSE; } BOOL readOk = TRUE; - PTRACE(5, "Now do a read of " << amount << " bytes for " << GetSSLabel(isSource)); - PTRACE(5, "The read queue has a buffered bytes size of " << readQueue.GetLength()); + PTRACE(5, "MEDIA\tNow do a read of " << amount << " bytes for " << GetSSLabel(isSource)); + PTRACE(5, "MEDIA\tThe read queue has a buffered bytes size of " << readQueue.GetLength()); while (amount > readQueue.GetLength()) { PTRACE(5, "The internal buffer has insufficient bytes, as " << readQueue.GetLength() << " is less than " << amount); - PTRACE(5, "Grab some extra bytes from the socket"); + PTRACE(5, "MEDIA\tGrab some extra bytes from the socket"); readOk = audioSocket.Read(readBuffer.GetPointer(), 480); if (!readOk) { - PTRACE(1, "The read of a packet from a socket failed for " << GetSSLabel(isSource)); + PTRACE(1, "MEDIA\tThe read of a packet from a socket failed for " << GetSSLabel(isSource)); return FALSE; } PTRACE(5, "The socket provided us with " << audioSocket.GetLastReadCount() << " bytes");

1 0

[Sofaswitch-svn] [commit] r382 - sofaswitch/trunk/voip
by SofaSWITCH SVN 01 Aug '07

01 Aug '07

Author: derek Date: Tue Jul 31 22:19:10 2007 New Revision: 382 Modified: sofaswitch/trunk/voip/comms.cxx sofaswitch/trunk/voip/jocall.cxx sofaswitch/trunk/voip/jocall.h sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/mymanager.h Log: Change the manner in which we accept/reject calls. This change brings us into line with the opal Library standard. Modified: sofaswitch/trunk/voip/comms.cxx ============================================================================== --- sofaswitch/trunk/voip/comms.cxx (original) +++ sofaswitch/trunk/voip/comms.cxx Tue Jul 31 22:19:10 2007 @@ -204,12 +204,6 @@ PTRACE(0, "The command \"" << cmds[1] << "\" was not understood -- sorry"); doAnswer = FALSE; } - if(!doAnswer) { - PTRACE(3, "Reject this call"); - PWaitAndSignal m(opalCallLock); - myOpalCall->Clear(); - return; - } PString thisToken; { @@ -217,6 +211,16 @@ if (myOpalCall != NULL) thisToken = myOpalCall->GetToken(); } + + if(!doAnswer) { + PTRACE(3, "Reject this call"); + manager.AcceptThisCall(thisToken, FALSE); + PWaitAndSignal m(opalCallLock); + if (myOpalCall != NULL) + myOpalCall->Clear(); + return; + } + PTRACE(3, "Accept this call on OpalCall token " << thisToken); manager.AcceptThisCall(thisToken); } Modified: sofaswitch/trunk/voip/jocall.cxx ============================================================================== --- sofaswitch/trunk/voip/jocall.cxx (original) +++ sofaswitch/trunk/voip/jocall.cxx Tue Jul 31 22:19:10 2007 @@ -185,15 +185,18 @@ manager.GetControllerId()); } -void MyOpalCall::AcceptThisCall() +void MyOpalCall::AcceptThisCall(BOOL doAccept) { PTRACE(3, "Process request to accept this call"); for (PSafePtr<OpalConnection> conn(connectionsActive, PSafeReadOnly); conn != NULL; ++conn) { PSafePtr<OpalUdpSsConnection> connection; connection = PSafePtrCast<OpalConnection, OpalUdpSsConnection>(conn); - if (connection != NULL) { - connection->AcceptIncoming(); - PTRACE(3, "Finished Answering the call for " << connection->GetToken()); + if (connection == NULL) { + if (doAccept) + conn->AnsweringCall(OpalConnection::AnswerCallNow); + else + conn->AnsweringCall(OpalConnection::AnswerCallDenied); + PTRACE(3, "Finished Answering the call for " << conn->GetToken()); } } } Modified: sofaswitch/trunk/voip/jocall.h ============================================================================== --- sofaswitch/trunk/voip/jocall.h (original) +++ sofaswitch/trunk/voip/jocall.h Tue Jul 31 22:19:10 2007 @@ -112,16 +112,17 @@ void SendThisDtmf(const PString & userInput ///DTMF to send ); - /**Make the OpalConnections in this call accept this incoming + /**Make the OpalConnections in this call accept/reject this incoming call. This will move the status of the incoming call to - connecting. + connecting/releasing */ - void AcceptThisCall(); + void AcceptThisCall(BOOL doAccept ///<True to indicate we accept the call. + ); /**Send a request to the remote controller, asking them if we can answer this incoming voip call */ void IncomingCall(const PString & remoteNode ///person calling us - ); + ); /**Close this id off */ void CloseThisId(); Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue Jul 31 22:19:10 2007 @@ -437,7 +437,7 @@ } -void MyManager::AcceptThisCall(const PString & uniqueCallId) +void MyManager::AcceptThisCall(const PString & uniqueCallId, BOOL doAccept) { PTRACE(3, "Accept this call if we can find it " << uniqueCallId); OpalCall *oCall = FindCallWithLock(uniqueCallId); @@ -448,8 +448,8 @@ MyOpalCall *call; call = PSafePtrCast<OpalCall, MyOpalCall>(oCall); - PTRACE(3, "Accept this call as we have found it " << uniqueCallId); - call->AcceptThisCall(); + PTRACE(3, "Accept/Reject this call as we have found it " << uniqueCallId); + call->AcceptThisCall(doAccept); } PString MyManager::GetStatusInfo(const PString & token) Modified: sofaswitch/trunk/voip/mymanager.h ============================================================================== --- sofaswitch/trunk/voip/mymanager.h (original) +++ sofaswitch/trunk/voip/mymanager.h Tue Jul 31 22:19:10 2007 @@ -173,8 +173,11 @@ /**Get information (in a textual form) of how long this call has been up */ PString GetDurationInfo(const PString & token); - /**Advise the manager to accept this call, which has a particular callId */ - void AcceptThisCall(const PString & uniqueCallId); + /**Advise the manager to accept/reject this call, which has a particular callId. + The default action is to accept this call. + + If the doAccept arguement is false, the call is rejected.*/ + void AcceptThisCall(const PString & uniqueCallId, BOOL doAccept = TRUE); /**Advise the manager to reject this call, which has a particular callId */ void RejectThisCall(const PString & uniqueCallId);

1 0