Changeset 4108

Timestamp:

Apr 27, 2012 1:32:12 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: merged r4100-4107

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c (modified) (2 diffs)
• pjlib/src/pjlib-test/udp_echo_srv_sync.c (modified) (3 diffs)
• pjmedia/src/pjmedia/stream.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_resolve.c (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -6635 +6635 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status run with --help for more info
-as_fn_error "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f core conftest.err conftest.$ac_objext \

pjproject/trunk/aconfigure.ac

@@ -1112 +1112 @@
                                            [ippStaticInit();])],
                   [AC_MSG_RESULT(ok)],
-                  [AC_MSG_FAILURE(Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info)])
+                  [AC_MSG_FAILURE([Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info])])
 
         CFLAGS="$SAVED_CFLAGS"

pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c

@@ -23 +23 @@
 static pj_ioqueue_key_t *key;
 static pj_atomic_t *total_bytes;
+static pj_bool_t thread_quit_flag;
 
 struct op_key
@@ -146 +147 @@
     }
     
-    for (;;) {
+    while (!thread_quit_flag) {
         pj_time_val timeout;
         timeout.sec = 0; timeout.msec = 10;
         rc = pj_ioqueue_poll(ioqueue, &timeout);
     }
-    PJ_UNREACHED(return 0;)
+    return 0;
 }
 

pjproject/trunk/pjlib/src/pjlib-test/udp_echo_srv_sync.c

@@ -22 +22 @@
 
 static pj_atomic_t *total_bytes;
+static pj_bool_t thread_quit_flag = 0;
 
 static int worker_thread(void *arg)
@@ -29 +30 @@
     pj_status_t  last_recv_err = PJ_SUCCESS, last_write_err = PJ_SUCCESS;
 
-    for (;;) {
+    while (!thread_quit_flag) {
         pj_ssize_t len;
         pj_status_t rc;
@@ -57 +58 @@
         }
     }
-    PJ_UNREACHED(return 0;)
+    return 0;
 }
 

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -962 +962 @@
                                      "Error generating RTCP SDES"));
         } else {
-            len += sdes_len;
+            len += (int)sdes_len;
         }
     }
@@ -1020 +1020 @@
                                      "Error generating RTCP BYE"));
         } else {
-            len += bye_len;
+            len += (int)bye_len;
         }
     }

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -264 +264 @@
             count = 1;
             status = pj_getaddrinfo(af, &target->addr.host, &count, &ai);
-            if (status != PJ_SUCCESS)
+            if (status != PJ_SUCCESS) {
+                /* "Normalize" error to PJ_ERESOLVE. This is a special error
+                 * because it will be translated to SIP status 502 by
+                 * sip_transaction.c
+                 */
+                status = PJ_ERESOLVE;
                 goto on_error;
+            }
 
             svr_addr.entry[0].addr.addr.sa_family = (pj_uint16_t)af;