Changeset 2081

Timestamp:

Jun 27, 2008 9:59:15 PM (16 years ago)

Author:

bennylp

Message:

Added more Python tests: offer with multiple media lines

Location:

pjproject/trunk

Files:

• pjsip-apps/src/test-pjsua (modified) (1 prop)
• pjsip-apps/src/test-pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/121_sdp_with_video_static_1.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/121_sdp_with_video_static_2.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/151_err_sdp_video.py (modified) (1 diff)
• pjsip-apps/src/test-pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py (modified) (1 diff)
• pjsip-apps/src/test-pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py (modified) (1 diff)
• pjsip-apps/src/test-pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py (added)
• pjsip-apps/src/test-pjsua/scripts-sendto/999_asterisk_err.py (added)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/test-pjsua

@@ -2 +2 @@
 *log
 p*.txt
+logs

@@ -2 +2 @@
 *log
 p*.txt
+logs

pjproject/trunk/pjsip-apps/src/test-pjsua/scripts-sendto/151_err_sdp_video.py

@@ -15 +15 @@
 pjsua_args = "--null-audio --auto-answer 200"
 extra_headers = ""
-include = ["Content-Type: application/sdp",     # response must include SDP
-           "m=audio"]
+include = []
 exclude = []
 

pjproject/trunk/pjsip-apps/src/test-pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py

@@ -16 +16 @@
 pjsua_args = "--null-audio --auto-answer 200"
 extra_headers = ""
-include = ["Content-Type: application/sdp",     # response must include SDP
-           "m=audio"]
+include = []
 exclude = []
 

pjproject/trunk/pjsip-apps/src/test-pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py

@@ -21 +21 @@
 include = []
 exclude = []
-sendto_cfg = sip.SendtoCfg("Unsupported transport type", pjsua_args, sdp, 406, 
+sendto_cfg = sip.SendtoCfg("Unsupported transport type", pjsua_args, sdp, 488, 
                            extra_headers=extra_headers,
                            resp_inc=include, resp_exc=exclude) 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -977 +977 @@
     /* Reject offer if we couldn't find a good m=audio line in offer */
     if (call->audio_idx < 0) {
-        if (sip_err_code) *sip_err_code = PJSIP_SC_NOT_ACCEPTABLE;
+        if (sip_err_code) *sip_err_code = PJSIP_SC_NOT_ACCEPTABLE_HERE;
         pjsua_media_channel_deinit(call_id);
-        return PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE);
+        return PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE_HERE);
     }
 

@@ -2 +2 @@
 *log
 p*.txt
+logs