Changeset 1099 for pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

Timestamp:

Mar 23, 2007 7:09:54 PM (17 years ago)

Author:

bennylp

Message:

ICE (work in progress): implemented server reflexive candidate

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -20 +20 @@
 #include <pjnath/errno.h>
 #include <pj/assert.h>
+#include <pj/log.h>
 
 struct transport_ice
@@ -26 +27 @@
     pj_ice_st           *ice_st;
 
-    void  *stream;
-    void (*rtp_cb)(void*,
-                   const void*,
-                   pj_ssize_t);
-    void (*rtcp_cb)(void*,
-                    const void*,
-                    pj_ssize_t);
+    pj_time_val          start_ice;
+    
+    void                *stream;
+    pj_sockaddr_in       remote_rtp;
+    pj_sockaddr_in       remote_rtcp;
+
+    void               (*rtp_cb)(void*,
+                                 const void*,
+                                 pj_ssize_t);
+    void               (*rtcp_cb)(void*,
+                                  const void*,
+                                  pj_ssize_t);
 };
 
@@ -69 +75 @@
                            const pj_sockaddr_t *src_addr,
                            unsigned src_addr_len);
-static void ice_on_stun_srv_resolved(pj_ice_st *ice_st,
-                                     pj_status_t status);
-static void ice_on_interface_status(pj_ice_st *ice_st,
-                                    void *notify_data,
-                                    pj_status_t status,
-                                    int itf_id);
 static void ice_on_ice_complete(pj_ice_st *ice_st, 
                                 pj_status_t status);
@@ -108 +108 @@
     pj_bzero(&ice_st_cb, sizeof(ice_st_cb));
     ice_st_cb.on_ice_complete = &ice_on_ice_complete;
-    ice_st_cb.on_interface_status = &ice_on_interface_status;
     ice_st_cb.on_rx_data = &ice_on_rx_data;
-    ice_st_cb.on_stun_srv_resolved = &ice_on_stun_srv_resolved;
 
     /* Create ICE */
@@ -388 +386 @@
     }
 
+    /* Mark start time */
+    pj_gettimeofday(&tp_ice->start_ice);
+
     /* Start ICE */
     return pj_ice_st_start_ice(tp_ice->ice_st, &uname, &pass, cand_cnt, cand);
@@ -455 +456 @@
     tp_ice->rtcp_cb = rtcp_cb;
 
-    PJ_UNUSED_ARG(rem_addr);
-    PJ_UNUSED_ARG(rem_rtcp);
-    PJ_UNUSED_ARG(addr_len);
+    pj_memcpy(&tp_ice->remote_rtp, rem_addr, addr_len);
+    pj_memcpy(&tp_ice->remote_rtcp, rem_rtcp, addr_len);
 
     return PJ_SUCCESS;
@@ -481 +481 @@
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
-    return pj_ice_st_send_data(tp_ice->ice_st, 1, pkt, size);
+    if (tp_ice->ice_st->ice) {
+        return pj_ice_st_send_data(tp_ice->ice_st, 1, pkt, size);
+    } else {
+        return pj_ice_st_sendto(tp_ice->ice_st, 1, 0,
+                                pkt, size, &tp_ice->remote_rtp,
+                                sizeof(pj_sockaddr_in));
+    }
 }
 
@@ -521 +527 @@
 
 
-static void ice_on_stun_srv_resolved(pj_ice_st *ice_st,
-                                     pj_status_t status)
-{
-    struct transport_ice *tp_ice = (struct transport_ice*) ice_st->user_data;
-}
-
-
-static void ice_on_interface_status(pj_ice_st *ice_st,
-                                    void *notify_data,
-                                    pj_status_t status,
-                                    int itf_id)
-{
-    struct transport_ice *tp_ice = (struct transport_ice*) ice_st->user_data;
-}
-
-
 static void ice_on_ice_complete(pj_ice_st *ice_st, 
                                 pj_status_t status)
 {
     struct transport_ice *tp_ice = (struct transport_ice*) ice_st->user_data;
-}
-
-
+    pj_time_val end_ice;
+    pj_ice_cand *lcand, *rcand;
+    pj_ice_check *check;
+    char src_addr[32];
+    char dst_addr[32];
+
+    if (status != PJ_SUCCESS) {
+        char errmsg[PJ_ERR_MSG_SIZE];
+        pj_strerror(status, errmsg, sizeof(errmsg));
+        PJ_LOG(1,(ice_st->obj_name, "ICE negotiation failed: %s", errmsg));
+        return;
+    }
+
+    pj_gettimeofday(&end_ice);
+    PJ_TIME_VAL_SUB(end_ice, tp_ice->start_ice);
+
+    check = &ice_st->ice->clist.checks[ice_st->ice->valid_list[0]];
+    
+    lcand = check->lcand;
+    rcand = check->rcand;
+
+    pj_ansi_strcpy(src_addr, pj_inet_ntoa(lcand->addr.ipv4.sin_addr));
+    pj_ansi_strcpy(dst_addr, pj_inet_ntoa(rcand->addr.ipv4.sin_addr));
+
+    PJ_LOG(3,(ice_st->obj_name, 
+              "ICE negotiation completed in %d.%03ds. Sending from "
+              "%s:%d to %s:%d",
+              (int)end_ice.sec, (int)end_ice.msec,
+              src_addr, pj_ntohs(lcand->addr.ipv4.sin_port),
+              dst_addr, pj_ntohs(rcand->addr.ipv4.sin_port)));
+}
+
+