Changeset 2440 for pjproject/trunk

Timestamp:

Feb 6, 2009 7:56:09 AM (16 years ago)

Author:

bennylp

Message:

Allow SIP messages in mod_sendto.py to insert fields (ticket #707)

Location:

pjproject/trunk/tests/pjsua

Files:

• inc_sip.py (modified) (3 diffs)
• mod_sendto.py (modified) (1 diff)

pjproject/trunk/tests/pjsua/inc_sip.py

@@ -92 +92 @@
                         print str(time.strftime("%H:%M:%S ")) + txt
 
-        def create_req(self, method, sdp, branch="", extra_headers=""):
-                if branch=="":
-                        self.cseq = self.cseq + 1
-                msg = req_templ
-                msg = msg.replace("$METHOD", method)
+        def update_fields(self, msg):
                 if self.tcp:
                         transport_param = ";transport=tcp"
@@ -104 +100 @@
                 msg = msg.replace("$LOCAL_IP", self.local_ip)
                 msg = msg.replace("$LOCAL_PORT", str(self.local_port))
-                if branch=="":
-                        branch=str(random.random())
-                msg = msg.replace("$BRANCH", branch)
                 msg = msg.replace("$FROM_TAG", self.local_tag)
                 msg = msg.replace("$TO_TAG", self.rem_tag)
                 msg = msg.replace("$CALL_ID", self.call_id)
                 msg = msg.replace("$CSEQ", str(self.cseq))
+                branch=str(random.random())
+                msg = msg.replace("$BRANCH", branch)
+                return msg
+
+        def create_req(self, method, sdp, branch="", extra_headers=""):
+                if branch=="":
+                        self.cseq = self.cseq + 1
+                msg = req_templ
+                msg = msg.replace("$METHOD", method)
                 msg = msg.replace("$SIP_HEADERS", extra_headers)
+                if branch=="":
+                        branch=str(random.random())
+                msg = msg.replace("$BRANCH", branch)
                 if sdp!="":
                         msg = msg.replace("$CONTENT_LENGTH", str(len(sdp)))
@@ -119 +124 @@
                 msg = msg + "\r\n"
                 msg = msg + sdp
-                return msg
+                return self.update_fields(msg)
 
         def create_response(self, request, code, reason, to_tag=""):

pjproject/trunk/tests/pjsua/mod_sendto.py

@@ -20 +20 @@
         
         if len(cfg.complete_msg) != 0:
-                req = cfg.complete_msg
+                req = dlg.update_fields(cfg.complete_msg)
         else:
                 req = dlg.create_invite(cfg.sdp, cfg.extra_headers)