Changeset 1867 for pjproject/trunk/pjnath/src/pjnath/turn_udp.c

Timestamp:

Mar 13, 2008 3:11:29 PM (16 years ago)

Author:

bennylp

Message:

More ticket #485: added TURN client application

File:

• pjproject/trunk/pjnath/src/pjnath/turn_udp.c (modified) (7 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_udp.c

@@ -167 +167 @@
 }
 
+/**
+ * Get info.
+ */
+PJ_DEF(pj_status_t) pj_turn_udp_get_info(pj_turn_udp *udp_rel,
+                                         pj_turn_session_info *info)
+{
+    PJ_ASSERT_RETURN(udp_rel && info, PJ_EINVAL);
+
+    if (udp_rel->sess) {
+        return pj_turn_session_get_info(udp_rel->sess, info);
+    } else {
+        pj_bzero(info, sizeof(*info));
+        info->state = PJ_TURN_STATE_NULL;
+        return PJ_SUCCESS;
+    }
+}
+
 /*
  * Initialize.
@@ -179 +196 @@
     pj_status_t status;
 
+    PJ_ASSERT_RETURN(udp_rel && domain, PJ_EINVAL);
+    PJ_ASSERT_RETURN(udp_rel->sess, PJ_EINVALIDOP);
+
     status = pj_turn_session_set_server(udp_rel->sess, domain, default_port,
                                         resolver);
@@ -184 +204 @@
         return status;
 
-    status = pj_turn_session_set_cred(udp_rel->sess, cred);
-    if (status != PJ_SUCCESS)
-        return status;
+    if (cred) {
+        status = pj_turn_session_set_cred(udp_rel->sess, cred);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
 
     status = pj_turn_session_alloc(udp_rel->sess, param);
@@ -204 +226 @@
                                         unsigned addr_len)
 {
+    PJ_ASSERT_RETURN(udp_rel && addr && addr_len, PJ_EINVAL);
+
+    if (udp_rel->sess == NULL)
+        return PJ_EINVALIDOP;
+
     return pj_turn_session_sendto(udp_rel->sess, pkt, pkt_len, 
                                   addr, addr_len);
@@ -215 +242 @@
                                               unsigned addr_len)
 {
+    PJ_ASSERT_RETURN(udp_rel && peer && addr_len, PJ_EINVAL);
+    PJ_ASSERT_RETURN(udp_rel->sess != NULL, PJ_EINVALIDOP);
+
     return pj_turn_session_bind_channel(udp_rel->sess, peer, addr_len);
 }
@@ -233 +263 @@
     do {
         /* Report incoming packet to TURN session */
-        if (bytes_read > 0) {
+        if (bytes_read > 0 && udp_rel->sess) {
             pj_turn_session_on_rx_pkt(udp_rel->sess, udp_rel->pkt, 
                                       bytes_read, PJ_TRUE);
@@ -318 +348 @@
         (*udp_rel->cb.on_state)(udp_rel, old_state, new_state);
     }
-}
-
-
+
+    if (new_state > PJ_TURN_STATE_READY) {
+        udp_rel->sess = NULL;
+    }
+}
+
+