July 2008 - Sofaswitch-svn - FreeSWITCH Mailing Lists

[commit] r428 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 21 Jul '08

21 Jul '08

Author: derek Date: Sun Jul 20 22:42:45 2008 New Revision: 428 Modified: sofaswitch/trunk/callflow/tests/forloop.src Log: Modify example forloop for clarity. Modified: sofaswitch/trunk/callflow/tests/forloop.src ============================================================================== --- sofaswitch/trunk/callflow/tests/forloop.src (original) +++ sofaswitch/trunk/callflow/tests/forloop.src Sun Jul 20 22:42:45 2008 @@ -1 +1 @@ -4301152 extra <special>Tool Tip<ms>End For Loop<ms><special> <Shape>1031698 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "loop index is ", self.i<ms><special> <Shape>20322199 extra <special>Tool Tip<ms>Death<ms><special> <Shape>929987299,87,301,177<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>130611 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>329962 extra <special>Tool Tip<ms>Start For<ms><special>Initialise (Python code)<ms>self.i = 0<ms><special>Test for Termination (Python code)<ms>self.i < 10<ms><special>Increment (Python code)<ms>self.i+=1<ms><special> <Shape> +929987299,87,301,177<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>130611 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>329962 extra <special>Tool Tip<ms>Start For<ms><special>Initialise (Python code)<ms>self.i = 0<ms><special>Test for Termination (Python code)<ms>self.i < 10<ms><special>Increment (Python code)<ms>self.i=self.i+1<ms><special> <Shape>4301152 extra <special>Tool Tip<ms>End For Loop<ms><special> <Shape>1031698 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "loop index is ", self.i<ms><special> <Shape>20322199 extra <special>Tool Tip<ms>Death<ms><special> <Shape>

1 0

[commit] r427 - in sofaswitch/trunk/sofa: include/sofa src
by SofaSWITCH SVN 21 Jul '08

21 Jul '08

Author: derek Date: Sun Jul 20 22:42:15 2008 New Revision: 427 Modified: sofaswitch/trunk/sofa/include/sofa/messages.h sofaswitch/trunk/sofa/src/messages.cxx Log: Tidy up formatting. Add new methods so descendant class can process additional commands. Modified: sofaswitch/trunk/sofa/include/sofa/messages.h ============================================================================== --- sofaswitch/trunk/sofa/include/sofa/messages.h (original) +++ sofaswitch/trunk/sofa/include/sofa/messages.h Sun Jul 20 22:42:15 2008 @@ -63,6 +63,9 @@ /**Destructor, to close of any threads etc */ virtual ~MessageFrame(); + /**Report what this comms class things about the status of this instance */ + PString GetStatusInfo(); + /**Wait until the messaging subsystem reports it is initialised. Wait no more than 1 second. If not initialised, return false. return true immediately on discovering we are @@ -132,6 +135,20 @@ finished, and that this class is operational and running */ virtual void OnRunning() { }; + /**Make available the processing of commands to descendant + classes. So that (for example) the voip supervisor can process + voip related commands + + @return true if the descendant class did manage to decode the + commands. The default return is false; */ + virtual bool ProcessDescendantCommands(const PStringArray & /*cmds*/, + const PString & /*sender*/) + { return false; } + + /**Find out what commands the descendant class can process. This + command is used to process the help command */ + virtual PStringArray GetDescendantCommands(); + protected: /**Called when this thread finishes. An application would call @@ -150,7 +167,8 @@ /**We have a message come in from the server, and it ends up here. Now, handle this message, and give it to the relevant method below */ - virtual void ProcessMessage(PString message, PString sender); + virtual void ProcessMessage(PString & message, + PString & sender); /**we have received a hangup message, so end the call */ virtual void ProcessHangup(PStringArray &cmds, PString & sender); Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Sun Jul 20 22:42:15 2008 @@ -195,6 +195,19 @@ PTRACE(4, "Finish Terminate the message frame for " << GetOurId()); } +PString MessageFrame::GetStatusInfo() +{ + PStringStream answer; + answer << "UDP audio socket is " << (audioSocket.IsOpen() ? "Open " : "Closed") << endl + << "TCP connection thread is " << (IsTerminated() ? "Stopped " : "Running") << endl + << "TCP command socket is " << (messagesSocket.IsOpen() ? "Open " : "Closed") << endl + << "Received last command from " << lastSender << endl + << "KeepGoing flag is " << (keepGoing ? "true " : "false") << endl + << "Media partner is " << mediaPartner << endl + << "Remote Controller is " << remoteController << endl; + return answer; +} + void MessageFrame::Initialise() { SetThreadName(PString("Messages.") + ourId); @@ -373,7 +386,7 @@ } PString src = res.Left(l); PString msg = res.Mid(l + 1); - ProcessMessage(msg,src); + ProcessMessage(msg, src); } } @@ -428,8 +441,10 @@ writeMessageLock.Signal(); } -void MessageFrame::ProcessMessage(PString message, PString sender) +void MessageFrame::ProcessMessage(PString & message, + PString & sender) { + lastSender = sender; PStringArray cmds = message.Tokenise(" ", false); if (cmds[0] *= availableCommands[0]) { @@ -561,7 +576,8 @@ return; } #endif - PTRACE(3, PString("The command ") + cmds[0] + " was not understood"); + if (ProcessDescendantCommands(cmds, sender) == false) + PTRACE(3, PString("The command ") + cmds[0] + " was not understood"); } void MessageFrame::ProcessHangup(PStringArray &cmds, PString & sender) @@ -728,11 +744,23 @@ void MessageFrame::ProcessHelp(PStringArray &cmds, PString & sender) { PString reply; + for (PINDEX i = 0; i < availableCommands.GetSize(); i++) reply += availableCommands[i] + PString("\n"); + + PStringArray extraCommands = GetDescendantCommands(); + for (PINDEX i = 0; i < extraCommands.GetSize(); i++) + reply += extraCommands[i] + PString("\n"); + SendThisMessageTo(reply, sender); } +PStringArray MessageFrame::GetDescendantCommands() +{ + PStringArray emptyAnswer; + return emptyAnswer; +} + bool MessageFrame::GetLocalAddress(PIPSocket::Address &address, PINDEX &portNo) { PIPSocket::InterfaceTable table;

1 0

[commit] r426 - sofaswitch/trunk/voip
by SofaSWITCH SVN 08 Jul '08

08 Jul '08

Author: derek Date: Mon Jul 7 23:54:03 2008 New Revision: 426 Modified: sofaswitch/trunk/voip/jocall.h sofaswitch/trunk/voip/main.cxx sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/mymanager.h sofaswitch/trunk/voip/supervisor.cxx Log: Get information for status improved. Can query the status of nodes which have disconnected from the message server, but are still in the aplication. Get the setting of id and server to work correctly. Modified: sofaswitch/trunk/voip/jocall.h ============================================================================== --- sofaswitch/trunk/voip/jocall.h (original) +++ sofaswitch/trunk/voip/jocall.h Mon Jul 7 23:54:03 2008 @@ -160,6 +160,9 @@ /**Get information (in a textual form) of how long this call has been up */ PString GetDurationInfo(); + /**Report from the comms instance on what it thinks about status */ + PString GetCommsStatusInfo() { return comms.GetStatusInfo(); } + /**Get a pointer to the PUDPSocket used by this particular call for audio datas */ PUDPSocket & GetAudioSocket(); Modified: sofaswitch/trunk/voip/main.cxx ============================================================================== --- sofaswitch/trunk/voip/main.cxx (original) +++ sofaswitch/trunk/voip/main.cxx Mon Jul 7 23:54:03 2008 @@ -247,8 +247,8 @@ // Create the Opal Manager and initialise it PString server; - if (args.HasOption("s")) { - server = args.GetOptionString("s"); + if (args.HasOption('s')) { + server = args.GetOptionString('s'); PTRACE(3, "server is " << server); } else { server = "localhost"; @@ -256,13 +256,15 @@ } PString ourId; - if (args.HasOption("id")) { - ourId = args.GetOptionString("id"); + if (args.HasOption('i')) { + ourId = args.GetOptionString('i'); PTRACE(3, "our ID is " << ourId); } else { ourId = "voip"; PTRACE(3, "Select a default ID of " << ourId); } + cerr << "Select ID of " << ourId << endl; + cerr << "Select a server of " << server << endl; ourId = server + "/" + ourId; Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Mon Jul 7 23:54:03 2008 @@ -474,15 +474,15 @@ PTRACE(3, "Accept/Reject this call as we have found it " << uniqueCallId); call->AcceptThisCall(doAccept); } - -PString MyManager::GetStatusInfo(const PString & token) + + PString MyManager::GetStatusInfo(const PString & token) { - + PSafePtr<OpalCall> call = FindCallWithLock(token); if (call == NULL) { return "Status unavailable as not in a call"; } - + PStringStream status; status << call->GetPartyA() << "-" << call->GetPartyB() << endl; status << (PTime() - call->GetStartTime()) << " duration" << endl; @@ -491,6 +491,44 @@ return status; } +PString MyManager::GetStatusInfoSofaSwitchNode(const PString & token) +{ + PStringArray prebuilts = runningComms.GetCurrentEntries(); + PStringArray pendingNames = nodesMakingCalls.GetCurrentEntries(); + PSortedStringList currentNames = GetCurrentNames(); + PStringStream answer; + + if (prebuilts.GetStringsIndex(token) != P_MAX_INDEX) { + answer << "Found sofaswitch token " << token + << " in the list for precall nodes " << endl; + return answer; + } + + if (pendingNames.GetStringsIndex(token) != P_MAX_INDEX) { + answer << "Found sofaswitch token " << token + << " in the list for nodes in the process of making a call" << endl; + return answer; + } + + if (currentNames.GetStringsIndex(token) != P_MAX_INDEX) { + answer << "Found sofaswitch token " << token + << " in the list for nodes in a call. Now, get more detail." << endl; + + for (PSafePtr<OpalCall>call = activeCalls; call != NULL; ++call) { + MyOpalCall *c = PSafePtrCast<OpalCall, MyOpalCall>(call); + if (c != NULL) { + if (c->GetOurId() == token) { + answer << GetStatusInfo(c->GetToken()); + answer << c->GetCommsStatusInfo(); + return answer; + } + } + } + } + answer << "Did not find SofaSwitch node " << token << " on this voip server" << endl; + return answer; +} + PString MyManager::GetStatusInfo() { PStringStream status; @@ -536,14 +574,8 @@ status << endl; } - PSortedStringList currentNames; - for (PSafePtr<OpalCall>call = activeCalls; call != NULL; ++call) { - MyOpalCall *c = PSafePtrCast<OpalCall, MyOpalCall>(call); - if (c != NULL) - currentNames.AppendString(c->GetOurId()); - else - currentNames.AppendString("No name - weird"); - } + PSortedStringList currentNames = GetCurrentNames(); + if (currentNames.GetSize() > 0) { status << "Current active calls " << endl; @@ -555,6 +587,21 @@ return status; } +PSortedStringList MyManager::GetCurrentNames() +{ + PSortedStringList answer; + + for (PSafePtr<OpalCall>call = activeCalls; call != NULL; ++call) { + MyOpalCall *c = PSafePtrCast<OpalCall, MyOpalCall>(call); + if (c != NULL) + answer.AppendString(c->GetOurId()); + else + answer.AppendString("No name - weird"); + } + return answer; +} + + Comms * MyManager::ClearCommsId(const PString &memberId) { PTRACE(3, "Clear comms Id on " << memberId); Modified: sofaswitch/trunk/voip/mymanager.h ============================================================================== --- sofaswitch/trunk/voip/mymanager.h (original) +++ sofaswitch/trunk/voip/mymanager.h Mon Jul 7 23:54:03 2008 @@ -173,9 +173,13 @@ virtual void DestroyCall(OpalCall * call); /**Request manager to provide status information on the call - matching this specific token */ + matching this specific token. This token is the opal call token. */ PString GetStatusInfo(const PString & token); + /**Request manager to provide status information on the call + matching this specific token. This token is the sofaSwitch token. */ + PString GetStatusInfoSofaSwitchNode(const PString & token); + /**Request manager to provide general status information on all calls */ PString GetStatusInfo(); @@ -221,6 +225,10 @@ CommsConsumer class to remove this instance */ void AppendFinishedComms(Comms *commsPtr); + /**Report, in a sorted string list, the sofa id of all running + comms instances in a call */ + PSortedStringList GetCurrentNames(); + protected: /**The interface to the external script which runs python, to provide comms for us */ LaunchNewId &lid; Modified: sofaswitch/trunk/voip/supervisor.cxx ============================================================================== --- sofaswitch/trunk/voip/supervisor.cxx (original) +++ sofaswitch/trunk/voip/supervisor.cxx Mon Jul 7 23:54:03 2008 @@ -104,8 +104,12 @@ void Supervisor::ProcessStatusQuery(PStringArray &cmds, PString & sender) { - PString status; - status = VoipProcess::Current().GetManager()->GetStatusInfo(); + PStringStream status; + if (cmds.GetSize() >= 2) { + for (PINDEX i = 1; i < cmds.GetSize(); i++) + status << VoipProcess::Current().GetManager()->GetStatusInfoSofaSwitchNode(cmds[i]); + } else + status << VoipProcess::Current().GetManager()->GetStatusInfo(); SendThisMessageTo(status, sender); }

1 0

[commit] r425 - sofaswitch/trunk/sofa/src
by SofaSWITCH SVN 03 Jul '08

03 Jul '08

Author: derek Date: Wed Jul 2 23:52:27 2008 New Revision: 425 Modified: sofaswitch/trunk/sofa/src/messages.cxx Log: Tidy up locks in creation of identities. Now, we correctly set them, so there is no deadlock on faulty initialisation. Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Wed Jul 2 23:52:27 2008 @@ -220,6 +220,7 @@ if (!keepGoing) { PTRACE(4, "initialize end - keepgoing is false "); + goodConnection.Signal(); return; } @@ -234,49 +235,50 @@ PTRACE(5, "ok - we have a good connection"); goodConnection.Signal(); + if (!messagesSocket.SetOption(TCP_NODELAY, 1, IPPROTO_TCP)) { PTRACE(1, "SetOption(TCP_NODELAY) failed: " << messagesSocket.GetErrorText()); - if (!keepGoing) { - PTRACE(4, "initialize end TCP_NODELAY- keepgoing is false"); - return; - } + keepGoing = false; + PTRACE(4, "initialize end TCP_NODELAY- keepgoing is false"); + writeSourceId.Signal(); + return; } if (!messagesSocket.SetOption(SO_KEEPALIVE, 1)) { PTRACE(3, "SetOption(keepalive) failed: " << messagesSocket.GetErrorText()); - if (!keepGoing) { - PTRACE(3, "initialize end SO_KEEPALIVE- keepgoing is false"); - return; - } + keepGoing = false; + PTRACE(3, "initialize end SO_KEEPALIVE- keepgoing is false"); + writeSourceId.Signal(); + return; } #ifdef TCP_KEEPIDLE if (!messagesSocket.SetOption(TCP_KEEPIDLE, 10, IPPROTO_TCP)) { PTRACE(1, "SetOption(TCP_KEEPIDLE 2) failed: " << messagesSocket.GetErrorText()); - if (!keepGoing) { - PTRACE(3, "initialize end TCP_KEEPIDLE 2- keepgoing is false"); - return; - } + keepGoing = false; + PTRACE(3, "initialize end TCP_KEEPIDLE 2- keepgoing is false"); + writeSourceId.Signal(); + return; } #endif #ifdef TCP_KEEPCNT if (!messagesSocket.SetOption(TCP_KEEPCNT, 2, IPPROTO_TCP)) { PTRACE(1, "SetOption(TCP_KEEPCNT 2) failed: " << messagesSocket.GetErrorText()); - if (!keepGoing) { - PTRACE(3, "initialize TCP_KEEPCNT 2 end - keepgoing is false"); - return; - } - } + keepGoing = false; + PTRACE(3, "initialize TCP_KEEPCNT 2 end - keepgoing is false"); + writeSourceId.Signal(); + return; + } #endif #ifdef TCP_KEEPINTVL if (!messagesSocket.SetOption(TCP_KEEPINTVL, 10, IPPROTO_TCP)) { PTRACE(1, "SetOption(TCP_KEEPINTVL 2) failed: " << messagesSocket.GetErrorText()); - if (!keepGoing) { - PTRACE(3, "initialize end TCP_KEEPINTVL 2- keepgoing is false"); - return; - } + keepGoing = false; + PTRACE(3, "initialize end TCP_KEEPINTVL 2- keepgoing is false"); + writeSourceId.Signal(); + return; } #endif

1 0

[commit] r424 - sofaswitch/trunk/server
by SofaSWITCH SVN 03 Jul '08

03 Jul '08

Author: derek Date: Wed Jul 2 23:45:34 2008 New Revision: 424 Modified: sofaswitch/trunk/server/client.py Log: Go back to no up arrow - it breaks the shell... Modified: sofaswitch/trunk/server/client.py ============================================================================== --- sofaswitch/trunk/server/client.py (original) +++ sofaswitch/trunk/server/client.py Wed Jul 2 23:45:34 2008 @@ -6,7 +6,7 @@ # See the description in server.py on how you use this program. # -import readline, socket, os, sys, thread +import socket, os, sys, thread if len(sys.argv) < 3: print "Syntax: client.py myId destination_host" @@ -35,7 +35,7 @@ thread.start_new(report_incoming,()) while True: - value = raw_input("> ") + value = sys.stdin.readline() value = value.strip() if value == 'end': sys.exit()

1 0