Changeset 4333 for pjproject

Timestamp:

Jan 23, 2013 9:53:39 AM (12 years ago)

Author:

nanang

Message:

Re #1603: Replaced sock_sendto() with ioqueue_sendto(), as if ioqueue replaces the socket first (in read operation), sock_sendto() will raise "Bad file descriptor" error.

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c (modified) (5 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

@@ -181 +181 @@
     unsigned char        udp_tx_pkt[UDPSZ];/**< UDP receive buffer.         */
     pj_ssize_t           udp_len;       /**< Length of received packet.     */
-    pj_ioqueue_op_key_t  udp_op_key;    /**< UDP read operation key.        */
+    pj_ioqueue_op_key_t  udp_op_rx_key; /**< UDP read operation key.        */
+    pj_ioqueue_op_key_t  udp_op_tx_key; /**< UDP write operation key.       */
     pj_sockaddr_in       udp_src_addr;  /**< Source address of packet       */
     int                  udp_addr_len;  /**< Source address length.         */
@@ -264 +265 @@
         return status;
 
-    pj_ioqueue_op_key_init(&resv->udp_op_key, sizeof(resv->udp_op_key));
+    pj_ioqueue_op_key_init(&resv->udp_op_rx_key, sizeof(resv->udp_op_rx_key));
+    pj_ioqueue_op_key_init(&resv->udp_op_tx_key, sizeof(resv->udp_op_tx_key));
 
     /* Start asynchronous read to the UDP socket */
     resv->udp_len = sizeof(resv->udp_rx_pkt);
     resv->udp_addr_len = sizeof(resv->udp_src_addr);
-    status = pj_ioqueue_recvfrom(resv->udp_key, &resv->udp_op_key,
+    status = pj_ioqueue_recvfrom(resv->udp_key, &resv->udp_op_rx_key,
                                  resv->udp_rx_pkt, &resv->udp_len,
                                  PJ_IOQUEUE_ALWAYS_ASYNC,
@@ -584 +586 @@
     pj_status_t status;
 
-    /* Create DNS query packet */
-    pkt_size = sizeof(resolver->udp_tx_pkt);
-    name = pj_str(q->key.name);
-    status = pj_dns_make_query(resolver->udp_tx_pkt, &pkt_size, 
-                               q->id, q->key.qtype, &name);
-    if (status != PJ_SUCCESS) {
-        return status;
-    }
-
     /* Select which nameserver(s) to send requests to. */
     server_cnt = PJ_ARRAY_SIZE(servers);
@@ -618 +611 @@
     }
 
+    /* Check if the socket is available for sending */
+    if (pj_ioqueue_is_pending(resolver->udp_key, &resolver->udp_op_tx_key)) {
+        ++q->transmit_cnt;
+        PJ_LOG(4,(resolver->name.ptr,
+                  "Socket busy in transmitting DNS %s query for %s%s",
+                  pj_dns_get_type_name(q->key.qtype),
+                  q->key.name,
+                  (q->transmit_cnt < resolver->settings.qretr_count?
+                   ", will try again later":"")));
+        return PJ_SUCCESS;
+    }
+
+    /* Create DNS query packet */
+    pkt_size = sizeof(resolver->udp_tx_pkt);
+    name = pj_str(q->key.name);
+    status = pj_dns_make_query(resolver->udp_tx_pkt, &pkt_size,
+                               q->id, q->key.qtype, &name);
+    if (status != PJ_SUCCESS) {
+        pj_timer_heap_cancel(resolver->timer, &q->timer_entry);
+        return status;
+    }
+
     /* Get current time. */
     pj_gettimeofday(&now);
@@ -626 +641 @@
         struct nameserver *ns = &resolver->ns[servers[i]];
 
-        status = pj_sock_sendto(resolver->udp_sock, resolver->udp_tx_pkt,
-                                &sent, 0, &resolver->ns[servers[i]].addr,
-                                sizeof(pj_sockaddr_in));
-
-#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
-            PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
-        /* Re-init dead UDP sockets, see ticket #1107 & #1603.
-         * Note: PJ_STATUS_FROM_OS(EPIPE) == PJ_ERRNO_START_SYS + 32.
-         */
-        if (status == PJ_ERRNO_START_SYS + 32) {
-            close_sock(resolver);
-            status = init_sock(resolver);
-            if (status != PJ_SUCCESS) {
-                PJ_PERROR(1,(THIS_FILE, status, "Error reinit UDP socket"));
-                return status;
-            }
-
-            PJ_LOG(3,(THIS_FILE, "UDP socket reinitialized."));
-
-            /* Try to send again */
-            status = pj_sock_sendto(resolver->udp_sock, resolver->udp_tx_pkt,
-                                    &sent, 0, &resolver->ns[servers[i]].addr,
-                                    sizeof(pj_sockaddr_in));
-        }
-#endif
+        status = pj_ioqueue_sendto(resolver->udp_key,
+                                   &resolver->udp_op_tx_key,
+                                   resolver->udp_tx_pkt, &sent, 0,
+                                   &resolver->ns[servers[i]].addr,
+                                   sizeof(pj_sockaddr_in));
 
         PJ_PERROR(4,(resolver->name.ptr, status,