- sofaswitch-svn@lists.freeswitch.org - FreeSWITCH Mailing Lists

[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

[Sofaswitch-svn] [commit] r381 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 31 Jul '07

31 Jul '07

Author: derek Date: Tue Jul 31 01:08:40 2007 New Revision: 381 Modified: sofaswitch/trunk/callflow/src/acceptcall.cpp Log: Sort out a typo. Modified: sofaswitch/trunk/callflow/src/acceptcall.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/acceptcall.cpp (original) +++ sofaswitch/trunk/callflow/src/acceptcall.cpp Tue Jul 31 01:08:40 2007 @@ -70,7 +70,7 @@ file.AddLine(" except: "); file.AddLine(" print \"The evaluation of \", self.mesg, \" failed - no idea what this means\" "); file.AddLine(" return self.data[a][\"Output\"] "); - file.AddLine(" self.rhost += \":ANSWERCALL \" + self.myanswer + \"\\0\" "); + file.AddLine(" self.rhost += \":ANSWER \" + self.myanswer + \"\\0\" "); file.AddLine(" self.transport.write(self.rhost) "); file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine("");

1 0

[Sofaswitch-svn] [commit] r380 - sofaswitch/trunk/voip
by SofaSWITCH SVN 31 Jul '07

31 Jul '07

Author: derek Date: Tue Jul 31 00:15:35 2007 New Revision: 380 Modified: sofaswitch/trunk/voip/udpconnection.cxx sofaswitch/trunk/voip/udpep.cxx Log: Another go at commiting, which contains test on OPAL_VIDEO Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Tue Jul 31 00:15:35 2007 @@ -43,7 +43,10 @@ #include <ptlib/videoio.h> #include <codec/silencedetect.h> +#if OPAL_VIDEO #include <codec/vidcodec.h> +#endif + #include <opal/call.h> #include <opal/patch.h> #include <opal/manager.h> @@ -183,9 +186,9 @@ OpalMediaFormatList formats; formats += OpalPCM16; // Sound card can only do 16 bit PCM - +#if OPAL_VIDEO AddVideoMediaFormats(formats); - +#endif return formats; } Modified: sofaswitch/trunk/voip/udpep.cxx ============================================================================== --- sofaswitch/trunk/voip/udpep.cxx (original) +++ sofaswitch/trunk/voip/udpep.cxx Tue Jul 31 00:15:35 2007 @@ -37,9 +37,11 @@ #endif +#if OPAL_VIDEO #include <ptlib/videoio.h> -#include <codec/silencedetect.h> #include <codec/vidcodec.h> +#endif +#include <codec/silencedetect.h> #include <opal/call.h> #include <opal/patch.h> #include <opal/manager.h> @@ -149,7 +151,9 @@ formats += OpalPCM16; // Sound card can only do 16 bit PCM +#if OPAL_VIDEO AddVideoMediaFormats(formats); +#endif return formats; }

1 0

[Sofaswitch-svn] [commit] r379 - sofaswitch/trunk/voip
by SofaSWITCH SVN 31 Jul '07

31 Jul '07

Author: derek Date: Mon Jul 30 23:07:46 2007 New Revision: 379 Modified: sofaswitch/trunk/voip/udpconnection.cxx Log: Fix, so it compiles against the current CVS. Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Mon Jul 30 23:07:46 2007 @@ -97,7 +97,7 @@ { remotePartyName = ownerCall.GetOtherPartyConnection(*this)->GetRemotePartyName(); remotePartyAddress = ownerCall.GetOtherPartyConnection(*this)->GetRemotePartyAddress(); - remoteApplication = ownerCall.GetOtherPartyConnection(*this)->GetRemoteApplication(); + PString remoteApplication = ownerCall.GetOtherPartyConnection(*this)->GetRemoteApplication(); PTRACE(3, "UdpSs\tSetUpConnection, Remote party name " << remotePartyName << ')'); PTRACE(3, "UdpSs\tSetUpConnection, Remote party address" << remotePartyAddress << ')');

1 0

[Sofaswitch-svn] [commit] r378 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 31 Jul '07

31 Jul '07

Author: derek Date: Mon Jul 30 22:29:59 2007 New Revision: 378 Modified: sofaswitch/trunk/callflow/tests/simpleeventer.src Log: Tidyups - so print messages are correct. Modified: sofaswitch/trunk/callflow/tests/simpleeventer.src ============================================================================== --- sofaswitch/trunk/callflow/tests/simpleeventer.src (original) +++ sofaswitch/trunk/callflow/tests/simpleeventer.src Mon Jul 30 22:29:59 2007 @@ -1 +1 @@ -9333158333,158,352,196<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9312219312,219,312,326<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20300324 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2385127 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>130356 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>11303108 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.newNode<ms><special> <Shape>10293162 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have received a new node ", self.newNode<ms><special> <Shape>9353128353,128,412,129<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2330252 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>10336196 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " Finished main stream of execution "<ms><special> <Shape> +9353128353,128,412,129<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20300324 extra <special>Tool Tip<ms>Death<ms><special> <Shape>10296156 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have received a new node ", self.newNode<ms><special> <Shape>10335195 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "timeout - waiting for a voip node"<ms><special> <Shape>2391187 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9333158333,158,352,196<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9312219312,219,312,326<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11303108 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.newNode<ms><special> <Shape>130356 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>9312255351,255,312,324<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10397126 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " Finished main stream of execution "<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r377 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 31 Jul '07

31 Jul '07

Author: derek Date: Mon Jul 30 22:26:02 2007 New Revision: 377 Modified: sofaswitch/trunk/callflow/tests/requestnode.src Log: Fix this graph. Modified: sofaswitch/trunk/callflow/tests/requestnode.src ============================================================================== --- sofaswitch/trunk/callflow/tests/requestnode.src (original) +++ sofaswitch/trunk/callflow/tests/requestnode.src Mon Jul 30 22:26:02 2007 @@ -1 +1 @@ -139996 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>10393186 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have a new node on ", self.eventData<ms><special> <Shape>20467276 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9409246409,246,479,276<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9451163451,163,559,169<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10461218 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "timer has expired at ", time.asctime()<ms><special> <Shape>9431193477,218,431,193<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11401143 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms><ms><special> <Shape>2534169 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape> +9451163451,163,559,169<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20467276 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9431193477,218,431,193<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10393186 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have a new node on ", self.voipNode<ms><special> <Shape>9409246409,246,479,276<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2534169 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10461218 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "timer has expired at ", time.asctime()<ms><special> <Shape>11401143 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.voipNode<ms><special> <Shape>139996 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r376 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 31 Jul '07

31 Jul '07

Author: derek Date: Mon Jul 30 22:24:04 2007 New Revision: 376 Modified: sofaswitch/trunk/callflow/tests/recordmessage.src Log: Fix graph - use am node, not voip node Modified: sofaswitch/trunk/callflow/tests/recordmessage.src ============================================================================== --- sofaswitch/trunk/callflow/tests/recordmessage.src (original) +++ sofaswitch/trunk/callflow/tests/recordmessage.src Mon Jul 30 22:24:04 2007 @@ -1,2 +1,2 @@ -5605324 extra <special>Tool Tip<ms>End the recording..<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>9656401656,401,666,535,721,536,721,534<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9265199265,513,265,635,427,639,429,199,533,202,533,262<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20294621 extra <special>Tool Tip<ms>Death<ms><special> <Shape>17508310 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"message.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>10289569 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "DEATH NOW."<ms><special> <Shape>5507264 extra <special>Tool Tip<ms>Start recording now<ms><special>Test (Python code)<ms>self.dtmfData=="1"<ms><special> <Shape>14290536 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.hanguptime<ms><special> <Shape>2511354 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>9266151272,151,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20609623 extra <special>Tool Tip<ms>Death<ms><special> <Shape>14254464 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.dtmfData<ms><special> <Shape>5628347 extra <special>Tool Tip<ms>hear the recording<ms><special>Test (Python code)<ms>self.dtmfData=="2"<ms><special> <Shape>2692631 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>15605522 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>16694585 extra <special>Tool Tip<ms>Play the message just recorded back<ms><special>Filename to read audio from (Python code)<ms>"message.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>7605474 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.amNode<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>17695537 extra <special>Tool Tip<ms>Stop writing to the file -while we play it back<ms><special>Filename to contain new audio (Python code)<ms>" "<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>2687371 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9148324148,324,168,674,579,672,566,479,630,474<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2348557 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9312121312,121,336,128<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5576297 extra <special>Tool Tip<ms>Repeat instructions<ms><special>Test (Python code)<ms>self.dtmfData=="3"<ms><special> <Shape>9678372678,372,715,373<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10132264 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have not received sound or voip node in time"<ms><special> <Shape>2307390 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9555290555,290,600,293<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9148151292,151,148,264<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9291384291,384,332,390<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9300346601,346,581,447,300,483<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9341557341,557,375,557<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11262101 extra <special>Tool Tip<ms>Request Node from sound<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.soundNode<ms><special> <Shape>9200121200,121,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9630374630,374,631,473<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9655595655,595,717,631<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.amNode != None) and (self.soundNode != None)<ms><special> <Shape>2311128 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>16275484 extra <special>Tool Tip<ms>Play the instructions<ms><special>Filename to read audio from (Python code)<ms>"../prompts/record.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>12605575 extra <special>Tool Tip<ms>timer, which on firing ends this flow<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"hanguptime"<ms><special> <Shape>9148121220,121,148,264<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1119071 extra <special>Tool Tip<ms>Request Node from voip<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.voipNode<ms><special> <Shape>923892238,92,285,97<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape> +9630374630,374,631,473<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.amNode != None) and (self.soundNode != None)<ms><special> <Shape>2348557 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>16694585 extra <special>Tool Tip<ms>Play the message just recorded back<ms><special>Filename to read audio from (Python code)<ms>"message.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>20294621 extra <special>Tool Tip<ms>Death<ms><special> <Shape>5628347 extra <special>Tool Tip<ms>hear the recording<ms><special>Test (Python code)<ms>self.dtmfData=="2"<ms><special> <Shape>1119071 extra <special>Tool Tip<ms>Request Node from voip<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.amNode<ms><special> <Shape>9300346601,346,581,447,300,483<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11262101 extra <special>Tool Tip<ms>Request Node from sound<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.soundNode<ms><special> <Shape>2687371 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9148121220,121,148,264<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>923892238,92,285,97<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9656401656,401,666,535,721,536,721,534<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9555290555,290,600,293<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10132264 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have not received sound or am or sound node in time"<ms><special> <Shape>9678372678,372,715,373<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9312121312,121,336,128<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9266151272,151,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9291384291,384,332,390<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20609623 extra <special>Tool Tip<ms>Death<ms><special> <Shape>17508310 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"message.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>10289569 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "DEATH NOW."<ms><special> <Shape>9200121200,121,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5605324 extra <special>Tool Tip<ms>End the recording..<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>9655595655,595,717,631<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14254464 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.dtmfData<ms><special> <Shape>2692631 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9265199265,513,265,635,427,639,429,199,533,202,533,262<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9341557341,557,375,557<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14290536 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.hanguptime<ms><special> <Shape>17695537 extra <special>Tool Tip<ms>Stop writing to the file +while we play it back<ms><special>Filename to contain new audio (Python code)<ms>" "<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>16275484 extra <special>Tool Tip<ms>Play the instructions<ms><special>Filename to read audio from (Python code)<ms>"../prompts/record.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>2311128 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9148324148,324,168,674,579,672,566,479,630,474<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>12605575 extra <special>Tool Tip<ms>timer, which on firing ends this flow<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"hanguptime"<ms><special> <Shape>5576297 extra <special>Tool Tip<ms>Repeat instructions<ms><special>Test (Python code)<ms>self.dtmfData=="3"<ms><special> <Shape>7605474 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.amNode<ms><special> <Shape>9148151292,151,148,264<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2307390 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>5507264 extra <special>Tool Tip<ms>Start recording now<ms><special>Test (Python code)<ms>self.dtmfData=="1"<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>15605522 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>2511354 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r375 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 31 Jul '07

31 Jul '07

Author: derek Date: Mon Jul 30 22:16:44 2007 New Revision: 375 Modified: sofaswitch/trunk/callflow/tests/forloop.src sofaswitch/trunk/callflow/tests/makevoipcall.src Log: Tidy up graphs. Modified: sofaswitch/trunk/callflow/tests/forloop.src ============================================================================== --- sofaswitch/trunk/callflow/tests/forloop.src (original) +++ sofaswitch/trunk/callflow/tests/forloop.src Mon Jul 30 22:16:44 2007 @@ -1 +1 @@ -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>130611 extra <special>Tool Tip<ms>Start Processing<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>925884296,87,258,84,259,174,299,178<special>Tool Tip<ms>Join blocks shape<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>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> Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src ============================================================================== --- sofaswitch/trunk/callflow/tests/makevoipcall.src (original) +++ sofaswitch/trunk/callflow/tests/makevoipcall.src Mon Jul 30 22:16:44 2007 @@ -1,3 +1,3 @@ -9166171166,171,166,357<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9203527203,527,248,528<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5141357 extra <special>Tool Tip<ms>TEST: have a sound and voip node.<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>9166555166,555<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9274785274,785,319,785<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2244139 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>6141406 extra <special>Tool Tip<ms>Make Call to a remote entity<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>self.scriptArgs<ms><special> <Shape>795148 extra <special>Tool Tip<ms>End Call<ms><special>Worker node for termination (Python code)<ms>self.soundNode<ms><special> <Shape>2169614 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9248578248,578,251,677<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9191382191,382,237,383<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20226812 extra <special>Tool Tip<ms>Death<ms><special> <Shape>12334253 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>2<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special>Python variable: Timer expire info<ms><ms><special> <Shape>20334302 extra <special>Tool Tip<ms>Death<ms><special> <Shape>7225722 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>15141457 extra <special>Tool Tip<ms>Transfer Media between the voip and sound node<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>15226677 extra <special>Tool Tip<ms>Make sound node -talk to itself<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>12224765 extra <special>Tool Tip<ms>Timer which initates a shutdown, after some tidyup - messages etc have been sent.<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"endeverything"<ms><special> <Shape>14235528 extra <special>Tool Tip<ms>Wait for voip call to end<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.eventData<ms><special> <Shape>2360272 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>14153505 extra <special>Tool Tip<ms>Wait for DTMF data<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.dtmfData<ms><special> <Shape>9206141206,141,272,141<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11156121 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.soundNode<ms><special> <Shape>5140548 extra <special>Tool Tip<ms>Test for dtmf data of "9"<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>2211382 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9188214188,214,188,251,359,252<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9139116139,116,181,121<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2292782 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>99914699,146,100,353,166,357<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9165598165,598,165,674,251,677<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1889 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>118996 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.voipNode<ms><special> <Shape>2258544 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>229752 extra <special>Tool Tip<ms>Register for events from voip node<ms><special>Node to receive events from (Python code)<ms>"voip"<ms><special> <Shape>7163164 extra <special>Tool Tip<ms>End Call<ms><special>Worker node for termination (Python code)<ms>self.voipNode<ms><special> <Shape>19168575 extra <special>Tool Tip<ms>Send Dtmf to the voip node<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>9120198120,198,120,253,359,253<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape> +15141381 extra <special>Tool Tip<ms>Transfer Media between the voip and sound node<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>9120198120,198,120,253,359,253<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>118996 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.voipNode<ms><special> <Shape>6141330 extra <special>Tool Tip<ms>Make Call to a remote entity<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>self.scriptArgs<ms><special> <Shape>2360272 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>20336305 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9248502248,502,251,601<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9203451203,451,248,452<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>795148 extra <special>Tool Tip<ms>End Call<ms><special>Worker node for termination (Python code)<ms>self.soundNode<ms><special> <Shape>9188214188,214,188,251,359,252<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2169538 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9165522165,522,165,598,251,601<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9166171166,171,166,281<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>229752 extra <special>Tool Tip<ms>Register for events from voip node<ms><special>Node to receive events from (Python code)<ms>"voip"<ms><special> <Shape>9206141206,141,272,141<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>12224689 extra <special>Tool Tip<ms>Timer which initates a shutdown, after some tidyup + messages etc have been sent.<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"endeverything"<ms><special> <Shape>2244139 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>12334253 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>2<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special>Python variable: Timer expire info<ms><ms><special> <Shape>1889 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>9271711271,711,316,711<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14153429 extra <special>Tool Tip<ms>Wait for DTMF data<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.dtmfData<ms><special> <Shape>7163164 extra <special>Tool Tip<ms>End Call<ms><special>Worker node for termination (Python code)<ms>self.voipNode<ms><special> <Shape>9166479166,479<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9191306191,306,237,307<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9139116139,116,181,121<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2211306 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>11156121 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.soundNode<ms><special> <Shape>14235452 extra <special>Tool Tip<ms>Wait for voip call to end<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.eventData<ms><special> <Shape>99914699,146,101,269,166,281<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20229740 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2258468 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>2291710 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>7225646 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>15226601 extra <special>Tool Tip<ms>Make sound node +talk to itself<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>19168499 extra <special>Tool Tip<ms>Send Dtmf to the voip node<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>5141281 extra <special>Tool Tip<ms>TEST: have a sound and voip node.<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>5140472 extra <special>Tool Tip<ms>Test for dtmf data of "9"<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r374 - in sofaswitch/trunk/callflow: src tests
by SofaSWITCH SVN 31 Jul '07

31 Jul '07

Author: derek Date: Mon Jul 30 22:10:51 2007 New Revision: 374 Modified: sofaswitch/trunk/callflow/src/shapelist.cpp sofaswitch/trunk/callflow/src/timer.cpp sofaswitch/trunk/callflow/tests/amplaywavfile.src sofaswitch/trunk/callflow/tests/amtest.src sofaswitch/trunk/callflow/tests/child.src sofaswitch/trunk/callflow/tests/dtmf_from_sound.src Log: Multiple fixes, to get it to work correctly. Tidy up tests for network events. Now, accepts all network messages. Append to the inline documentation. Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Mon Jul 30 22:10:51 2007 @@ -369,12 +369,6 @@ file.AddLine(" self.generatedEvents = {} "); file.AddLine(" self.pendingEvents = {} "); file.AddLine(" self.currentHandlers= {} "); - file.AddLine(" self.knownNetworkMessages= [] "); - file.AddLine(" self.knownNetworkMessages.append(\"REQUESTNEWID\") "); - file.AddLine(" self.knownNetworkMessages.append(\"RECEIVEDDTMF\") "); - file.AddLine(" self.knownNetworkMessages.append(\"Terminating\") "); - file.AddLine(" self.knownNetworkMessages.append(\"QueryAcceptIncoming\") "); - file.AddLine(" self.knownNetworkMessages.append(\"FinishedFile\") "); char c= 34; wxString tString = wxString::Format(" self.quote = \"\\%c\"", c); file.AddLine(tString.c_str()); @@ -516,8 +510,17 @@ file.AddLine(" "); file.AddLine(" Note that the dataTuple consists of the "); file.AddLine(" eSource, eName, eData where e implies event "); + file.AddLine(" "); + file.AddLine(" For a network event: "); + file.AddLine(" eSource is the sofaID of the node who sent the message "); + file.AddLine(" eName could be what it is - like FinishedFile "); + file.AddLine(" eData (often blank), is the data part of the network message"); + file.AddLine(" For a Timer event: "); + file.AddLine(" eSource ID of the graph entity where the event was generated"); + file.AddLine(" eName The name of the timer doing the timeout "); + file.AddLine(" eData The period of time waited for "); file.AddLine(" \"\"\" "); -// file.AddLine(" print \"Network event data tuple is \", dataTuple "); + file.AddLine(" #print \"event data tuple is \", dataTuple "); file.AddLine(" self.generatedEvents[eName] = dataTuple "); file.AddLine(" reactor.callLater(0, self.processQueue, 0) "); file.AddLine(" "); @@ -622,26 +625,22 @@ file.AddLine(" "); file.AddLine(" def processReceivedMessage(self, thisMessage): "); file.AddLine(" \"\"\"Handle an ordinary message from the remote sofa server. Break the message up"); - file.AddLine(" turn it into a MyEvent message, and added to the right "); + file.AddLine(" turn it into a MyEvent message, and added to the right "); file.AddLine(" queue. On doing this, spark an event to drive queue processing. "); - file.AddLine(" Note that this method can only deal with certain predefined "); - file.AddLine(" types of messages "); + file.AddLine(" Note that this method can deal with all network messages. "); file.AddLine(" \"\"\" "); file.AddLine(" thisMessage = thisMessage.strip() "); - file.AddLine(" for msg in self.knownNetworkMessages: "); - file.AddLine(" if thisMessage.find(msg) >= 0: "); - file.AddLine(" idxc = thisMessage.find(\":\") "); - file.AddLine(" eventSource = thisMessage[0:idxc] "); - file.AddLine(" idxs = thisMessage.find(\" \") "); - file.AddLine(" if idxs < 0: "); + file.AddLine(" idxc = thisMessage.find(\":\") "); + file.AddLine(" eventSource = thisMessage[0:idxc] "); + file.AddLine(" idxs = thisMessage.find(\" \") "); + file.AddLine(" if idxs < 0: "); file.AddLine(" eventName = thisMessage[(idxc+1):] "); file.AddLine(" eventData = \"\" "); - file.AddLine(" else: "); + file.AddLine(" else: "); file.AddLine(" eventName = thisMessage[(idxc+1):] "); file.AddLine(" eventData = thisMessage[(idxs+1):] "); - file.AddLine(" eventString = eventSource + eventName "); - file.AddLine(" eTuple = (eventSource, eventName, eventData) "); - file.AddLine(" self.networkEventData(eventString, eTuple) "); + file.AddLine(" eTuple = (eventSource, eventName, eventData) "); + file.AddLine(" self.networkEventData(eventSource+eventName, eTuple) "); file.AddLine(" "); file.AddLine(" "); for (int i = 0; i < DndShape::KnownShapes; i++) { Modified: sofaswitch/trunk/callflow/src/timer.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/timer.cpp (original) +++ sofaswitch/trunk/callflow/src/timer.cpp Mon Jul 30 22:10:51 2007 @@ -104,10 +104,10 @@ file.AddLine(" print \"The timer label of \", self.data[a][\"Timer label\"], \" was unintelligible Python\" "); file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(" if b == 1: "); - file.AddLine(" #print \"Rx Timeout, now goto handler of \", self.data[a][\"Timeout Handler\"] "); - file.AddLine(" #print \"Event data is \", self.data[a][\"Event Data\"] "); - file.AddLine(" #print \"Event name is \", self.data[a][\"Event Name\"] "); - file.AddLine(" #print \"Event source is \", self.data[a][\"Event Source\"] "); + file.AddLine(" #print \"Rx Timeout, now goto handler of \", self.data[a][\"Timeout Handler\"] "); + file.AddLine(" #print \"Event data is \", self.data[a][\"Event Data\"] "); + file.AddLine(" #print \"Event name is \", self.data[a][\"Event Name\"] "); + file.AddLine(" #print \"Event source is \", self.data[a][\"Event Source\"] "); file.AddLine(" return self.data[a][\"Timeout Handler\"] "); file.AddLine(" pVbl = self.data[a][\"Event Data\"] + \" = None\" "); file.AddLine(" exec(pVbl) "); @@ -121,7 +121,7 @@ file.AddLine(" print \"The timer period of \", self.data[a][\"Timer period\"], \" was unintelligible\" "); file.AddLine(" return self.data[a][\"Output\"] "); - file.AddLine(" self.pendingEvents[eName] = (a, eName, \"\") "); + file.AddLine(" self.pendingEvents[eName] = (a, eName, str(tPeriod)) "); file.AddLine(" self.currentHandlers[eName] = a "); file.AddLine(" #print \"add an expire timer of \", tPeriod, \" seconds\" "); file.AddLine(" reactor.callLater(tPeriod, self.timerObjectExpired, eName) "); Modified: sofaswitch/trunk/callflow/tests/amplaywavfile.src ============================================================================== --- sofaswitch/trunk/callflow/tests/amplaywavfile.src (original) +++ sofaswitch/trunk/callflow/tests/amplaywavfile.src Mon Jul 30 22:10:51 2007 @@ -1,2 +1,2 @@ -10513259 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>5770331 extra <special>Tool Tip<ms>play leaving sound<ms><special>Test (Python code)<ms>self.dtmfData=="3"<ms><special> <Shape>9557337557,337,606,341<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10998400 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>910413831041,383,1080,385<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9631332631,366,685,332<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14252464 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: data associated<ms>self.dtmfData<ms><special> <Shape>21055385 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>5660332 extra <special>Tool Tip<ms>play entering sound<ms><special>Test (Python code)<ms>self.dtmfData=="2"<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>9199121199,121,214,248<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9544394606,394,602,560,544,561<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2770416 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>17516509 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"recorded_audio.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>12990548 extra <special>Tool Tip<ms>timer which, when completed -indicates the program should end<ms><special>Timer period (seconds, Python code)<ms>0.1<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <Shape>9304115304,119,344,115<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5581341 extra <special>Tool Tip<ms>Repeat instructions<ms><special>Test (Python code)<ms>self.dtmfData=="4"<ms><special> <Shape>7989497 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.amNode<ms><special> <Shape>2657421 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>16659379 extra <special>Tool Tip<ms>play entering sound<ms><special>Filename to read audio from (Python code)<ms>"../prompts/entering.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>16505364 extra <special>Tool Tip<ms>Play Rogers voice<ms><special>Filename to read audio from (Python code)<ms>"../prompts/sample_message.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>2505398 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10198248 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new am node on ", self.amNode<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.amNode != None) and (self.soundNode != None)<ms><special> <Shape>20991599 extra <special>Tool Tip<ms>Death<ms><special> <Shape>15989451 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>9266148266,148,308,270<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>21013571 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>1125698 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.soundNode<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>9302486302,486,541,509<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9266329308,329,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10292270 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>5507312 extra <special>Tool Tip<ms>Test Roger voice<ms><special>Test (Python code)<ms>self.dtmfData=="1"<ms><special> <Shape>16770378 extra <special>Tool Tip<ms>play leaving sound<ms><special>Filename to read audio from (Python code)<ms>"../prompts/leaving.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>16516561 extra <special>Tool Tip<ms>initial wav file<ms><special>Filename to read audio from (Python code)<ms>"../prompts/instructions.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>2517610 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>5991358 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>2319116 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>923994239,94,281,96<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20209119 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9214304214,304,262,356<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9291382291,386,334,382,332,395<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1118971 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.amNode<ms><special> <Shape>9264199264,513,264,635,426,639,428,199,532,202,532,262<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20275145 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9821356821,357,977,357,1018,356<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2307394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9710331710,357,795,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape> +9264199264,513,264,635,426,639,428,199,532,202,532,262<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10198248 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new am node on ", self.amNode<ms><special> <Shape>5581341 extra <special>Tool Tip<ms>Repeat instructions<ms><special>Test (Python code)<ms>self.dtmfData=="4"<ms><special> <Shape>1125698 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.soundNode<ms><special> <Shape>9821356821,357,977,357,1018,356<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2770416 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>5241359 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.amNode != None) and (self.soundNode != None)<ms><special> <Shape>2319116 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>17516509 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"recorded_audio.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>910413831041,383,1080,385<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>923994239,94,281,96<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9544394606,394,602,560,544,561<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9557337557,337,606,341<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20991599 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2657421 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>16516561 extra <special>Tool Tip<ms>initial wav file<ms><special>Filename to read audio from (Python code)<ms>"../prompts/instructions.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>21055385 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>15240412 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>20209119 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9291384291,384,331,384<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>16659379 extra <special>Tool Tip<ms>play entering sound<ms><special>Filename to read audio from (Python code)<ms>"../prompts/entering.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>9304115304,119,344,115<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9199121199,121,214,248<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2517610 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9266148266,148,308,270<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>16770378 extra <special>Tool Tip<ms>play leaving sound<ms><special>Filename to read audio from (Python code)<ms>"../prompts/leaving.wav"<ms><special>answering machine node (Python code)<ms>self.amNode<ms><special> <Shape>9631332631,366,685,332<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>21048569 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>12990548 extra <special>Tool Tip<ms>timer which, when completed +indicates the program should end<ms><special>Timer period (seconds, Python code)<ms>0.1<ms><special>Timer label (Python code)<ms>"end diagram"<ms><special> <Shape>5991358 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>10513259 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>16505364 extra <special>Tool Tip<ms>Play Rogers voice<ms><special>Filename to read audio from (Python code)<ms>"../prompts/sample_message.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>2304382 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9302486302,486,541,509<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>7989497 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.amNode<ms><special> <Shape>910405701040,570,1073,570<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14252464 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: data associated<ms>self.dtmfData<ms><special> <Shape>5770331 extra <special>Tool Tip<ms>play leaving sound<ms><special>Test (Python code)<ms>self.dtmfData=="3"<ms><special> <Shape>9266329308,329,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>15989451 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>9214308214,308,266,359<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5507312 extra <special>Tool Tip<ms>Test Roger voice<ms><special>Test (Python code)<ms>self.dtmfData=="1"<ms><special> <Shape>10998400 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>9710331710,357,795,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>20275145 extra <special>Tool Tip<ms>Death<ms><special> <Shape>5660332 extra <special>Tool Tip<ms>play entering sound<ms><special>Test (Python code)<ms>self.dtmfData=="2"<ms><special> <Shape>1118971 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.amNode<ms><special> <Shape>10292270 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>2505398 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape> Modified: sofaswitch/trunk/callflow/tests/amtest.src ============================================================================== --- sofaswitch/trunk/callflow/tests/amtest.src (original) +++ sofaswitch/trunk/callflow/tests/amtest.src Mon Jul 30 22:10:51 2007 @@ -1,4 +1,4 @@ -9321161321,162,381,161<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>7262239 extra <special>Tool Tip<ms>End the Answering -machine node.<ms><special>Worker node for termination (python code)<ms>self.amNode<ms><special> <Shape>11192116 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.amNode<ms><special> <Shape>12262288 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"deathtimer"<ms><special> <Shape>9312308312,308,312,308,312,308,312,308,312,308,352,310<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>15177229 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>15263190 extra <special>Tool Tip<ms>Make the sound node -talk to itself, so the user hears echo.<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>9242141242,141,242,141,242,141<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9242136242,136,288,136<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2177365 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9222166222,166,288,186<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2329310 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>17177276 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"recorded_audio.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>14275136 extra <special>Tool Tip<ms>wait for incoming DTMF from the sound node. -On receiving DTMF, end everything<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.eventData<ms><special> <Shape>20266340 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2220172 extra <special>Tool Tip<ms>Register for events from sound node<ms><special>Node to receive events from (Python code)<ms>"sound"<ms><special> <Shape>16177320 extra <special>Tool Tip<ms>initial wav file<ms><special>Filename to read audio from (Python code)<ms>"../prompts/instructions.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>2360161 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>119226 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>10185167 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new am node on ", self.amNode<ms><special> <Shape> +10185167 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new am node on ", self.amNode<ms><special> <Shape>16177320 extra <special>Tool Tip<ms>initial wav file<ms><special>Filename to read audio from (Python code)<ms>"../prompts/instructions.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>12262288 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"deathtimer"<ms><special> <Shape>9323158323,159,383,158<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2177365 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2220172 extra <special>Tool Tip<ms>Register for events from sound node<ms><special>Node to receive events from (Python code)<ms>"sound"<ms><special> <Shape>17177276 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"recorded_audio.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>9222166222,166,288,186<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>119226 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>15263190 extra <special>Tool Tip<ms>Make the sound node +talk to itself, so the user hears echo.<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>9242141242,141,242,141,242,141<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9242136242,136,288,136<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14275136 extra <special>Tool Tip<ms>wait for incoming DTMF from the sound node. +On receiving DTMF, end everything<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.eventData<ms><special> <Shape>2356156 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9314310314,310,314,310,314,310,314,310,314,310,354,312<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>7262239 extra <special>Tool Tip<ms>End the Answering +machine node.<ms><special>Worker node for termination (python code)<ms>self.amNode<ms><special> <Shape>20266340 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2329310 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>15177229 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>11192116 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.amNode<ms><special> <Shape> Modified: sofaswitch/trunk/callflow/tests/child.src ============================================================================== --- sofaswitch/trunk/callflow/tests/child.src (original) +++ sofaswitch/trunk/callflow/tests/child.src Mon Jul 30 22:10:51 2007 @@ -1 +1 @@ -20531142 extra <special>Tool Tip<ms>Death<ms><special> <Shape>1052893 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "CHILD says::: parent id is ", self.parentId, " child id is ", self.myId, "data from parent is ", self.userData<ms><special> <Shape>151850 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape> +1052893 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "CHILD says::: parent id is ", self.parentId, " child id is ", self.myId, "data from parent is ", self.userData<ms><special> <Shape>151850 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>20533152 extra <special>Tool Tip<ms>Death<ms><special> <Shape> Modified: sofaswitch/trunk/callflow/tests/dtmf_from_sound.src ============================================================================== --- sofaswitch/trunk/callflow/tests/dtmf_from_sound.src (original) +++ sofaswitch/trunk/callflow/tests/dtmf_from_sound.src Mon Jul 30 22:10:51 2007 @@ -1 +1 @@ -2247153 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>10105307 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "DTMF detected is ", self.dtmfData<ms><special> <Shape>116834 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>20192252 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9200135200,135,205,195<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10189195 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "timer has expired at ", time.asctime(), " ", self.timerData<ms><special> <Shape>10164131 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have a new node on ", self.newNode<ms><special> <Shape>9148379148,379,203,381,206,422<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>598354 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="*"<ms><special> <Shape>9122191180,191,122,266<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14109266 extra <special>Tool Tip<ms>Wait for DTMF from sound, to end everything.<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.dtmfData<ms><special> <Shape>10252103 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have requested a node from sound at ", time.asctime()<ms><special> <Shape>1117085 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.soundNode<ms><special> <Shape>20110395 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2183418 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9158288159,288,158,361,211,363,206,422<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9220103220,105,268,103<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape> +9220103220,105,268,103<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10105307 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "DTMF detected is ", self.dtmfData<ms><special> <Shape>10252103 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have requested a node from sound at ", time.asctime()<ms><special> <Shape>116834 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>10189195 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "timer has expired at ", time.asctime(), " ", self.timerData<ms><special> <Shape>9158288159,288,158,361,211,363,206,422<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14109266 extra <special>Tool Tip<ms>Wait for DTMF from sound, to end everything.<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.dtmfData<ms><special> <Shape>2247153 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>598354 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="*"<ms><special> <Shape>9148379148,379,203,381,206,422<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10164131 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "have a new node on ", self.soundNode<ms><special> <Shape>20110395 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9200135200,135,205,195<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2183418 extra <special>Tool Tip<ms>Suspend Processing<ms><special> <Shape>9122191180,191,122,266<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1117085 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Info to send to remote node (Python code)<ms><ms><special>Python variable: generated data<ms>self.soundNode<ms><special> <Shape>20192252 extra <special>Tool Tip<ms>Death<ms><special> <Shape>

1 0