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

Timestamp:

Jun 19, 2013 9:06:55 AM (9 years ago)

Author:

nanang

Message:

Close #1681:

• Added compile-time settings PJMEDIA_TRANSPORT_SO_RCVBUF_SIZE and PJMEDIA_TRANSPORT_SO_SNDBUF_SIZE. The default values are both 64 KB when PJMEDIA_HAS_VIDEO is set, otherwise just zero (socket buffer size uses OS default). The settings will be applied to media transport UDP and ICE.
• Also added run-time settings so_sndbuf_size and so_rcvbuf_size into ICE stream transport, STUN socket, and TURN socket. Default values are all zero.

File:

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

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

@@ -226 +226 @@
     pj_pool_t *pool;
     pj_ice_strans_cb ice_st_cb;
+    pj_ice_strans_cfg ice_st_cfg;
     struct transport_ice *tp_ice;
     pj_status_t status;
@@ -246 +247 @@
     tp_ice->use_ice = PJ_FALSE;
 
+    pj_memcpy(&ice_st_cfg, cfg, sizeof(pj_ice_strans_cfg));
     if (cb)
         pj_memcpy(&tp_ice->cb, cb, sizeof(pjmedia_ice_cb));
@@ -259 +261 @@
     ice_st_cb.on_rx_data = &ice_on_rx_data;
 
+    /* Configure RTP socket buffer settings, if not set */
+    if (ice_st_cfg.comp[COMP_RTP-1].so_rcvbuf_size == 0) {
+        ice_st_cfg.comp[COMP_RTP-1].so_rcvbuf_size = 
+                            PJMEDIA_TRANSPORT_SO_RCVBUF_SIZE;
+    }
+    if (ice_st_cfg.comp[COMP_RTP-1].so_sndbuf_size == 0) {
+        ice_st_cfg.comp[COMP_RTP-1].so_sndbuf_size = 
+                            PJMEDIA_TRANSPORT_SO_SNDBUF_SIZE;
+    }
+
     /* Create ICE */
-    status = pj_ice_strans_create(name, cfg, comp_cnt, tp_ice, 
+    status = pj_ice_strans_create(name, &ice_st_cfg, comp_cnt, tp_ice, 
                                   &ice_st_cb, &tp_ice->ice_st);
     if (status != PJ_SUCCESS) {