[Sofaswitch-svn] [commit] r185 - sofaswitch/trunk/callflow/src

13 Nov 2006

      Author: derek Date: Mon Nov 13 16:22:10 2006 New Revision: 185

Modified: sofaswitch/tru sofaswitch/tru sofaswitch/tru sofaswitch/tru sofaswitch/tru sofaswitch/tru sofaswitch/tru sofaswitch/tru

Log: Protect try/except everything printout of what is wrong.

Modified: ================= --- sofaswitch/tr +++ sofaswitch/tr @@ -41,15 +41,25 @@ { wxString file.AddLine(header); -    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(" + if (kind == MakeCall) -	file.AddLine(" +	file.AddLine(" else -	file.AddLine(" -    file.AddLine(" -    file.AddLine(" -    file.AddLine(""); +	file.AddLine(" +    file.AddLine(" +    file.AddLine(" +    file.AddLine("

return true; }

Modified: ================= --- sofaswitch/tr +++ sofaswitch/tr @@ -124,7 +124,11 @@ 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 @@ -68,10 +68,14 @@ { 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 @@ -56,10 +56,13 @@

bool DndShapePyt { -  file.AddLine(" -  file.AddLine(" -  file.AddLine(" -  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" +  file.AddLine(" file.AddLine("");

return true;

Modified: ================= --- sofaswitch/tr +++ sofaswitch/tr @@ -81,10 +81,18 @@ 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 @@ -39,8 +39,19 @@ { 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 @@ -388,7 +388,10 @@ 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 @@ -69,12 +69,24 @@

bool DndShapeTra { -    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(" + +    file.AddLine(" +    file.AddLine(" file.AddLine("");

return true;

nk/callflow/src/callstartstop.cpp nk/callflow/src/eventer.cpp nk/callflow/src/loadnewgraph.cpp nk/callflow/src/python.cpp nk/callflow/src/requestnode.cpp nk/callflow/src/senddtmf.cpp nk/callflow/src/shapelist.cpp nk/callflow/src/transfermedia.cpp every usage of the Python eval and exec with a clause. Thus, the user cannot terminate execution of with a minor syntax error. Further, we get a more useful sofaswitch/trunk/callflow/src/callstartstop.cpp ============================================================= unk/callflow/src/callstartstop.cpp	(original) unk/callflow/src/callstartstop.cpp	Mon Nov 13 16:22:10 2006 header = wxString::Format("   def %s(self, sTuple):", (kind == MakeCall ? "Make_Call" : "End_Call")); a,b,c = sTuple          "); rhost = eval(self.data[a][\"worker node\"])          "); a,b,c = sTuple                                                                          "); try:                                                                                    "); self.rhost = eval(self.data[a][\"worker node\"])                                          "); except:                                                                                 "); print \"The worker node string \", self.data[a][\"worker node\"], \" could not be evaluated as a python string\" "); self.rhost = None                                                                                                     "); try:                                                                                                                "); self.dest = eval(self.data[a][\"call destination\"])                                                                  "); except:                                                                                                             "); print \"The destination string \", self.data[a][\"call destination\"], \" could not be evaluated as a python string\" "); self.dest = None                                                                                                           "); rhost += \":CALLNODE \" + eval(self.data[a][\"call destination\"]) + \"\\0\"    "); self.rhost += \":CALLNODE \" + self.dest + \"\\0\"                                                              "); rhost += \":HANGUP \\0\"            "); self.transport.write(rhost)             "); return  self.data[a][\"Output\"]       "); self.rhost += \":HANGUP \\0\"                                                                                   "); self.transport.write(self.rhost)                                                        "); return  self.data[a][\"Output\"]                                                        "); "); sofaswitch/trunk/callflow/src/eventer.cpp ============================================================= unk/callflow/src/eventer.cpp	(original) unk/callflow/src/eventer.cpp	Mon Nov 13 16:22:10 2006 a,b,c = sTuple                                                                      "); pVbl = self.data[a][\"Event Variable\"]                                             "); pVbl += \" = None\"                                                                 "); exec(pVbl)                                                                          "); try:                                                                                "); exec(pVbl)                                                                       "); except:                                                                             "); pVbl = self.data[a][\"Event Variable\"]                                          "); print \"The Python variable \", pVbl, \" to hold event output could not be initialisd\" "); ePyn = self.data[a][\"Event Python\"]                                               "); eReg = self.data[a][\"Event RegExp\"]                                               "); if len(ePyn) > 0:                                                                   "); sofaswitch/trunk/callflow/src/loadnewgraph.cpp ============================================================= unk/callflow/src/loadnewgraph.cpp	(original) unk/callflow/src/loadnewgraph.cpp	Mon Nov 13 16:22:10 2006 def Load_New_Graph(self, sTuple):                           "); a,b,c = sTuple                                           "); fname = eval(self.data[a][\"new graph file\"])           "); try:                                                     "); self.fname = eval(self.data[a][\"new graph file\"])   "); except:                                                  "); print \"The new graph file \", self.data[a][\"new graph file\"], \" is not a valid Python string\" "); self.fname = None                                     "); f = MyFactory()                                          "); f.isMaster = False                                       "); f.setGraph(fname)                                        "); f.setGraph(self.fname)                                   "); f.setMaster(False)                                       "); reactor.connectTCP(sofaServer, 5000, f)                  "); return  self.data[a][\"Output\"]                         "); sofaswitch/trunk/callflow/src/python.cpp ============================================================= unk/callflow/src/python.cpp	(original) unk/callflow/src/python.cpp	Mon Nov 13 16:22:10 2006 hon::WriteSystemCode(wxTextFile & file) def Python(self, sTuple): "); a,b,c = sTuple"); exec(self.data[a][\"Python Code\"])"); return  self.data[a][\"Output\"]"); def Python(self, sTuple):                           "); a,b,c = sTuple                                   "); try:                                             "); exec(self.data[a][\"Python Code\"])          "); except:                                          "); print \"Python code \", self.data[a][\"Python Code\"], \" could not be executed\" "); return  self.data[a][\"Output\"]                 "); sofaswitch/trunk/callflow/src/requestnode.cpp ============================================================= unk/callflow/src/requestnode.cpp	(original) unk/callflow/src/requestnode.cpp	Mon Nov 13 16:22:10 2006 self.pendingEvents[eName] = a                                                    "); reactor.callLater(self.data[a][\"Timer period\"], self.timerObjectExpired, eName)"); rhost = self.data[a][\"Request node from\"]                                      "); rhost = eval(rhost) + \":REQUESTNEWID \"                                         "); try:                                                                             "); rhost = eval(rhost) + \":REQUESTNEWID \"                                      "); except:                                                                          "); print \"Could not process \",  self.data[a][\"Request node from\"], \" as a python string\" "); return self.data[a][\"Output\"]                                               "); additional = self.data[a][\"Additional info\"]                                   "); if len(additional) > 0:                                                          "); rhost += eval(additional)                                                     "); try:                                                                          "); rhost += eval(additional)                                                  "); except:                                                                       "); print \"Could not process \", additional, \" as a Python string \"         "); return self.data[a][\"Output\"]                                             "); rhost +=  \"\\0\"                                                                "); self.transport.write(rhost)                                                      "); return self.data[a][\"Output\"]                                                  "); sofaswitch/trunk/callflow/src/senddtmf.cpp ============================================================= unk/callflow/src/senddtmf.cpp	(original) unk/callflow/src/senddtmf.cpp	Mon Nov 13 16:22:10 2006 def Send_Dtmf(self, sTuple):                                                       "); a,b,c = sTuple                                                                  "); rhost = eval(self.data[a][\"worker node\"])                                     "); rhost += \":SENDDTMF \" + eval(self.data[a][\"dtmf to send\"]) + \"\\0\"        "); try:                                                                            "); rhost = eval(self.data[a][\"worker node\"])                                  "); except:                                                                         "); print \"Could not process \", self.data[a][\"worker node\"], \" as a Python string\" "); return  self.data[a][\"Output\"]                                             "); self.sendDtmf= self.data[a][\"dtmf to send\"]                                   "); try:                                                                            "); rhost += \":SENDDTMF \" + eval(self.sendDtmf) + \"\\0\"                      "); except:                                                                         "); print \"Could not process \", self.sendDtmf, \" as a Python string\"         "); return  self.data[a][\"Output\"]                                             "); self.transport.write(rhost)                                                     "); return  self.data[a][\"Output\"]                                                "); sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================= unk/callflow/src/shapelist.cpp	(original) unk/callflow/src/shapelist.cpp	Mon Nov 13 16:22:10 2006 eHandler = self.data[eventNode][\"Event Handler\"]      "); pVbl = self.data[eventNode][\"Event Variable\"]         "); pVbl += \" = \" + self.quote + eventData + self.quote   "); exec(pVbl)                                              "); try:                                                    "); exec(pVbl)                                          "); except:                                                 "); print \"An internal error processing \", pVbl       "); self.DoWork(eHandler)                                   "); self.generatedEvents.clear()                        "); "); sofaswitch/trunk/callflow/src/transfermedia.cpp ============================================================= unk/callflow/src/transfermedia.cpp	(original) unk/callflow/src/transfermedia.cpp	Mon Nov 13 16:22:10 2006 nsferMedia::WriteSystemCode(wxTextFile & file) def Transfer_Media(self, sTuple):                                                  "); a,b,c = sTuple                                                                  "); rhost = eval(self.data[a][\"worker node\"])                                     "); rhost += \":TRANSFERUDP \" + eval(self.data[a][\"worker receiver\"]) + \"\\0\"  "); self.transport.write(rhost)                                                     "); return self.data[a][\"Output\"]                                                 "); def Transfer_Media(self, sTuple):                                                       "); a,b,c = sTuple                                                                       "); self.tMedia = self.data[a][\"worker node\"]                                          "); try:                                                                                 "); self.rhost = eval(self.tMedia)                                                    "); except:                                                                              "); print \"The Worker node Python \", self.tMedia, \" could not be evaluated\"       "); return self.data[a][\"Output\"]                                                   "); self.wNode = self.data[a][\"worker receiver\"]                                       "); try:                                                                                 "); self.rhost += \":TRANSFERUDP \" + eval(self.wNode) + \"\\0\"                      "); except:                                                                              "); print \"The node to transfer media to \", self.wNode, \" could not be evaluated\" "); return self.data[a][\"Output\"]                                                   "); self.transport.write(self.rhost)                                                     "); return self.data[a][\"Output\"]                                                      ");

[Sofaswitch-svn] [commit] r185 - sofaswitch/trunk/callflow/src

SofaSWITCH SVN