Merge remote-tracking branch 'origin/master' into oce

.github/workflows/ci-mac.yml

@@ -30,14 +30,14 @@ jobs:
       run: CFLAGS="-g -I/usr/local/include -I/usr/local/opt/[email protected]/include -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/[email protected]/lib" CXXFLAGS="-g -fPIC" ./configure
     - name: make
       run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: swig bindings
       run: cd pjsip-apps/src/swig && make
     - name: disable firewall
       run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
-    - name: set up Python 3.10 for pjsua test
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
     - name: unit tests
       run: make pjlib-test-ci pjmedia-test pjlib-util-test pjsua-test
 
@@ -91,6 +91,10 @@ jobs:
       run: CFLAGS="-I/usr/local/include -I/usr/local/opt/[email protected]/include -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/[email protected]/lib" CXXFLAGS="-fPIC" ./configure
     - name: make
       run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: swig bindings
       run: cd pjsip-apps/src/swig && make
 
@@ -105,6 +109,10 @@ jobs:
       run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --with-gnutls=/usr/local/
     - name: make
       run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: swig bindings
       run: cd pjsip-apps/src/swig && make
 
@@ -122,14 +130,14 @@ jobs:
       run: CFLAGS="-g -I/usr/local/include -I/usr/local/opt/[email protected]/include -DHAS_VID_CODEC_TEST=0 -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/[email protected]/lib" CXXFLAGS="-g -fPIC" ./configure
     - name: make
       run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: swig bindings
       run: cd pjsip-apps/src/swig && make
     - name: disable firewall
       run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
-    - name: set up Python 3.10 for pjsua test
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.10'
     - name: unit tests
       run: make pjlib-test-ci pjmedia-test pjlib-util-test pjsua-test
 
@@ -188,6 +196,10 @@ jobs:
       run: CFLAGS="-I/usr/local/include -I/usr/local/opt/[email protected]/include -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/[email protected]/lib" CXXFLAGS="-fPIC" ./configure
     - name: make
       run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: swig bindings
       run: cd pjsip-apps/src/swig && make
 
@@ -204,5 +216,9 @@ jobs:
       run: CFLAGS="-I/usr/local/include -I/usr/local/opt/[email protected]/include -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/[email protected]/lib" CXXFLAGS="-fPIC" ./configure
     - name: make
       run: make
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: swig bindings
       run: cd pjsip-apps/src/swig && make

pjlib-util/src/pjlib-util-test/http_client.c

@@ -163,7 +163,7 @@ static void on_data_read(pj_http_req *hreq, void *data, pj_size_t size)
     PJ_UNUSED_ARG(hreq);
     PJ_UNUSED_ARG(data);
 
-    PJ_LOG(5, (THIS_FILE, "\nData received: %ld bytes", size));
+    PJ_LOG(5, (THIS_FILE, "\nData received: %lu bytes", (unsigned long)size));
     if (size > 0) {
 #ifdef VERBOSE
         printf("%.*s\n", (int)size, (char *)data);
@@ -190,8 +190,8 @@ static void on_send_data(pj_http_req *hreq,
     *data = sdata;
     *size = sendsz;
 
-    PJ_LOG(5, (THIS_FILE, "\nSending data progress: %ld out of %ld bytes", 
-           send_size, total_size));
+    PJ_LOG(5, (THIS_FILE, "\nSending data progress: %lu out of %lu bytes",
+           (unsigned long)send_size, (unsigned long)total_size));
 }
 
 
@@ -210,7 +210,8 @@ static void on_complete(pj_http_req *hreq, pj_status_t status,
         PJ_LOG(3, (THIS_FILE, "Error %d", status));
         return;
     }
-    PJ_LOG(5, (THIS_FILE, "\nData completed: %ld bytes", resp->size));
+    PJ_LOG(5, (THIS_FILE, "\nData completed: %lu bytes",
+               (unsigned long)resp->size));
     if (resp->size > 0 && resp->data) {
 #ifdef VERBOSE
         printf("%.*s\n", (int)resp->size, (char *)resp->data);

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

@@ -1942,12 +1942,12 @@ PJ_DEF(void) pj_dns_resolver_dump(pj_dns_resolver *resolver,
         }
     }
     PJ_LOG(3,(resolver->name.ptr, "  Nb. of pending query free nodes: %lu",
-              pj_list_size(&resolver->query_free_nodes)));
+              (unsigned long)pj_list_size(&resolver->query_free_nodes)));
     PJ_LOG(3,(resolver->name.ptr, "  Nb. of timer entries: %lu",
-              pj_timer_heap_count(resolver->timer)));
+              (unsigned long)pj_timer_heap_count(resolver->timer)));
     PJ_LOG(3,(resolver->name.ptr, "  Pool capacity: %lu, used size: %lu",
-              pj_pool_get_capacity(resolver->pool),
-              pj_pool_get_used_size(resolver->pool)));
+              (unsigned long)pj_pool_get_capacity(resolver->pool),
+              (unsigned long)pj_pool_get_used_size(resolver->pool)));
 
     pj_grp_lock_release(resolver->grp_lock);
 #endif

pjlib-util/src/pjlib-util/stun_simple.c

@@ -76,7 +76,8 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t buf_len,
     msg_len = pj_ntohs(msg->hdr->length);
     if (msg_len != buf_len - sizeof(pjstun_msg_hdr)) {
         PJ_LOG(4,(THIS_FILE, "Error: invalid msg_len %d (expecting %lu)", 
-                             msg_len, buf_len - sizeof(pjstun_msg_hdr)));
+                             msg_len, (unsigned long)
+                             (buf_len - sizeof(pjstun_msg_hdr))));
         return PJLIB_UTIL_ESTUNINMSGLEN;
     }
 

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

@@ -345,8 +345,9 @@ PJ_DEF(pj_status_t) pjstun_get_mapped_addr2(pj_pool_factory *pf,
         }
     }
 
-    TRACE_((THIS_FILE, "  Pool usage=%ld of %ld", pj_pool_get_used_size(pool),
-            pj_pool_get_capacity(pool)));
+    TRACE_((THIS_FILE, "  Pool usage=%lu of %lu",
+            (unsigned long)pj_pool_get_used_size(pool),
+            (unsigned long)pj_pool_get_capacity(pool)));
 
     pj_pool_release(pool);
 

pjlib/include/pj/list.h

@@ -170,6 +170,27 @@ PJ_IDECL(void) pj_list_insert_nodes_after(pj_list_type *lst,
                                           pj_list_type *nodes);
 
 
+/**
+ * Insert a list to another list before the specified element position.
+ *
+ * @param pos   The element to which the node will be inserted before.
+ * @param lst   The list to be inserted.
+ */
+PJ_IDECL(void) pj_list_insert_list_before(pj_list_type *pos,
+                                          pj_list_type *lst);
+
+
+/**
+ * Insert a list to another list after the specified element position.
+ *
+ * @param pos   The element in the list which will precede the inserted
+ *              list.
+ * @param lst   The list to be inserted.
+ */
+PJ_IDECL(void) pj_list_insert_list_after(pj_list_type *pos,
+                                         pj_list_type *lst);
+
+
 /**
  * Remove elements from the source list, and insert them to the destination
  * list. The elements of the source list will occupy the

pjlib/include/pj/list_i.h

@@ -54,6 +54,23 @@ PJ_IDEF(void) pj_list_insert_nodes_before(pj_list_type *pos, pj_list_type *lst)
     pj_list_insert_nodes_after(((pj_list*)pos)->prev, lst);
 }
 
+PJ_IDEF(void) pj_list_insert_list_after(pj_list_type *pos, pj_list_type *lst)
+{
+    if (!pj_list_empty(lst)) {
+        pj_list *lst_last = (pj_list *) ((pj_list*)lst)->prev;
+        pj_list *pos_next = (pj_list *) ((pj_list*)pos)->next;
+
+        pj_link_node(pos, (pj_list *) ((pj_list*)lst)->next);
+        pj_link_node(lst_last, pos_next);
+        pj_list_init(lst);
+    }
+}
+
+PJ_IDEF(void) pj_list_insert_list_before(pj_list_type *pos, pj_list_type *lst)
+{
+    pj_list_insert_list_after(((pj_list*)pos)->prev, lst);
+}
+
 PJ_IDEF(void) pj_list_merge_last(pj_list_type *lst1, pj_list_type *lst2)
 {
     if (!pj_list_empty(lst2)) {

pjlib/src/pj/hash.c

@@ -188,8 +188,8 @@ static pj_hash_entry **find_entry( pj_pool_t *pool, pj_hash_table_t *ht,
         entry = PJ_POOL_ALLOC_T(pool, pj_hash_entry);
         PJ_LOG(6, ("hashtbl", 
                    "%p: New p_entry %p created, pool used=%lu, cap=%lu", 
-                   ht, entry,  pj_pool_get_used_size(pool), 
-                   pj_pool_get_capacity(pool)));
+                   ht, entry,  (unsigned long)pj_pool_get_used_size(pool),
+                   (unsigned long)pj_pool_get_capacity(pool)));
     }
     entry->next = NULL;
     entry->hash = hash;

pjlib/src/pj/pool.c

@@ -53,7 +53,8 @@ static pj_pool_block *pj_pool_create_block( pj_pool_t *pool, pj_size_t size)
     pj_assert(size >= sizeof(pj_pool_block));
 
     LOG((pool->obj_name, "create_block(sz=%lu), cur.cap=%lu, cur.used=%lu", 
-         size, pool->capacity, pj_pool_get_used_size(pool)));
+         (unsigned long)size, (unsigned long)pool->capacity,
+         (unsigned long)pj_pool_get_used_size(pool)));
 
     /* Request memory from allocator. */
     block = (pj_pool_block*) 
@@ -118,7 +119,8 @@ PJ_DEF(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size)
     if (pool->increment_size == 0) {
         LOG((pool->obj_name, "Can't expand pool to allocate %lu bytes "
              "(used=%lu, cap=%lu)",
-             size, pj_pool_get_used_size(pool), pool->capacity));
+             (unsigned long)size, (unsigned long)pj_pool_get_used_size(pool),
+             (unsigned long)pool->capacity));
         (*pool->callback)(pool, size);
         return NULL;
     }
@@ -143,7 +145,9 @@ PJ_DEF(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size)
 
     LOG((pool->obj_name, 
          "%lu bytes requested, resizing pool by %lu bytes (used=%lu, cap=%lu)",
-         size, block_size, pj_pool_get_used_size(pool), pool->capacity));
+         (unsigned long)size, (unsigned long)block_size,
+         (unsigned long)pj_pool_get_used_size(pool),
+         (unsigned long)pool->capacity));
 
     block = pj_pool_create_block(pool, block_size);
     if (!block)
@@ -233,7 +237,8 @@ PJ_DEF(pj_pool_t*) pj_pool_create_int( pj_pool_factory *f, const char *name,
     /* Pool initial capacity and used size */
     pool->capacity = initial_size;
 
-    LOG((pool->obj_name, "pool created, size=%lu", pool->capacity));
+    LOG((pool->obj_name, "pool created, size=%lu",
+                         (unsigned long)pool->capacity));
     return pool;
 }
 
@@ -278,9 +283,10 @@ static void reset_pool(pj_pool_t *pool)
  */
 PJ_DEF(void) pj_pool_reset(pj_pool_t *pool)
 {
-    LOG((pool->obj_name, "reset(): cap=%ld, used=%ld(%ld%%)", 
-        pool->capacity, pj_pool_get_used_size(pool), 
-        pj_pool_get_used_size(pool)*100/pool->capacity));
+    LOG((pool->obj_name, "reset(): cap=%lu, used=%lu(%lu%%)", 
+        (unsigned long)pool->capacity,
+        (unsigned long)pj_pool_get_used_size(pool), 
+        (unsigned long)(pj_pool_get_used_size(pool)*100/pool->capacity)));
 
     reset_pool(pool);
 }
@@ -292,9 +298,10 @@ PJ_DEF(void) pj_pool_destroy_int(pj_pool_t *pool)
 {
     pj_size_t initial_size;
 
-    LOG((pool->obj_name, "destroy(): cap=%ld, used=%ld(%ld%%), block0=%p-%p", 
-        pool->capacity, pj_pool_get_used_size(pool), 
-        pj_pool_get_used_size(pool)*100/pool->capacity,
+    LOG((pool->obj_name, "destroy(): cap=%lu, used=%lu(%lu%%), block0=%p-%p", 
+        (unsigned long)pool->capacity,
+        (unsigned long)pj_pool_get_used_size(pool),
+        (unsigned long)(pj_pool_get_used_size(pool)*100/pool->capacity),
         ((pj_pool_block*)pool->block_list.next)->buf, 
         ((pj_pool_block*)pool->block_list.next)->end));
 

pjlib/src/pj/pool_caching.c

@@ -188,7 +188,8 @@ static pj_pool_t* cpool_create_pool(pj_pool_factory *pf,
             cp->capacity = 0;
         }
 
-        PJ_LOG(6, (pool->obj_name, "pool reused, size=%lu", pool->capacity));
+        PJ_LOG(6, (pool->obj_name, "pool reused, size=%lu",
+                   (unsigned long)pool->capacity));
     }
 
     /* Put in used list. */
@@ -245,9 +246,11 @@ static void cpool_release_pool( pj_pool_factory *pf, pj_pool_t *pool)
     }
 
     /* Reset pool. */
-    PJ_LOG(6, (pool->obj_name, "recycle(): cap=%ld, used=%ld(%ld%%)", 
-               pool_capacity, pj_pool_get_used_size(pool), 
-               pj_pool_get_used_size(pool)*100/pool_capacity));
+    PJ_LOG(6, (pool->obj_name, "recycle(): cap=%lu, used=%lu(%lu%%)", 
+               (unsigned long)pool_capacity,
+               (unsigned long)pj_pool_get_used_size(pool), 
+               (unsigned long)(pj_pool_get_used_size(pool)*100/
+                               pool_capacity)));
     pj_pool_reset(pool);
 
     pool_capacity = pj_pool_get_capacity(pool);
@@ -279,8 +282,9 @@ static void cpool_dump_status(pj_pool_factory *factory, pj_bool_t detail )
     pj_lock_acquire(cp->lock);
 
     PJ_LOG(3,("cachpool", " Dumping caching pool:"));
-    PJ_LOG(3,("cachpool", "   Capacity=%lu, max_capacity=%lu, used_cnt=%lu", \
-                             cp->capacity, cp->max_capacity, cp->used_count));
+    PJ_LOG(3,("cachpool", "   Capacity=%lu, max_capacity=%lu, used_cnt=%lu",
+              (unsigned long)cp->capacity, (unsigned long)cp->max_capacity,
+              (unsigned long)cp->used_count));
     if (detail) {
         pj_pool_t *pool = (pj_pool_t*) cp->used_list.next;
         pj_size_t total_used = 0, total_capacity = 0;
@@ -294,7 +298,7 @@ static void cpool_dump_status(pj_pool_factory *factory, pj_bool_t detail )
 #if 0
                 PJ_LOG(6, ("cachpool", "   %16s block %u, size %ld",
                                        pj_pool_getobjname(pool), nblocks,
-                                       block->end - block->buf + 1));
+                                       (long)(block->end - block->buf + 1)));
 #endif
                 nblocks++;
                 block = block->next;
@@ -303,9 +307,10 @@ static void cpool_dump_status(pj_pool_factory *factory, pj_bool_t detail )
             PJ_LOG(3,("cachpool", "   %16s: %8lu of %8lu (%lu%%) used, "
                                   "nblocks: %d",
                                   pj_pool_getobjname(pool), 
-                                  pj_pool_get_used_size(pool), 
-                                  pool_capacity,
-                                  pj_pool_get_used_size(pool)*100/pool_capacity,
+                                  (unsigned long)pj_pool_get_used_size(pool), 
+                                  (unsigned long)pool_capacity,
+                                  (unsigned long)(pj_pool_get_used_size(pool)*
+                                                  100/pool_capacity),
                                   nblocks));
 
 #if PJ_POOL_MAX_SEARCH_BLOCK_COUNT == 0
@@ -323,8 +328,10 @@ static void cpool_dump_status(pj_pool_factory *factory, pj_bool_t detail )
         }
         if (total_capacity) {
             PJ_LOG(3,("cachpool", "  Total %9lu of %9lu (%lu %%) used!",
-                                  total_used, total_capacity,
-                                  total_used * 100 / total_capacity));
+                                  (unsigned long)total_used,
+                                  (unsigned long)total_capacity,
+                                  (unsigned long)(total_used * 100 /
+                                                  total_capacity)));
         }
     }
 

pjlib/src/pj/ssl_sock_ossl.c

@@ -161,7 +161,7 @@ static void update_certs_info(pj_ssl_sock_t* ssock,
 
 #if OPENSSL_VERSION_NUMBER >= 0x10100000L
 #  define OPENSSL_NO_SSL2           /* seems to be removed in 1.1.0 */
-# if !USING_LIBRESSL
+# ifndef M_ASN1_STRING_data
 #  define M_ASN1_STRING_data(x)     ASN1_STRING_get0_data(x)
 #  define M_ASN1_STRING_length(x)   ASN1_STRING_length(x)
 # endif

pjlib/src/pj/timer.c

@@ -381,8 +381,9 @@ static pj_status_t grow_heap(pj_timer_heap_t *ht)
     pj_timer_entry_dup *new_dup;
 #endif
 
-    PJ_LOG(6,(THIS_FILE, "Growing heap size from %ld to %ld",
-                         ht->max_size, new_size));
+    PJ_LOG(6,(THIS_FILE, "Growing heap size from %lu to %lu",
+                         (unsigned long)ht->max_size,
+                         (unsigned long)new_size));
 
     // First grow the heap itself.
     new_heap = (pj_timer_entry_dup**)