Changeset 5997

Timestamp:

May 22, 2019 12:39:46 AM (4 years ago)

Author:

ming

Message:

Fixed #2134: STUN server resolution failure causes delay

File:

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

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

@@ -62 +62 @@
     pj_ioqueue_op_key_t  send_key;      /* Default send key for app */
     pj_ioqueue_op_key_t  int_send_key;  /* Send key for internal    */
+    pj_status_t          last_err;      /* Last error status        */
 
     pj_uint16_t          tsx_id[6];     /* .. to match STUN msg     */
@@ -423 +424 @@
             opt = PJ_DNS_SRV_FALLBACK_A;
 
+        stun_sock->last_err = PJ_SUCCESS;
         status = pj_dns_srv_resolve(domain, &res_name, default_port, 
                                     stun_sock->pool, resolver, opt,
@@ -430 +432 @@
             PJ_PERROR(4,(stun_sock->obj_name, status,
                          "Failed in pj_dns_srv_resolve()"));
+        } else {
+            /* DNS SRV callback may have been called here, such as when
+             * the result is cached, so we need to check the last error
+             * status. If the callback hasn't been called, processing
+             * will resume later.
+             */
+            status = stun_sock->last_err;
+            if (stun_sock->last_err != PJ_SUCCESS) {
+                PJ_PERROR(4,(stun_sock->obj_name, status,
+                             "Failed in sending Binding request (2)"));
+            }
         }
-
-        /* Processing will resume when the DNS SRV callback is called */
 
     } else {
@@ -578 +589 @@
     /* Handle error */
     if (status != PJ_SUCCESS) {
+        stun_sock->last_err = status;
         sess_fail(stun_sock, PJ_STUN_SOCK_DNS_OP, status);
         pj_grp_lock_release(stun_sock->grp_lock);
@@ -599 +611 @@
 
     /* Start sending Binding request */
-    get_mapped_addr(stun_sock);
+    stun_sock->last_err = get_mapped_addr(stun_sock);
 
     pj_grp_lock_release(stun_sock->grp_lock);