- Sofaswitch-svn - FreeSWITCH Mailing Lists

[commit] r212 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Sun Nov 19 22:33:10 2006 New Revision: 212 Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src Log: Get the python objects to relink in, following size change. Connect all outputs of the eventer objects. Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src ============================================================================== --- sofaswitch/trunk/callflow/tests/makevoipcall.src (original) +++ sofaswitch/trunk/callflow/tests/makevoipcall.src Sun Nov 19 22:33:10 2006 @@ -1,5 +1,5 @@ -10189255 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>14333211 extra <special>Tool Tip<ms>Catch the timer which, when fired, -indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10193540 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>14370236 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<ms><special>Python variable to hold event data<ms>self.requestVoip<ms><special> <Shape>1119171 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>Timer label<ms>requestvoip<ms><special>Additional information (Python code)<ms><ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Catch the creation of -the voip node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10393450 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "End this as the voip or sound did not respond in time"<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Catch the creation -of the sound node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>1243349 extra <special>Tool Tip<ms>Initiate a timer, which causes this to -end.<ms><special>Timer period (seconds)<ms>0.1<ms><special>Timer label (string literal)<ms>hanguptime<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>965199218,629,124,630,119,203,65,199,69,215<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>15190450 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>1542257 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>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14204496 extra <special>Tool Tip<ms>Catch DTMF events<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>1043211 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>9214307214,307,308,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>742303 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>11191109 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>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>19216606 extra <special>Tool Tip<ms>Send Dtmf<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>10282279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14407261 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<ms><special>Python variable to hold event data<ms>self.requestSound<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>6189402 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>244394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5189304 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>97260418,498,391,731,7,726,18,260,66,260<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape> +14409257 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<ms><special>Python variable to hold event data<ms>self.requestSound<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>742303 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1119171 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>Timer label<ms>requestvoip<ms><special>Additional information (Python code)<ms><ms><special> <Shape>10198252 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>10293279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>15190450 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>5189304 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>19216606 extra <special>Tool Tip<ms>Send Dtmf<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>244394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2227517 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2435276 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11191109 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>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>1050213 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>14373236 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<ms><special>Python variable to hold event data<ms>self.requestVoip<ms><special> <Shape>1542257 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>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Catch the creation of +the voip node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>14204496 extra <special>Tool Tip<ms>Catch DTMF events<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>10200531 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>965199218,629,124,630,119,203,65,199,69,215<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Catch the creation +of the sound node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>97260418,498,391,731,7,726,18,260,66,260<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14333211 extra <special>Tool Tip<ms>Catch the timer which, when fired, +indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>9214307214,307,308,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>6189402 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>10403444 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "End this as the voip or sound did not respond in time"<ms><special> <Shape>1243349 extra <special>Tool Tip<ms>Initiate a timer, which causes this to +end.<ms><special>Timer period (seconds)<ms>0.1<ms><special>Timer label (string literal)<ms>hanguptime<ms><special> <Shape>

1 0

[commit] r211 - in sofaswitch/trunk: . server sound
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Sun Nov 19 22:28:58 2006 New Revision: 211 Modified: sofaswitch/trunk/allprograms.cxx sofaswitch/trunk/docs.cfg sofaswitch/trunk/message.cxx sofaswitch/trunk/server/docs.cfg sofaswitch/trunk/sound/audio.h sofaswitch/trunk/sound/docs.cfg Log: Add documentation tidyups to get it to work better. Put a link to call flow inside the list of sofa applications. Modified: sofaswitch/trunk/allprograms.cxx ============================================================================== --- sofaswitch/trunk/allprograms.cxx (original) +++ sofaswitch/trunk/allprograms.cxx Sun Nov 19 22:28:58 2006 @@ -30,11 +30,12 @@ /** \page pageSofaSwitchPrograms Current Programs in Sofa Switch -\li <a class="el" href="am/index.html"> answering machine</a> -\li <a class="el" href="mcu/index.html"> conference utility</a> -\li <a class="el" href="server/index.html"> message server</a> -\li <a class="el" href="sofa/index.html"> sofa library</a> -\li <a class="el" href="sound/index.html"> sound card utility</a> -\li <a class="el" href="voip/index.html"> voip handler</a> +\li <a class="el" href="am/index.html"> answering machine</a> +\li <a class="el" href="callflow/index.html"> call control</a> +\li <a class="el" href="mcu/index.html"> conference utility</a> +\li <a class="el" href="server/index.html"> message server</a> +\li <a class="el" href="sofa/index.html"> sofa library</a> +\li <a class="el" href="sound/index.html"> sound card utility</a> +\li <a class="el" href="voip/index.html"> voip handler</a> */ Modified: sofaswitch/trunk/docs.cfg ============================================================================== --- sofaswitch/trunk/docs.cfg (original) +++ sofaswitch/trunk/docs.cfg Sun Nov 19 22:28:58 2006 @@ -68,9 +68,9 @@ # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = . -FILE_PATTERNS = +FILE_PATTERNS = *.dxy *.cxx RECURSIVE = NO -EXCLUDE = +EXCLUDE = *.py EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = Modified: sofaswitch/trunk/message.cxx ============================================================================== --- sofaswitch/trunk/message.cxx (original) +++ sofaswitch/trunk/message.cxx Sun Nov 19 22:28:58 2006 @@ -247,25 +247,29 @@ <center> <table width="600"> <tr><td> - quitnow</td><td> Cause the server to end. On ending, every application + quitnow</td><td> + Cause the server to end. On ending, every application connected to the server will end also. </td></tr> -<tr><td> list</td><td> Cause the server to respond with a list of all the - currently connected nodes. The command "list" is - similar to the notion of presence as used in XMPP, - except that here, presence is driven by the client. +<tr><td> list</td><td> + Cause the server to respond with a list of all the currently + connected nodes. The command "list" is similar to the notion + of presence as used in XMPP, except that here, presence is + driven by the client. </td></tr> -<tr><td> whoami </td><td> A request to the server to advise us who we - are. This command is useful when we are some controller who - has connected to the server and asked the server to generate - a unique Id for us. It is also a debugging tool from the command - prompt case - we can enquire of the server to report our ID. +<tr><td> whoami </td><td> + A request to the server to advise us who we are. This command + is useful when we are some controller who has connected to + the server and asked the server to generate a unique Id for + us. It is also a debugging tool from the command prompt case + - we can enquire of the server to report our ID. </td></tr> -<tr><td>adviseontermination remNode</td><td>This commands the server to (on - this node terminating) send a message to the specified node - (remNode). The message will advise remNode that this this - node has died. Thus, the controller will get a message if the - box running the answer machine (for example) is unplugged. +<tr><td>adviseontermination remNode</td><td> + This commands the server to (on this node terminating) send a + message to the specified node (remNode). The message will + advise remNode that this this node has died. Thus, the + controller will get a message if the box running the answer + machine (for example) is unplugged. </td></tr> </table> </center> Modified: sofaswitch/trunk/server/docs.cfg ============================================================================== --- sofaswitch/trunk/server/docs.cfg (original) +++ sofaswitch/trunk/server/docs.cfg Sun Nov 19 22:28:58 2006 @@ -180,7 +180,7 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = +PREDEFINED = DOC_PLUS_PLUS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Sun Nov 19 22:28:58 2006 @@ -17,8 +17,6 @@ /**The base class for reading and writing audio from/to the sound device. This class will take audio to/from the PUDPSocket, and transfer it to/from the sound device */ -class PQueueChannel; - class TestAudio : public PThread { PCLASSINFO(TestAudio, PThread); @@ -90,8 +88,7 @@ /**Constructor */ TestAudioWrite(PUDPSocket &_socket, PSoundChannel &_sound); - /**Destructor. This deletes the PQueueChannel we allocated in the - constructor */ + /**Destructor. This does any required tidy ups.*/ ~TestAudioWrite(); /**the main entry point, where this thread starts */ Modified: sofaswitch/trunk/sound/docs.cfg ============================================================================== --- sofaswitch/trunk/sound/docs.cfg (original) +++ sofaswitch/trunk/sound/docs.cfg Sun Nov 19 22:28:58 2006 @@ -109,7 +109,7 @@ HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = -HTML_STYLESHEET = YES +HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = @@ -180,7 +180,7 @@ SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = +PREDEFINED = DOC_PLUS_PLUS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #---------------------------------------------------------------------------

1 0

[commit] r210 - in sofaswitch/trunk/callflow: docs/current src tests
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Sun Nov 19 19:37:21 2006 New Revision: 210 Added: sofaswitch/trunk/callflow/tests/child.src sofaswitch/trunk/callflow/tests/parent.src Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy sofaswitch/trunk/callflow/src/loadnewgraph.cpp sofaswitch/trunk/callflow/src/shapelist.cpp Log: Add a child and parent file, which illustrate the load new graph item. Add code to the loadnewgraph functions to do the things described in the documentation. Add to the documentation so that it describes correctly how loadnewgraph works. Add to the generated python code the notion of self.parentId, and the ability to pass variable data from the parent to the child. Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Sun Nov 19 19:37:21 2006 @@ -363,8 +363,15 @@ As a convenience, the child process always has a Python variable, "self.parentId" defined, which contains the id of the child process. The child -may send a message (via the server) to the parent Id indicating status. +may send a message (via the server) to the parent Id indicating status. The +variable "self.parentId" is None, if there is no parent. +The data (or Python variable) specified in the bottom rectangle of the +properties window is contained in Python variable, "self.userData" of the +child graph. This variable is None, if no data was specified. If there is an +error in processing the specified variable, None will be assigned to +"self.userData" + The graph in the figure \image html exloadnewgraph.png illustrates the operation of this item. There are two event handlers setup, @@ -380,7 +387,11 @@ \li if the parent graph is itself a child graph, only the processing of the parent graph is terminated. - +As a convenience, when the child dies, the server will automatically send an +"Advise on termination message" to the parent. Thus, the parent has a way of +knowing when a child graph terminates. There is no error if the parent has +died before the child. In this case, the "advice on termination" mesasge is +never sent - the server has nowhere to send it. Modified: sofaswitch/trunk/callflow/src/loadnewgraph.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/loadnewgraph.cpp (original) +++ sofaswitch/trunk/callflow/src/loadnewgraph.cpp Sun Nov 19 19:37:21 2006 @@ -29,6 +29,9 @@ displayData[displayData.size()] = InformationSection(wxT("new graph file (Python code)"), wxT("\"file_graph\"")); + displayData[displayData.size()] = + InformationSection(wxT("Python variable to pass to child"), wxT("self.data[a]")); + AdjustIoPoints(); } @@ -69,14 +72,20 @@ file.AddLine(" def Load_New_Graph(self, sTuple): "); file.AddLine(" a,b,c = sTuple "); file.AddLine(" try: "); - file.AddLine(" self.fname = eval(self.data[a][\"new graph file\"]) "); + file.AddLine(" self.udata = (self.myId, eval(self.data[a][\"user variable\"]) )"); file.AddLine(" except: "); + file.AddLine(" self.udata = (self.myId, None) "); + file.AddLine(" "); + file.AddLine(" try: "); + file.AddLine(" self.fname = eval(self.data[a][\"new graph file\"]) "); + file.AddLine(" except: "); file.AddLine(" print \"The new graph file \", self.data[a][\"new graph file\"], \" is not a valid Python string\" "); file.AddLine(" self.fname = None "); file.AddLine(" f = MyFactory() "); file.AddLine(" f.isMaster = False "); file.AddLine(" f.setGraph(self.fname) "); file.AddLine(" f.setMaster(False) "); + file.AddLine(" f.setUserData(self.udata) "); file.AddLine(" reactor.connectTCP(sofaServer, 5000, f) "); file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(""); @@ -100,6 +109,10 @@ file.AddLine(wxString::Format(" \"new graph file\" : ")); wxString dest = ProtectString(displayData[1].data); + file.AddLine(wxString::Format(" \"%s\", ", dest.c_str())); + + file.AddLine(wxString::Format(" \"user variable\" : ")); + dest = ProtectString(displayData[2].data); file.AddLine(wxString::Format(" \"%s\", ", dest.c_str())); file.AddLine(wxString::Format(" },")); Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Sun Nov 19 19:37:21 2006 @@ -310,6 +310,7 @@ 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(\"\") "); char c= 34; wxString tString = wxString::Format(" self.quote = \"\\%c\"", c); @@ -322,6 +323,16 @@ file.AddLine(" process that was invoked from the command line. "); file.AddLine(" \"\"\" "); file.AddLine(" self.isMaster = newIsMaster "); + file.AddLine(" "); + file.AddLine(" def setUserData(self, newData): "); + file.AddLine(" \"\"\"transfer data process, which is required when we "); + file.AddLine(" create a child graph of a parent graph, when we have "); + file.AddLine(" spawned a new process. The variable self.parentId is "); + file.AddLine(" the id of the parent, or None, if there is no parent "); + file.AddLine(" The variable self.userData contains the data transferred, "); + file.AddLine(" or None, if there is no data data transferred. "); + file.AddLine(" \"\"\" "); + file.AddLine(" self.parentId, self.userData = newData "); file.AddLine(" "); file.AddLine(" def setGraphData(self, graphFile): "); file.AddLine(" \"\"\"Read in the file which describes where the flow "); @@ -493,6 +504,11 @@ file.AddLine(" if self.countReceived == 1: "); file.AddLine(" self.myId = oneMessage; "); file.AddLine(" self.timeout2 = reactor.callLater(0, self.startTimerExpired, \"connected\")"); + file.AddLine(" try: "); + file.AddLine(" self.tmsg= \"AdviseOnTermination \" + self.parentId + \"\\0\" "); + file.AddLine(" self.transport.write(self.tmsg) "); + file.AddLine(" except: "); + file.AddLine(" self.tmsg = None "); file.AddLine(" else: "); file.AddLine(" self.processReceivedMessage(oneMessage)"); file.AddLine(" "); @@ -555,6 +571,7 @@ file.AddLine(" self.myController = p "); file.AddLine(" self.myController.setGraphData(self.myGraphName) "); file.AddLine(" self.myController.setMaster(self.isMaster) "); + file.AddLine(" self.myController.setUserData(self.userData) "); file.AddLine(" return p "); file.AddLine(" "); file.AddLine(" def setGraph(self, newName): "); @@ -563,10 +580,14 @@ file.AddLine(" def setMaster(self, newMaster): "); file.AddLine(" self.isMaster = newMaster "); file.AddLine(" "); + file.AddLine(" def setUserData(self, newData): "); + file.AddLine(" self.userData = newData "); file.AddLine(" "); + file.AddLine(" "); file.AddLine("f = MyFactory() "); file.AddLine(wxString::Format("f.setGraph(\"%s\") ", graphFileName.c_str())); file.AddLine("f.setMaster(True) "); + file.AddLine("f.setUserData((None, None)) "); file.AddLine("reactor.connectTCP(sofaServer, 5000, f) "); file.AddLine("reactor.run() "); file.AddLine(" "); Added: sofaswitch/trunk/callflow/tests/child.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/child.src Sun Nov 19 19:37:21 2006 @@ -0,0 +1 @@ +20531142 extra <special>Tool Tip<ms>Death<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, " user data is ", self.userData<ms><special> <Shape> Added: sofaswitch/trunk/callflow/tests/parent.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/parent.src Sun Nov 19 19:37:21 2006 @@ -0,0 +1 @@ +14574226 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable to hold event data<ms>self.termTime<ms><special> <Shape>14533200 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer<ms><special>Python variable to hold event data<ms>self.eventData<ms><special> <Shape>1851899 extra <special>Tool Tip<ms>Load New Graph<ms><special>new graph file (Python code)<ms>"child.graph"<ms><special>Python variable to pass to child<ms>self.data[a]<ms><special> <Shape>2564314 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>151850 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2599249 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20534247 extra <special>Tool Tip<ms>Death<ms><special> <Shape>10572265 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "child has terminated", self.termTime<ms><special> <Shape>12519146 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>10<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <Shape>

1 0

[commit] r209 - sofaswitch/trunk/server
by SofaSWITCH SVN 19 Nov '06

19 Nov '06

Author: derek Date: Sun Nov 19 18:20:19 2006 New Revision: 209 Modified: sofaswitch/trunk/server/main.cxx Log: Remove a message to the console. Modified: sofaswitch/trunk/server/main.cxx ============================================================================== --- sofaswitch/trunk/server/main.cxx (original) +++ sofaswitch/trunk/server/main.cxx Sun Nov 19 18:20:19 2006 @@ -360,8 +360,6 @@ if (!adviseOnTermination.IsEmpty()) { PStringStream msg; - cerr << "send terminating message to "<< adviseOnTermination << " from " - << sourceId << endl; msg << sourceId << ":Terminating"; PSafePtr <TcpConnection> conn = manager.GetConnectionWithLock(adviseOnTermination, PSafeReadOnly);

1 0

[commit] r208 - sofaswitch/trunk/callflow/docs
by SofaSWITCH SVN 19 Nov '06

19 Nov '06

Author: derek Date: Sun Nov 19 17:02:21 2006 New Revision: 208 Added: sofaswitch/trunk/callflow/docs/deathexample.png (contents, props changed) Log: Add an example to illustrate the operation of the death icon Added: sofaswitch/trunk/callflow/docs/deathexample.png ============================================================================== Binary file. No diff available.

1 0

[commit] r207 - in sofaswitch/trunk/callflow/docs: . current
by SofaSWITCH SVN 19 Nov '06

19 Nov '06

Author: derek Date: Sun Nov 19 17:01:03 2006 New Revision: 207 Added: sofaswitch/trunk/callflow/docs/exloadnewgraph.png (contents, props changed) Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy Log: Add documentation on icons on the screen, and an explanatory graph. Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Sun Nov 19 17:01:03 2006 @@ -8,13 +8,15 @@ The control structures described in this page are \li \ref subsecConditional +\li \ref subsecDeath \li \ref subsecEndCall \li \ref subsecEndFor -\li \ref subsecEndEverything \li \ref subsecEndProcessing \li \ref subsecEventer \li \ref subsecJoinObjects +\li \ref subsecLoadNewGraph \li \ref subsecMakeCall +\li \ref subsecPython \li \ref subsecReadFromFile \li \ref subsecRequestNode \li \ref subsecStartFlow @@ -61,11 +63,77 @@ +\subsection subsecConditional Conditional execution +The toolbar icon and a rendering of a drawing area shape for the "Conditional" +item is shown below. +<CENTER><TABLE frame=void border=0><TR><TD> +\image html ControlsIf.png +</TD><TD> +           +</TD><TD> +\image html conditional.png +</TD></TR> +</TABLE></CENTER> +On clicking the right mouse button on this shape, a window comes up. The tool +tip is as described before. The condition, which is evaluated is a Python +expression. Should this expression not be valid, a message will be printed to +the display when the compiled code is executed. + +On evaluation of the compiled code, execution switches to the bottom (True +result) or right output (False result). +\subsection subsecDeath Death - terminate processing of this graph +The toolbar icon and a rendering of a drawing area shape for the "Death" +item is shown below. +<CENTER><TABLE frame=void border=0><TR><TD> +\image html bitmaps/death.png +</TD><TD> +           +</TD><TD> +\image html current/Death.png +</TD></TR> +</TABLE></CENTER> + + + + +On clicking the right mouse button on this shape, a window comes up. The tool +tip is as described before. + +On evaluation of the compiled code, execution of all elements in this graph +is terminated. All current or pending events are ignored. All outstanding +timers are ignored. + +If a worker node was created as part of procesing this graph, the node will +not be terminated by this item. + +There are some weird anomalies with this icon that illustrate the actual +processing of the graph. +Consider the three item graph in the figure +\image html deathexample.png + +In the first item, a link with the server is created, and an id is assigned to +this graph. The second item causes a message to be sent to some SofaSwitch +application to request a node. The third item causes the id assigned to this +graph to be deleted. Of interest is that the request for a new node (from the +second item) is never sent to the SofaSwitch application. This happens because +the Twisted framework (that is used to process this graph) is waiting for +execution to fall into a \ref subsecEndProcessing item before sending messages +and handling timer/network events. Since execution fell into this "Death" +icon, which terminated the connection to the server for this graph, there is +no way messages can be sent. + + + + + + + + \subsection subsecEndCall End a call End a call to some external entity is indicated by the toolbar icon and drawing area image of @@ -121,22 +189,7 @@ -\subsection subsecEndEverything End Everything -The toolbar icon and a rendering of a drawing area shape for the "End Everything" -item is shown below. -<CENTER><TABLE frame=void border=0><TR><TD> -\image html bitmaps/death.png -</TD><TD> -           -</TD><TD> -\image html current/Death.png -</TD></TR> -</TABLE></CENTER> -This icon initiates immediate closure of this Python instance. The connection -to the remote server is severed immediately. All pending TCP messages that we -were to have sent out are dropped. All pending timer events are -ignored. Further, processing will not ever return to any part of this graph. @@ -144,25 +197,15 @@ - - - - - - - - - - \subsection subsecEndProcessing End Graph Processing The toolbar icon and a rendering of a drawing area shape for the "End Graph Processing" item is shown below. <CENTER><TABLE frame=void border=0><TR><TD> -\image html bitmaps/ControlsEndHere.png +\image html ControlsEndHere.png </TD><TD>            </TD><TD> -\image html current/endflow.png +\image html endflow.png </TD></TR> </TABLE></CENTER> @@ -289,13 +332,60 @@ +\subsection subsecLoadNewGraph Load new graph +The toolbar icon and a rendering of a drawing area shape for the "Load New +Graph" item is shown below. +<CENTER><TABLE frame=void border=0><TR><TD> +\image html newgraph.png +</TD><TD> +           +</TD><TD> +\image html loadnewgraph.png +</TD></TR> +</TABLE></CENTER> +This item provides the means to extend one graph so that it can launch child +processes. It is similar to the C command "system", except that control +returns immediately to the parent process and does not wait for execution to +finish in the child process. +It is not similar to threads in C, as the child process does not have access +to the memory of the parent process. Nor is it similar to "fork()" in C, as +there is no duplication of the parent process. +On clicking the right mouse button on this shape, a window comes up. The tool +tip is as described before. We suggest that the tool tip is changed to contain +a short description of the child process that is to be launched. The second +box describes the name of the graph file which is to be executed in the child +process. The third box describes the Python variable which is to be passed to +the child process. +As a convenience, the child process always has a Python variable, +"self.parentId" defined, which contains the id of the child process. The child +may send a message (via the server) to the parent Id indicating status. +The graph in the figure +\image html exloadnewgraph.png +illustrates the operation of this item. There are two event handlers setup, +and on detection of the specified event, a new graph is loaded and +processed. Thus, one can handle different incoming calls with different +graphs. On the third kind of event, the \ref subsecDeath item is handled. +In a child graph, the terminate processing item will only end that child +graph, and that child graph Id. In the parent graph, the terminate processing +item will do one of two things +\li if the parent graph was directly created by running Python from the + command line, the parent and all child graphs are destroyed dead. +\li if the parent graph is itself a child graph, only the processing of the + parent graph is terminated. + + + + + + + \subsection subsecMakeCall Make a call Make a call to some external entity is indicated by the toolbar icon and drawing area image of @@ -329,7 +419,28 @@ +\subsection subsecPython Python command +Execution of an arbitrary Python command is indicated by the toolbar icon and drawing area +image of +<CENTER><TABLE frame=void border=0><TR><TD> +\image html Python.png +</TD><TD> +           +</TD><TD> +\image html python.png +</TD></TR> +</TABLE></CENTER> +On clicking the right mouse button on this shape, a window comes up. The tool +tip is as described before. It is suggested that you change the tool tip to +describe in a couple of words the purpose of the Python code. + +The arbitrary Python code which is to be executed is entered in the lower box +of the displayed window. You have access to all the internal variables used +in the execution of this graph. It is possible to simply put a print statement +in there as a debugging technique. It is encouraged that you put short, +quickly executed statements here, as all other actions are suspended while +processing this item. Added: sofaswitch/trunk/callflow/docs/exloadnewgraph.png ============================================================================== Binary file. No diff available.

1 0

[commit] r206 - sofaswitch/trunk/callflow/docs/current
by SofaSWITCH SVN 16 Nov '06

16 Nov '06

Author: derek Date: Wed Nov 15 23:24:37 2006 New Revision: 206 Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy Log: Fix an incorrect statement. The correct statement is that the command hangup, or "End Call" in callflow terminology, causes a worker node to die. Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Wed Nov 15 23:24:37 2006 @@ -87,10 +87,8 @@ endeavour to end a call not yet in existance, no damage will result. The remote worker node will ignore this command. -This command will not cause the remote worker node to die. Thus, one could -hangup the call, and then make a new call on the same worker node. - - +This command causes the remote worker node to die. Thus, one could +hangup the call, and then create a new worker node to make a new call. \subsection subsecEndFor End For Loop

1 0

[commit] r205 - sofaswitch/trunk/callflow/docs/current
by SofaSWITCH SVN 16 Nov '06

16 Nov '06

Author: derek Date: Wed Nov 15 23:20:36 2006 New Revision: 205 Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy Log: Add description for more icons in the tool bar. Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Wed Nov 15 23:20:36 2006 @@ -9,6 +9,7 @@ The control structures described in this page are \li \ref subsecConditional \li \ref subsecEndCall +\li \ref subsecEndFor \li \ref subsecEndEverything \li \ref subsecEndProcessing \li \ref subsecEventer @@ -17,6 +18,7 @@ \li \ref subsecReadFromFile \li \ref subsecRequestNode \li \ref subsecStartFlow +\li \ref subsecStartFor \li \ref subsecTimer \li \ref subsecTransferMedia \li \ref subsecWriteToFile @@ -91,6 +93,36 @@ +\subsection subsecEndFor End For Loop + +The end for loop item is indicated by the toolbar icon and drawing area +image of + +<CENTER><TABLE frame=void border=0><TR><TD> +\image html Controlsend_for.png +</TD><TD> +           +</TD><TD> +\image html endfor.png +</TD></TR> +</TABLE></CENTER> + + +On clicking the right mouse button on this shape, a window comes up. The tool +tip is as described before. There are no other options relevant to this +icon. All initialisation and loop increments are handled in the \ref +subsecStartFor item. + +Remember that if you set up a busy wait loop where execution cannot move into +an \ref subsecEndProcessing item, there will be no sending of messages, and no +event handling. + + + + + + + \subsection subsecEndEverything End Everything The toolbar icon and a rendering of a drawing area shape for the "End Everything" item is shown below. @@ -435,6 +467,52 @@ +\subsection subsecStartFor Start For Loop + +The start for loop item is indicated by the toolbar icon and drawing area +image of + +<CENTER><TABLE frame=void border=0><TR><TD> +\image html Controlsfor.png +</TD><TD> +           +</TD><TD> +\image html startfor.png +</TD></TR> +</TABLE></CENTER> + + +On clicking the right mouse button on this shape, a window comes up. The tool +tip is as described before. + +The second box describes the initialisation code. Note that all elements of +this graph will have access to the variable used here. The termination test +and increment are in the second and third boxes. + +The flow of execution is identical to that in the for loop of C. The +initialisation is done, and then the test is carried out. If the test returns +True, execution moves to the item directly below the start for loop. If +the test returns False, execution moves to the connected \ref subsecEndFor and +down. + +At the end of the loop, execution moves back from the connected \ref +subsecEndFor, the increment is carried out, and then the test is +performed. Execution moves to the next item as before. + +It is entirely legal to set up a for loop where there is no initialisation +statement, the test returns True, and no increment statement. In this case, +you have a loop that will run for ever. The graph should include some path +that will take the execution away from this loop. + +Remember that if you set up a busy wait loop where execution cannot move into +an \ref subsecEndProcessing item, there will be no sending of messages, and no +event handling. + + + + + + \subsection subsecTimer Timer A timer is indicated by the toolbar icon and drawing area image of <CENTER><TABLE frame=void border=0><TR><TD> @@ -530,6 +608,11 @@ controller is managing an incoming voip call. The voip call can be connected to an answering machine, then to a conference room, then to second voip call etc. In this way, one can get the controller to replicate an IVR system. + + + + + \subsection subsecWriteToFile Write to file Write to file is an answering machine specific function, and is indicated by

1 0

[commit] r204 - sofaswitch/trunk/callflow/docs/current
by SofaSWITCH SVN 15 Nov '06

15 Nov '06

Author: derek Date: Wed Nov 15 16:02:54 2006 New Revision: 204 Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy Log: Add docs on the transfer media command. Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Wed Nov 15 16:02:54 2006 @@ -18,6 +18,7 @@ \li \ref subsecRequestNode \li \ref subsecStartFlow \li \ref subsecTimer +\li \ref subsecTransferMedia \li \ref subsecWriteToFile All of the control structures in this application have optional parameters. @@ -484,6 +485,52 @@ +\subsection subsecTransferMedia Transfer Media +Transfer media is relevant to all worker nodes in a running SofaSwitch +installation, and is indicated by +the toolbar icon and drawing area image of +<CENTER><TABLE frame=void border=0><TR><TD> +\image html transfermedia.png +</TD><TD> +           +</TD><TD> +\image html TransferMedia.png +</TD></TR> +</TABLE></CENTER> + +On clicking the right mouse button on this shape, a window comes up. The tool +tip is as described before. + +The second and third boxes of the window describe the two sofa switch worker +nodes which need to send audio between them. + +To illustrate, suppose we wish to record an incoming voip call. In this case, +we will request&create a voip and an answering machine node. Then, issue this +command to one of the two created nodes. It is not our responsibility to worry +abount media format, or ports/addresses. It is our responsibility to issue the +connect command. + +Alternatively, suppose we wish to connect one TDM (standard phone line) call +to another TDM call. In this case, both TDM worker nodes happen to be on the +same machine, via the same phone card. On reception of the Transfer Media +command, the nodes will do a direct bridging of the audio between them. + +From the \ref subsecRequestNode subsection, we noted that a worker node will +exist for two seconds, and if not used in that time is silently deleted. One +way of preventing that death is to do a Transfer Media command to that node +just created. + +Transfer Media has some peculiar aspects. It is quite acceptable to create a +voip node, and transfer media back to the same voip node. In this case, the +remote h.323 endpoint will hear their audio echoed back to them. It is also +acceptable to specify an incorrect id of the second node. Thus, create a voip +node,and then issue the transfer media command to a non existantant id. + +It is acceptable to issue multiple Transfer Media commands. Thus, suppose the +controller is managing an incoming voip call. The voip call can be connected +to an answering machine, then to a conference room, then to second voip call +etc. In this way, one can get the controller to replicate an IVR system. + \subsection subsecWriteToFile Write to file Write to file is an answering machine specific function, and is indicated by the toolbar icon and drawing area image of @@ -511,7 +558,7 @@ Should you specify an invalid file to write to, no audio will be written. -You may specify the file in which to write audio to at any time after the creation of the -answering machine worker node. +You may specify the file in which to write audio to at any time after the +creation of the answering machine worker node. */ \ No newline at end of file

1 0

[commit] r203 - sofaswitch/trunk/callflow/docs/current
by SofaSWITCH SVN 15 Nov '06

15 Nov '06

Author: derek Date: Wed Nov 15 14:48:40 2006 New Revision: 203 Added: sofaswitch/trunk/callflow/docs/current/TransferMedia.png (contents, props changed) Removed: sofaswitch/trunk/callflow/docs/current/transfermedia.png Log: Rename file. Added: sofaswitch/trunk/callflow/docs/current/TransferMedia.png ============================================================================== Binary file. No diff available.

1 0