Changeset 2724 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

May 29, 2009 1:04:03 PM (14 years ago)

Author:

bennylp

Message:

Integration of Sipit24 branch, many tickets involved:

• #793: AMR encoder should regard 'mode-set' param specified by remote decoder.
• #831: Automatically switch to TCP transport when sending large request
• #832: Support for outbound proxy setting without using Route header
• #849: Modify conference audio switch behavior in connecting ports.
• #850: Remove 'Require=replaces' param in 'Refer-To' header (in call transfer with replaces).
• #851: Support for regular nomination in ICE
• #852: --ip-addr support for IPv6 for media transport in pjsua
• #854: Adding SOFTWARE attribute in all outgoing requests may cause compatibility problem with older STUN server (thanks Alexei Kuznetsov for the report)
• #855: Bug in digit map frequencies for DTMF digits (thanks FCCH for the report)
• #856: Put back the ICE candidate priority values according to the default values in the draft-mmusic-ice
• #857: Support for ICE keep-alive with Binding indication
• #858: Do not authenticate STUN 438 response
• #859: AMR-WB format param in the SDP is not negotiated correctly.
• #867: Return error instead of asserting when PJSUA-LIB fails to open log file

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (8 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -51 +51 @@
  * specify preference among candidates with the same type. Since
  * we don't have the facility to specify that, we'll just set it
- * all to zero.
- */
-#define SRFLX_PREF  0
-#define HOST_PREF   0
-#define RELAY_PREF  0
+ * all to the same value.
+ */
+#if PJNATH_ICE_PRIO_STD
+#   define SRFLX_PREF  65535
+#   define HOST_PREF   65535
+#   define RELAY_PREF  65535
+#else
+#   define SRFLX_PREF  0
+#   define HOST_PREF   0
+#   define RELAY_PREF  0
+#endif
+
 
 /* The candidate type preference when STUN candidate is used */
 static pj_uint8_t srflx_pref_table[4] = 
 {
+#if PJNATH_ICE_PRIO_STD
+    100,    /**< PJ_ICE_HOST_PREF           */
+    126,    /**< PJ_ICE_SRFLX_PREF          */
+    110,    /**< PJ_ICE_PRFLX_PREF          */
+    0       /**< PJ_ICE_RELAYED_PREF    */
+#else
     /* Keep it to 2 bits */
     1,  /**< PJ_ICE_HOST_PREF       */
@@ -65 +78 @@
     3,  /**< PJ_ICE_PRFLX_PREF      */
     0   /**< PJ_ICE_RELAYED_PREF    */
+#endif
 };
 
@@ -198 +212 @@
     pj_turn_alloc_param_default(&cfg->turn.alloc_param);
 
+    pj_ice_sess_options_default(&cfg->opt);
+
     cfg->af = pj_AF_INET();
     cfg->stun.port = PJ_STUN_PORT;
     cfg->turn.conn_type = PJ_TURN_TP_UDP;
+
+    cfg->stun.max_host_cands = 64;
 }
 
@@ -246 +264 @@
 
     /* Create STUN transport if configured */
-    if (ice_st->cfg.stun.server.slen || !ice_st->cfg.stun.no_host_cands) {
+    if (ice_st->cfg.stun.server.slen || ice_st->cfg.stun.max_host_cands) {
         pj_stun_sock_cb stun_sock_cb;
         pj_ice_sess_cand *cand;
@@ -310 +328 @@
         }
 
-        /* Add local addresses to host candidates, unless no_host_cands
-         * flag is set.
+        /* Add local addresses to host candidates, unless max_host_cands
+         * is set to zero.
          */
-        if (ice_st->cfg.stun.no_host_cands == PJ_FALSE) {
+        if (ice_st->cfg.stun.max_host_cands) {
             pj_stun_sock_info stun_sock_info;
             unsigned i;
@@ -322 +340 @@
                 return status;
 
-            for (i=0; i<stun_sock_info.alias_cnt; ++i) {
+            for (i=0; i<stun_sock_info.alias_cnt && 
+                      i<ice_st->cfg.stun.max_host_cands; ++i) 
+            {
                 char addrinfo[PJ_INET6_ADDRSTRLEN+10];
                 const pj_sockaddr *addr = &stun_sock_info.aliases[i];
@@ -648 +668 @@
 
 /*
+ * Get the value of various options of the ICE stream transport.
+ */
+PJ_DEF(pj_status_t) pj_ice_strans_get_options( pj_ice_strans *ice_st,
+                                               pj_ice_sess_options *opt)
+{
+    PJ_ASSERT_RETURN(ice_st && opt, PJ_EINVAL);
+    pj_memcpy(opt, &ice_st->cfg.opt, sizeof(*opt));
+    return PJ_SUCCESS;
+}
+
+/*
+ * Specify various options for this ICE stream transport. 
+ */
+PJ_DEF(pj_status_t) pj_ice_strans_set_options(pj_ice_strans *ice_st,
+                                              const pj_ice_sess_options *opt)
+{
+    PJ_ASSERT_RETURN(ice_st && opt, PJ_EINVAL);
+    pj_memcpy(&ice_st->cfg.opt, opt, sizeof(*opt));
+    if (ice_st->ice)
+        pj_ice_sess_set_options(ice_st->ice, &ice_st->cfg.opt);
+    return PJ_SUCCESS;
+}
+
+/*
  * Create ICE!
  */
@@ -682 +726 @@
     /* Associate user data */
     ice_st->ice->user_data = (void*)ice_st;
+
+    /* Set options */
+    pj_ice_sess_set_options(ice_st->ice, &ice_st->cfg.opt);
 
     /* If default candidate for components are SRFLX one, upload a custom