Changeset 2966 for pjproject/trunk/pjnath/src/pjnath/stun_sock.c

Timestamp:

Oct 25, 2009 9:02:07 AM (15 years ago)

Author:

bennylp

Message:

Initial commit for ticket #950: QoS support:

• implementation:
  • PJLIB (sock_qos*.*)
• added QoS support in:
  • SIP UDP transport,
  • SIP TCP transport,
  • media UDP transport (done in pjsua-lib),
  • pjnath ICE stream transport,
  • pjnath STUN socket,
  • pjnath TURN client
• added QoS options in pjsua-lib:
  • QoS fields in pjsua_transport_config
• added "--set-qos" parameter in pjsua

Notes:

• QoS in TLS transport is not yet implemented, waiting for #957
• build ok on VS6, VS2005 (multiple targets), Carbide, and Mingw
• no run-time testing yet

File:

• pjproject/trunk/pjnath/src/pjnath/stun_sock.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_sock.c

@@ -137 +137 @@
     cfg->async_cnt = 1;
     cfg->ka_interval = PJ_STUN_KEEP_ALIVE_SEC;
+    cfg->qos_type = PJ_QOS_TYPE_BEST_EFFORT;
+    cfg->qos_ignore_error = PJ_TRUE;
 }
 
@@ -201 +203 @@
         goto on_error;
 
+    /* Apply QoS, if specified */
+    status = pj_sock_apply_qos2(stun_sock->sock_fd, cfg->qos_type,
+                                &cfg->qos_params, 2, stun_sock->obj_name,
+                                NULL);
+    if (status != PJ_SUCCESS && !cfg->qos_ignore_error)
+        goto on_error;
+
+    /* Bind socket */
     if (pj_sockaddr_has_addr(&cfg->bound_addr)) {
         status = pj_sock_bind(stun_sock->sock_fd, &cfg->bound_addr,
@@ -759 +769 @@
     /* Log socket error */
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(2,(stun_sock->obj_name, "recvfrom() error: %s", errmsg));
+        pj_perror(2, stun_sock->obj_name, status, "recvfrom() error", 0);
         return PJ_TRUE;
     }