Changeset 1596

Timestamp:

Nov 23, 2007 3:54:49 AM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #425: pjstun_get_mapped_addr() failed when receiving incoming SIP request (thanks Lafras Henning)

File:

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

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

@@ -19 +19 @@
 #include <pjlib-util/stun_simple.h>
 #include <pjlib-util/errno.h>
+#include <pj/log.h>
 #include <pj/os.h>
 #include <pj/pool.h>
@@ -26 +27 @@
 
 
-enum { MAX_REQUEST = 3 };
-static int stun_timer[] = {1600, 1600, 1600 };
+enum { MAX_REQUEST = 4 };
+static int stun_timer[] = {1000, 1000, 1000, 1000 };
 
 #define THIS_FILE       "stun_client.c"
@@ -131 +132 @@
 
         for (pj_gettimeofday(&now), select_rc=1; 
-             status==PJ_SUCCESS && select_rc==1 && wait_resp>0 
+             status==PJ_SUCCESS && select_rc>=1 && wait_resp>0 
                && PJ_TIME_VAL_LT(now, next_tx); 
              pj_gettimeofday(&now)) 
@@ -166 +167 @@
                                            &addrlen);
 
-                --wait_resp;
-
-                if (status != PJ_SUCCESS)
-                    continue;
+                if (status != PJ_SUCCESS) {
+                    char errmsg[PJ_ERR_MSG_SIZE];
+
+                    PJ_LOG(4,(THIS_FILE, "recvfrom() error ignored: %s",
+                              pj_strerror(status, errmsg,sizeof(errmsg)).ptr));
+
+                    /* Ignore non-PJ_SUCCESS status.
+                     * It possible that other SIP entity is currently 
+                     * sending SIP request to us, and because SIP message
+                     * is larger than STUN, we could get EMSGSIZE when
+                     * we call recvfrom().
+                     */
+                    status = PJ_SUCCESS;
+                    continue;
+                }
 
                 status = pjstun_parse_msg(recv_buf, len, &msg);
                 if (status != PJ_SUCCESS) {
-                    continue;
-                }
-
+                    char errmsg[PJ_ERR_MSG_SIZE];
+
+                    PJ_LOG(4,(THIS_FILE, "STUN parsing error ignored: %s",
+                              pj_strerror(status, errmsg,sizeof(errmsg)).ptr));
+
+                    /* Also ignore non-successful parsing. This may not
+                     * be STUN response at all. See the comment above.
+                     */
+                    status = PJ_SUCCESS;
+                    continue;
+                }
 
                 sock_idx = pj_ntohl(msg.hdr->tsx[2]);
@@ -189 +209 @@
                     continue;
                 }
+
+                /* From this part, we consider the packet as a valid STUN
+                 * response for our request.
+                 */
+                --wait_resp;
 
                 if (pjstun_msg_find_attr(&msg, PJSTUN_ATTR_ERROR_CODE) != NULL) {