Changeset 3243 for pjproject/trunk/tests/pjsua/inc_sip.py

Timestamp:

Aug 1, 2010 9:48:51 AM (13 years ago)

Author:

bennylp

Message:

Implemented core multipart support and support in the invite session (re #1070)

• incoming multipart message will be handled automatically
• for testing, enable HAVE_MULTIPART_TEST in pjsua_app.c

File:

• pjproject/trunk/tests/pjsua/inc_sip.py (modified) (5 diffs)

pjproject/trunk/tests/pjsua/inc_sip.py

@@ -108 +108 @@
                 return msg
 
-        def create_req(self, method, sdp, branch="", extra_headers=""):
+        def create_req(self, method, sdp, branch="", extra_headers="", body=""):
                 if branch=="":
                         self.cseq = self.cseq + 1
@@ -120 +120 @@
                         msg = msg.replace("$CONTENT_LENGTH", str(len(sdp)))
                         msg = msg + "Content-Type: application/sdp\r\n"
+                        msg = msg + "\r\n"
+                        msg = msg + sdp
+                elif body!="":
+                        msg = msg.replace("$CONTENT_LENGTH", str(len(body)))
+                        msg = msg + "\r\n"
+                        msg = msg + body
                 else:
                         msg = msg.replace("$CONTENT_LENGTH", "0")
-                msg = msg + "\r\n"
-                msg = msg + sdp
                 return self.update_fields(msg)
 
@@ -139 +143 @@
                 return response
 
-        def create_invite(self, sdp, extra_headers=""):
+        def create_invite(self, sdp, extra_headers="", body=""):
                 self.inv_branch = str(random.random())
-                return self.create_req("INVITE", sdp, branch=self.inv_branch, extra_headers=extra_headers)
+                return self.create_req("INVITE", sdp, branch=self.inv_branch, extra_headers=extra_headers, body=body)
 
         def create_ack(self, sdp="", extra_headers=""):
@@ -253 +257 @@
         # List of RE patterns that must NOT exist in response
         resp_exclude = []
+        # Full (non-SDP) body
+        body = ""
         # Constructor
         def __init__(self, name, pjsua_args, sdp, resp_code, 
                      resp_inc=[], resp_exc=[], use_tcp=False,
-                     extra_headers="", complete_msg="",
+                     extra_headers="", body="", complete_msg="",
                      enable_buffer = False):
                 self.complete_msg = complete_msg
@@ -265 +271 @@
                 self.use_tcp = use_tcp
                 self.extra_headers = extra_headers
+                self.body = body
                 self.inst_param = cfg.InstanceParam("pjsua", pjsua_args)
                 self.inst_param.enable_buffer = enable_buffer