[sr-dev] git:master: utils/route_graph: support for event route

Daniel-Constantin Mierla miconda at gmail.com
Tue Sep 7 20:47:37 CEST 2010


Module: sip-router
Branch: master
Commit: 43c5c9ae5bf8d8d8ff4d6bc106f3c59019f4612a
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43c5c9ae5bf8d8d8ff4d6bc106f3c59019f4612a

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Tue Sep  7 20:46:22 2010 +0200

utils/route_graph: support for event route

---

 utils/route_graph/route_graph.py |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/utils/route_graph/route_graph.py b/utils/route_graph/route_graph.py
index cd8ccf2..243b5da 100755
--- a/utils/route_graph/route_graph.py
+++ b/utils/route_graph/route_graph.py
@@ -32,13 +32,14 @@ max_depth = 10
 debug = 0
 
 re_main_route = re.compile("^([a-z]+_)*route[\s\t]*(?![\(\)])[\s\t]*\{?", re.I)
-re_def_route = re.compile("^([a-z]+_)*route(\[\"?([A-Za-z0-9-_]+)\"?\])+[\s\t]*\{?", re.I)
+re_def_route = re.compile("^([a-z]+_)*route(\[\"?([A-Za-z0-9-_:]+)\"?\])+[\s\t]*\{?", re.I)
 re_call_route = re.compile("^(.*\([\s\t!]*)?route\(\"?([A-Za-z0-9-_]+)\"?\)", re.I)
 routes = {}
 f_routes = {}
 b_routes = {}
 r_routes = {}
 s_routes = {}
+e_routes = {}
 
 
 def log(_s):
@@ -114,6 +115,10 @@ while line:
 				rt = b_routes
 				if rname == None:
 					rname = "branch"
+			elif rtype == "event_":
+				rt = e_routes
+				if rname == None:
+					rname = "event"
 			else:
 				rt = routes
 			log(rname)
@@ -133,6 +138,9 @@ while line:
 			elif rtype == "branch_":
 				rt = b_routes
 				rname = "branch"
+			elif rtype == "event_":
+				rt = e_routes
+				rname = "event"
 			else:
 				rt = routes
 				rname = "Main"
@@ -145,6 +153,7 @@ log("branch_routes: %s" % (b_routes))
 log("failure_routes: %s" % (f_routes))
 log("onreply_routes: %s" % (r_routes))
 log("onsend_routes: %s" % (s_routes))
+log("event_routes: %s" % (e_routes))
 
 for name in routes.keys():
 	for val in routes[name]:
@@ -191,4 +200,11 @@ if len(r_routes) > 0:
 		for r in r_routes[onr]:
 			traverse_routes(1, r)
 
+if len(e_routes) > 0:
+	print "\nEvent routes\n--------------"
+	for onr in e_routes.keys():
+		print "\n%s" % (onr)
+		for r in e_routes[onr]:
+			traverse_routes(1, r)
+
 print




More information about the sr-dev mailing list