Changeset 563 for pjproject/trunk/pjsip/src/test-pjsip/tsx_uas_test.c

Timestamp:

Jun 28, 2006 4:46:49 PM (18 years ago)

Author:

bennylp

Message:

Major improvements in PJSIP to support TCP. The changes fall into these categories: (1) the TCP transport implementation itself (*.[hc]), (2) bug-fix in SIP transaction when using reliable transports, (3) support for TCP transport in PJSUA-LIB/PJSUA, and (4) changes in PJSIP-TEST to support TCP testing.

File:

• pjproject/trunk/pjsip/src/test-pjsip/tsx_uas_test.c (modified) (24 diffs)

pjproject/trunk/pjsip/src/test-pjsip/tsx_uas_test.c

@@ -36 +36 @@
  **     Test that non-INVITE transaction returns 2xx response to the correct
  **     transport and correctly terminates the transaction.
+ **     This also checks that transaction is destroyed immediately after
+ **     it sends final response when reliable transport is used.
  **
  ** TEST2_BRANCH_ID
@@ -54 +56 @@
  ** TEST6_BRANCH_ID
  **     As above, in COMPLETED state, with first sending provisional response.
+ **     (Only applicable for non-reliable transports).
  **
  ** TEST7_BRANCH_ID
@@ -66 +69 @@
  **     until it's terminated by user).
  **     Transaction also MUST terminate in T4 seconds.
+ **     (Only applicable for non-reliable transports).
  **
  ** TEST11_BRANCH_ID
@@ -129 +133 @@
 
 
+static char TARGET_URI[128];
+static char FROM_URI[128];
+static struct tsx_test_param *test_param;
+static unsigned tp_flag;
+
+
 #define TEST_TIMEOUT_ERROR      -30
 #define MAX_ALLOWED_DIFF        150
@@ -522 +532 @@
             /* Check that status code is status_code. */
             if (tsx->status_code != TEST6_STATUS_CODE) {
-                PJ_LOG(3,(THIS_FILE, "    error: incorrect status code"));
+                PJ_LOG(3,(THIS_FILE, "    error: incorrect status code %d "
+                          "(expecting %d)", tsx->status_code, 
+                          TEST6_STATUS_CODE));
                 test_complete = -140;
             }
@@ -576 +588 @@
                 PJ_LOG(3,(THIS_FILE, "    error: incorrect prev_state"));
                 test_complete = -151;
+            }
+
+            /* Check the number of retransmissions */
+            if (tp_flag & PJSIP_TRANSPORT_RELIABLE) {
+
+                if (tsx->retransmit_count != 0) {
+                    PJ_LOG(3,(THIS_FILE, "    error: should not retransmit"));
+                    test_complete = -1510;
+                }
+
+            } else {
+
+                if (tsx->retransmit_count != 10) {
+                    PJ_LOG(3,(THIS_FILE, 
+                              "    error: incorrect retransmit count %d "
+                              "(expecting 10)",
+                              tsx->retransmit_count));
+                    test_complete = -1510;
+                }
+
             }
 
@@ -815 +847 @@
             pjsip_transaction *tsx;
 
+            PJ_LOG(4,(THIS_FILE, "    received request (probably retransmission)"));
+
             status = pjsip_tsx_create_uas(&tsx_user, rdata, &tsx);
             if (status != PJ_SUCCESS) {
@@ -831 +865 @@
 
             } else if (pj_strcmp2(&branch_param, TEST6_BRANCH_ID) == 0) {
+                PJ_LOG(4,(THIS_FILE, "    sending provisional response"));
                 send_response(rdata, tsx, TEST6_PROVISIONAL_CODE);
+                PJ_LOG(4,(THIS_FILE, "    sending final response"));
                 send_response(rdata, tsx, TEST6_STATUS_CODE);
             }
@@ -838 +874 @@
             /* Verify the response received. */
             
+            PJ_LOG(4,(THIS_FILE, "    received response number %d", recv_count));
+
             ++recv_count;
 
@@ -870 +908 @@
                 case 3:
                     if (code != TEST6_STATUS_CODE) {
-                        PJ_LOG(3,(THIS_FILE, "    error: invalid code!"));
+                        PJ_LOG(3,(THIS_FILE, "    error: invalid code %d "
+                                  "(expecting %d)", code, TEST6_STATUS_CODE));
                         test_complete = -136;
                     }
@@ -1184 +1223 @@
 
             /* (Re)Send the request. */
+            PJ_LOG(4,(THIS_FILE, "    (re)sending request %d", sent_cnt));
+
             status = pjsip_endpt_send_request_stateless(endpt, tdata, 0, 0);
             if (status != PJ_SUCCESS) {
@@ -1256 +1297 @@
 static int tsx_basic_final_response_test(void)
 {
+    unsigned duration;
     int status;
 
     PJ_LOG(3,(THIS_FILE,"  test1: basic sending 2xx final response"));
 
-    status = perform_test("sip:129.0.0.1;transport=loop-dgram",
-                          "sip:129.0.0.1;transport=loop-dgram",
-                          TEST1_BRANCH_ID,
-                          33, /* Test duration must be greater than 32 secs */
-                          &pjsip_options_method, 1, 0, 0);
+    /* Test duration must be greater than 32 secs if unreliable transport
+     * is used.
+     */
+    duration = (tp_flag & PJSIP_TRANSPORT_RELIABLE) ? 1 : 33;
+
+    status = perform_test(TARGET_URI, FROM_URI, TEST1_BRANCH_ID,
+                          duration,  &pjsip_options_method, 1, 0, 0);
     if (status != 0)
         return status;
@@ -1270 +1314 @@
     PJ_LOG(3,(THIS_FILE,"  test2: basic sending non-2xx final response"));
 
-    status = perform_test("sip:129.0.0.1;transport=loop-dgram",
-                          "sip:129.0.0.1;transport=loop-dgram",
-                          TEST2_BRANCH_ID,
-                          33, /* Test duration must be greater than 32 secs */
-                          &pjsip_options_method, 1, 0, 0);
+    status = perform_test(TARGET_URI, FROM_URI, TEST2_BRANCH_ID,
+                          duration, &pjsip_options_method, 1, 0, 0);
     if (status != 0)
         return status;
@@ -1290 +1331 @@
 static int tsx_basic_provisional_response_test(void)
 {
+    unsigned duration;
     int status;
 
     PJ_LOG(3,(THIS_FILE,"  test3: basic sending 2xx final response"));
 
-    status = perform_test("sip:129.0.0.1;transport=loop-dgram",
-                          "sip:129.0.0.1;transport=loop-dgram",
-                          TEST3_BRANCH_ID,
-                          35,
+    duration = (tp_flag & PJSIP_TRANSPORT_RELIABLE) ? 1 : 33;
+    duration += 2;
+
+    status = perform_test(TARGET_URI, FROM_URI, TEST3_BRANCH_ID, duration,
                           &pjsip_options_method, 1, 0, 0);
 
@@ -1321 +1363 @@
     PJ_LOG(3,(THIS_FILE,"  %s", title));
 
-    status = perform_test("sip:129.0.0.1;transport=loop-dgram",
-                          "sip:129.0.0.1;transport=loop-dgram",
-                          branch_id,
-                          5,
+    status = perform_test(TARGET_URI, FROM_URI, branch_id, 5,
                           &pjsip_options_method, 
                           request_cnt, 1000, 1);
@@ -1358 +1397 @@
               "  test7: INVITE non-2xx final response retransmission"));
 
-    status = perform_test("sip:129.0.0.1;transport=loop-dgram",
-                          "sip:129.0.0.1;transport=loop-dgram",
-                          TEST7_BRANCH_ID,
+    status = perform_test(TARGET_URI, FROM_URI, TEST7_BRANCH_ID,
                           33, /* Test duration must be greater than 32 secs */
                           &pjsip_invite_method, 1, 0, 0);
@@ -1369 +1406 @@
               "  test8: INVITE 2xx final response retransmission"));
 
-    status = perform_test("sip:129.0.0.1;transport=loop-dgram",
-                          "sip:129.0.0.1;transport=loop-dgram",
-                          TEST8_BRANCH_ID,
+    status = perform_test(TARGET_URI, FROM_URI, TEST8_BRANCH_ID,
                           33, /* Test duration must be greater than 32 secs */
                           &pjsip_invite_method, 1, 0, 0);
@@ -1395 +1430 @@
               "  test9: receiving ACK for non-2xx final response"));
 
-    status = perform_test("sip:129.0.0.1;transport=loop-dgram",
-                          "sip:129.0.0.1;transport=loop-dgram",
-                          TEST9_BRANCH_ID,
+    status = perform_test(TARGET_URI, FROM_URI, TEST9_BRANCH_ID,
                           20, /* allow 5 retransmissions */
                           &pjsip_invite_method, 1, 0, 0);
@@ -1444 +1477 @@
         pjsip_loop_set_delay(loop, tests[i].transport_delay);
 
-        status = perform_test("sip:129.0.0.1;transport=loop-dgram",
-                              "sip:129.0.0.1;transport=loop-dgram",
-                              tests[i].branch_id,
-                              0,
-                              &pjsip_invite_method, 1, 0, 1);
+        status = perform_test(TARGET_URI, FROM_URI, tests[i].branch_id,
+                              0, &pjsip_invite_method, 1, 0, 1);
         if (status && status != TEST_TIMEOUT_ERROR)
             return status;
@@ -1495 +1525 @@
  *****************************************************************************
  */
-int tsx_uas_test(void)
+int tsx_uas_test(struct tsx_test_param *param)
 {
     pj_sockaddr_in addr;
     pj_status_t status;
+
+    test_param = param;
+    tp_flag = pjsip_transport_get_flag_from_type(param->type);
+
+    pj_ansi_sprintf(TARGET_URI, "sip:bob@127.0.0.1:%d;transport=%s", 
+                    param->port, param->tp_type);
+    pj_ansi_sprintf(FROM_URI, "sip:alice@127.0.0.1:%d;transport=%s", 
+                    param->port, param->tp_type);
 
     /* Check if loop transport is configured. */
@@ -1505 +1543 @@
     if (status != PJ_SUCCESS) {
         PJ_LOG(3,(THIS_FILE, "  Error: loop transport is not configured!"));
-        return -1;
-    }
-
+        return -10;
+    }
     /* Register modules. */
     status = pjsip_endpt_register_module(endpt, &tsx_user);
@@ -1551 +1588 @@
         return status;
 
-    /* TEST6_BRANCH_ID: retransmit last response in PROCEEDING state
+    /* TEST6_BRANCH_ID: retransmit last response in COMPLETED state
+     *                  This only applies to non-reliable transports,
+     *                  since UAS transaction is destroyed as soon
+     *                  as final response is sent for reliable transports.
      */
-    status = tsx_retransmit_last_response_test(TEST6_TITLE,
-                                               TEST6_BRANCH_ID, 
-                                               TEST6_REQUEST_COUNT,
-                                               TEST6_STATUS_CODE);
-    if (status != 0)
-        return status;
+    if ((tp_flag & PJSIP_TRANSPORT_RELIABLE) == 0) {
+        status = tsx_retransmit_last_response_test(TEST6_TITLE,
+                                                   TEST6_BRANCH_ID, 
+                                                   TEST6_REQUEST_COUNT,
+                                                   TEST6_STATUS_CODE);
+        if (status != 0)
+            return status;
+    }
 
     /* TEST7_BRANCH_ID: INVITE non-2xx final response retransmission test
      * TEST8_BRANCH_ID: INVITE 2xx final response retransmission test
      */
-
     status = tsx_final_response_retransmission_test();
     if (status != 0)
@@ -1570 +1611 @@
     /* TEST9_BRANCH_ID: retransmission of non-2xx INVITE final response must 
      * cease when ACK is received
+     * Only applicable for non-reliable transports.
      */
-    status = tsx_ack_test();
-    if (status != 0)
-        return status;
+    if ((tp_flag & PJSIP_TRANSPORT_RELIABLE) == 0) {
+        status = tsx_ack_test();
+        if (status != 0)
+            return status;
+    }
+
 
     /* TEST10_BRANCH_ID: test transport failure in TRYING state.
@@ -1580 +1625 @@
      * TEST13_BRANCH_ID: test transport failure in CONFIRMED state.
      */
-    status = tsx_transport_failure_test();
-    if (status != 0)
-        return status;
-
-
-    pjsip_transport_dec_ref(loop);
+    /* Only valid for loop-dgram */
+    if (param->type == PJSIP_TRANSPORT_LOOP_DGRAM) {
+        status = tsx_transport_failure_test();
+        if (status != 0)
+            return status;
+    }
+
+
+    /* Register modules. */
+    status = pjsip_endpt_unregister_module(endpt, &tsx_user);
+    if (status != PJ_SUCCESS) {
+        app_perror("   Error: unable to unregister module", status);
+        return -8;
+    }
+    status = pjsip_endpt_unregister_module(endpt, &msg_sender);
+    if (status != PJ_SUCCESS) {
+        app_perror("   Error: unable to unregister module", status);
+        return -9;
+    }
+
+
+    if (loop)
+        pjsip_transport_dec_ref(loop);
+
     return 0;
-
 }