[Sofaswitch-svn] [commit] r240 - in sofaswitch/trunk/callflow: src tests

14 Feb 2007

      Author: derek Date: Tue Feb 13 19:19:29 2007 New Revision: 240

Modified: sofaswitch/tru sofaswitch/tru sofaswitch/tru

Log: Reliability

Modified: ================= --- sofaswitch/tr +++ sofaswitch/tr @@ -78,7 +78,7 @@ file.AddLine(" file.AddLine(" file.AddLine(" -  file.AddLine(" +  file.AddLine(" file.AddLine(" file.AddLine(" file.AddLine("

Modified: ================= --- sofaswitch/tr +++ sofaswitch/tr @@ -414,7 +414,11 @@ file.AddLine(" file.AddLine(" file.AddLine(" -  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine("

file.AddLine(" file.AddLine(" @@ -439,9 +443,9 @@

file.AddLine(" -  file.AddLine(" -  file.AddLine(" -  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" file.AddLine(" file.AddLine(" file.AddLine(" @@ -453,11 +457,15 @@ file.AddLine(" file.AddLine(" file.AddLine(" -  file.AddLine(" -  file.AddLine(" -  file.AddLine(" -  file.AddLine(" -  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +//  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" file.AddLine(" file.AddLine(" file.AddLine("

Modified: ================= --- sofaswitch/tr +++ sofaswitch/tr @@ -1 +1 @@ -10<B>448<B>518<B> +15<B>190<B>450<B>

nk/callflow/src/requestnode.cpp nk/callflow/src/shapelist.cpp nk/callflow/tests/makevoipcall.src issues resolved, and cope with malformed events better. sofaswitch/trunk/callflow/src/requestnode.cpp ============================================================= unk/callflow/src/requestnode.cpp	(original) unk/callflow/src/requestnode.cpp	Tue Feb 13 19:19:29 2007 def Request_Node(self, aTuple): "); a,y,z = aTuple "); eName = self.data[a][\"Timer label\"] "); self.pendingEvents[eName] = a "); self.pendingEvents[eName] = (a, eName, \"\") "); reactor.callLater(self.data[a][\"Timer period\"], self.timerObjectExpired, eName)"); rhost = self.data[a][\"Request node from\"] "); try: "); sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================= unk/callflow/src/shapelist.cpp	(original) unk/callflow/src/shapelist.cpp	Tue Feb 13 19:19:29 2007 #found a match "); eventNode = self.currentHandlers[handler] "); eHandler = self.data[eventNode][\"Event Handler\"] "); eSource,eName,eData = self.generatedEvents.pop(event) "); try: "); eSource,eName,eData = self.generatedEvents.pop(event)"); except: "); print \"failed to read the generated events for \", event"); eSource, eName, eData = \"failed\", \"to\", \"read\" "); pVbl = self.data[eventNode][\"Event Source\"] "); pVbl += \" = \" + self.quote + eSource + self.quote "); self.DoWork(eHandler) "); self.generatedEvents.clear() "); "); def networkEventData(self, eName, data): "); self.generatedEvents.clear() "); "); def networkEventData(self, eName, dataTuple): "); \"\"\"This node has received a message from some remote node. The "); eventName is a concatanation of the sender name and the event. "); Thus, an example eventName would be voip34REQUESTNEWID. "); This method places the event on the generated events list, and "); places the data there also. "); Then, this methods asks for processing to resume "); \"\"\" "); self.generatedEvents[eName] = data "); reactor.callLater(0, self.processQueue, 0) "); "); def timerObjectExpired(self, data): "); "); Note that the dataTuple consists of the "); eSource, eName, eData where e implies event "); \"\"\" "); print \"Network event data tuple is \", dataTuple "); self.generatedEvents[eName] = dataTuple "); reactor.callLater(0, self.processQueue, 0) "); "); def timerObjectExpired(self, data): "); \"\"\"Some timer has expired. Move it from the pending list and place "); it in the active list. Then activate processing so that things move "); along "); sofaswitch/trunk/callflow/tests/makevoipcall.src ============================================================= unk/callflow/tests/makevoipcall.src	(original) unk/callflow/tests/makevoipcall.src	Tue Feb 13 19:19:29 2007 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<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>14297184 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQ<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.soundNode<ms><special> <Shape>12439683 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"hanguptime"<ms><special> <Shape>14375236 extra <special>Tool Tip<ms>A timer - did we receive a voip node before this timer fires<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<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.requestVoip<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14412261 extra <special>Tool Tip<ms>Did we rceive a sound node in time<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<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.requestSound<ms><special> <Shape>9214308309,335,214,308<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>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>15439579 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>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>9497330511,330,497,418<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14338210 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>2523304 extra <special>Tool Tip<ms>End Processing<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>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9458279458,279,511,279<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>9218518218,628,463,518<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>2438731 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14202158 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<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.voipNode<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>14204491 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>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>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<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>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2227517 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9419504419,504,420,570,464,578<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10200531 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>14501279 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voip[0-9]*Terminat<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>9464478497,478,495,572,464,578<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>10481418 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "the voip node has died ", self.eventData<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>7440632 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape> 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>14202158 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<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.voipNode<ms><special> <Shape>2227517 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<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>9464478497,478,495,572,464,578<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<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>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10448518 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<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>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>14338210 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>14412261 extra <special>Tool Tip<ms>Did we rceive a sound node in time<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<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.requestSound<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>9497330511,330,497,418<special>Tool Tip<ms>Join blocks shape<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>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2523304 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9214308309,335,214,308<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>7440632 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>12439683 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"hanguptime"<ms><special> <Shape>9458279458,279,511,279<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14501279 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voip[0-9]*Terminat<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>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>14375236 extra <special>Tool Tip<ms>A timer - did we receive a voip node before this timer fires<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<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.requestVoip<ms><special> <Shape>9218518218,628,463,518<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9506388506,388<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>15439579 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>10481418 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "the voip node has died ", self.eventData<ms><special> <Shape>14204491 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>9419504419,504,420,570,464,578<special>Tool Tip<ms>Join blocks shape<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>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>14297184 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQ<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.soundNode<ms><special> <Shape>2438731 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10200531 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>

[Sofaswitch-svn] [commit] r240 - in sofaswitch/trunk/callflow: src tests

SofaSWITCH SVN