Changeset 1095 for pjproject

Timestamp:

Mar 22, 2007 11:59:03 AM (18 years ago)

Author:

bennylp

Message:

Tested simple ICE with data

Location:

pjproject/trunk/pjnath

Files:

• build/pjnath_test.dsp (modified) (1 diff)
• src/pjnath-test/ice_test.c (moved) (moved from pjproject/trunk/pjnath/src/pjnath-test/ice.c) (13 diffs)
• src/pjnath-test/main.c (modified) (1 diff)
• src/pjnath/ice_mt.c (modified) (1 diff)

pjproject/trunk/pjnath/build/pjnath_test.dsp

@@ -88 +88 @@
 # Begin Source File
 
-SOURCE="..\src\pjnath-test\ice.c"
+SOURCE="..\src\pjnath-test\ice_test.c"
 # End Source File
 # Begin Source File

pjproject/trunk/pjnath/src/pjnath-test/ice_test.c

@@ -30 +30 @@
     unsigned        rx_rtcp_cnt;
 
-    char            rx_rtp_data[32];
-    char            rx_rtcp_data[32];
+    unsigned        rx_rtp_count;
+    char            last_rx_rtp_data[32];
+    unsigned        rx_rtcp_count;
+    char            last_rx_rtcp_data[32];
 };
 
@@ -55 +57 @@
 
     id->rx_rtp_cnt++;
-    pj_memcpy(id->rx_rtp_data, pkt, size);
+    pj_memcpy(id->last_rx_rtp_data, pkt, size);
+    id->last_rx_rtp_data[size] = '\0';
 
     PJ_UNUSED_ARG(src_addr);
@@ -70 +73 @@
 
     id->rx_rtcp_cnt++;
-    pj_memcpy(id->rx_rtcp_data, pkt, size);
+    pj_memcpy(id->last_rx_rtcp_data, pkt, size);
+    id->last_rx_rtcp_data[size] = '\0';
 
     PJ_UNUSED_ARG(src_addr);
@@ -103 +107 @@
     pj_bzero(&icemt_cb, sizeof(icemt_cb));
     icemt_cb.on_ice_complete = &on_ice_complete;
-    icemt_cb.on_rx_rtcp = &on_rx_rtp;
+    icemt_cb.on_rx_rtp = &on_rx_rtp;
     icemt_cb.on_rx_rtcp = &on_rx_rtcp;
 
@@ -153 +157 @@
  *   acand      Additional candidates to be added to answerer
  *
- * The additional candidates are invalid candidates, meaning they
- * won't be reachable by the agents. They are used to "confuse"
+ * The additional candidates are normally invalid candidates, meaning 
+ * they won't be reachable by the agents. They are used to "confuse"
  * ICE processing.
  */
 static int perform_ice_test(const char *title,
+                            unsigned wait_before_send,
+                            unsigned max_total_time,
                             unsigned ocand_cnt,
                             const pj_ice_cand ocand[],
@@ -168 +174 @@
     pj_timestamp t_start, t_end;
     pj_ice_cand *rcand;
+    pj_str_t data_from_offerer, data_from_answerer;
     unsigned i;
     pj_status_t status;
@@ -175 +182 @@
     pj_bzero(&icemt_cb, sizeof(icemt_cb));
     icemt_cb.on_ice_complete = &on_ice_complete;
-    icemt_cb.on_rx_rtcp = &on_rx_rtp;
+    icemt_cb.on_rx_rtp = &on_rx_rtp;
     icemt_cb.on_rx_rtcp = &on_rx_rtcp;
 
@@ -253 +260 @@
 #endif
 
+    /* Poll for wait_before_send msecs before we send the first data */
+    for (;;) {
+        pj_timestamp t_now;
+
+        handle_events(1);
+
+        pj_get_timestamp(&t_now);
+        if (pj_elapsed_msec(&t_start, &t_now) >= wait_before_send)
+            break;
+    }
+
+    /* Send data. It must be successful! */
+    data_from_offerer = pj_str("from offerer");
+    status = pj_ice_send_data(im1->ice, 1, data_from_offerer.ptr, data_from_offerer.slen);
+    if (status != PJ_SUCCESS)
+        return -47;
+
+    data_from_answerer = pj_str("from answerer");
+    status = pj_ice_send_data(im2->ice, 1, data_from_answerer.ptr, data_from_answerer.slen);
+    if (status != PJ_SUCCESS)
+        return -48;
+
+    /* Poll to allow data to be received */
+    for (;;) {
+        pj_timestamp t_now;
+        handle_events(1);
+        pj_get_timestamp(&t_now);
+        if (pj_elapsed_msec(&t_start, &t_now) >= (wait_before_send + 200))
+            break;
+    }
+
+
     /* Just wait until both completes, or timed out */
     while (!id1->complete || !id2->complete) {
@@ -260 +299 @@
 
         pj_get_timestamp(&t_now);
-        if (pj_elapsed_msec(&t_start, &t_now) >= 10000) {
+        if (pj_elapsed_msec(&t_start, &t_now) >= max_total_time) {
             PJ_LOG(3,(THIS_FILE, "....error: timed-out"));
             return -50;
@@ -289 +328 @@
     }
 
+    /* Check that data is received in offerer */
+    if (id1->rx_rtp_cnt != 1) {
+        PJ_LOG(3,(THIS_FILE, "....error: data not received in offerer"));
+        return -80;
+    }
+    if (pj_strcmp2(&data_from_answerer, id1->last_rx_rtp_data) != 0) {
+        PJ_LOG(3,(THIS_FILE, "....error: data mismatch in offerer"));
+        return -82;
+    }
+
+    /* And the same in answerer */
+    if (id2->rx_rtp_cnt != 1) {
+        PJ_LOG(3,(THIS_FILE, "....error: data not received in answerer"));
+        return -84;
+    }
+    if (pj_strcmp2(&data_from_offerer, id2->last_rx_rtp_data) != 0) {
+        PJ_LOG(3,(THIS_FILE, "....error: data mismatch in answerer"));
+        return -82;
+    }
+
+
     /* Done */
     PJ_LOG(3,(THIS_FILE, "....success: ICE completed in %d msec", 
@@ -299 +359 @@
 
         pj_get_timestamp(&t_now);
-        if (pj_elapsed_msec(&t_end, &t_now) > 10000)
+        if (pj_elapsed_msec(&t_start, &t_now) > max_total_time)
             break;
 
@@ -336 +396 @@
 
     /* Direct communication */
-    rc = perform_ice_test("Direct connection", 0, NULL, 0, NULL);
+    rc = perform_ice_test("Direct connection", 500, 1000, 0, NULL, 0, NULL);
     if (rc != 0)
         goto on_return;
@@ -348 +408 @@
     ocand[0].type = PJ_ICE_CAND_TYPE_HOST;
 
-    rc = perform_ice_test("Direct connection with 1 invalid address", 1, ocand, 0, NULL);
+    rc = perform_ice_test("Direct connection with 1 invalid address", 500, 1000, 1, ocand, 0, NULL);
     if (rc != 0)
         goto on_return;
+
+    /* Direct communication with two components */
+    rc = perform_ice_test("Direct connection with two components", 500, 1000, 0, NULL, 0, NULL);
+    if (rc != 0)
+        goto on_return;
+
 
 

pjproject/trunk/pjnath/src/pjnath-test/main.c

@@ -51 +51 @@
     if (argc == 2 && pj_ansi_strcmp(argv[1], "-i")==0) {
         char buf[10];
+
+        puts("Press <ENTER> to exit");
         fgets(buf, sizeof(buf), stdin);
     }

pjproject/trunk/pjnath/src/pjnath/ice_mt.c

@@ -271 +271 @@
     pj_icemt *icemt = (pj_icemt*)ice->user_data;
 
-    if (comp_id == RTP_COMP_ID) {
+    if (comp_id == RTP_COMP_ID && icemt->cb.on_rx_rtp) {
         (*icemt->cb.on_rx_rtp)(icemt, pkt, size, src_addr, src_addr_len);
-    } else if (comp_id == RTCP_COMP_ID) {
+    } else if (comp_id == RTCP_COMP_ID && icemt->cb.on_rx_rtcp) {
         (*icemt->cb.on_rx_rtcp)(icemt, pkt, size, src_addr, src_addr_len);
-    } else {
-        pj_assert(!"Invalid comp_id");
-        return -1;
-    }
-
-    return PJ_SUCCESS;
-}
-
-
+    }
+    return PJ_SUCCESS;
+}
+
+