Merge upstream/master into master

intermedia-net · Sep 8, 2024 · 7c40b3a · 7c40b3a
2 parents 139b989 + d555ec1
commit 7c40b3a
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 4 deletions.
diff --git a/pjmedia/src/pjmedia-codec/silk.c b/pjmedia/src/pjmedia-codec/silk.c
@@ -700,7 +700,7 @@ static pj_status_t  silk_codec_modify(pjmedia_codec *codec,
     PJ_UNUSED_ARG(codec);
     PJ_UNUSED_ARG(attr);
 
-    return PJ_SUCCESS;
+    return PJ_ENOTSUP;
 }
 
 

diff --git a/pjsip-apps/src/swig/python/setup.py b/pjsip-apps/src/swig/python/setup.py
@@ -17,7 +17,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 #
-from distutils.core import setup, Extension
+try:
+   from setuptools import setup, Extension
+except ImportError:
+   from distutils.core import setup, Extension
+
 import os
 import sys
 import platform

diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
@@ -3410,6 +3410,8 @@ PJ_DECL(pj_status_t) pjsua_transport_get_info(pjsua_transport_id id,
                                               pjsua_transport_info *info);
 
 
+#if 0
+// Not implemented.
 /**
  * Disable a transport or re-enable it. By default transport is always 
  * enabled after it is created. Disabling a transport does not necessarily
@@ -3423,6 +3425,7 @@ PJ_DECL(pj_status_t) pjsua_transport_get_info(pjsua_transport_id id,
  */
 PJ_DECL(pj_status_t) pjsua_transport_set_enable(pjsua_transport_id id,
                                                 pj_bool_t enabled);
+#endif
 
 
 /**

diff --git a/pjsip/include/pjsua2/endpoint.hpp b/pjsip/include/pjsua2/endpoint.hpp
@@ -1533,6 +1533,8 @@ class Endpoint
      */
     TransportInfo transportGetInfo(TransportId id) const PJSUA2_THROW(Error);
 
+#if 0
+    // Not implemented.
     /**
      * Disable a transport or re-enable it. By default transport is always
      * enabled after it is created. Disabling a transport does not necessarily
@@ -1544,6 +1546,7 @@ class Endpoint
      *
      */
     void transportSetEnable(TransportId id, bool enabled) PJSUA2_THROW(Error);
+#endif
 
     /**
      * Close the transport. The system will wait until all transactions are

diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c
@@ -961,7 +961,11 @@ PJ_DEF(pj_status_t) pjsua_call_make_call(pjsua_acc_id acc_id,
 
     if( opt->custom_call_id.slen > 0 ){
         pj_strdup(dlg->pool, &dlg->call_id->id, &opt->custom_call_id);
-        PJ_LOG(4,(THIS_FILE, "Set user defined Call-ID (%.*s)", (int)dlg->call_id->id.slen, dlg->call_id->id.ptr  ));
+        PJ_LOG(4,(THIS_FILE, "Set user defined "
+                             "Call-ID (%.*s)",
+                  (int)dlg->call_id->id.slen, dlg->call_id->id.ptr  ));
+        pj_bzero(&call->opt.custom_call_id,
+                  sizeof(call->opt.custom_call_id));
     }
 
     /* Increment the dialog's lock otherwise when invite session creation

diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -2937,6 +2937,7 @@ PJ_DEF(pj_status_t) pjsua_transport_get_info( pjsua_transport_id id,
 }
 
 
+#if 0
 /*
  * Disable a transport or re-enable it.
  */
@@ -2957,6 +2958,7 @@ PJ_DEF(pj_status_t) pjsua_transport_set_enable( pjsua_transport_id id,
 
     return PJ_EINVALIDOP;
 }
+#endif
 
 
 /*

diff --git a/pjsip/src/pjsua2/call.cpp b/pjsip/src/pjsua2/call.cpp
@@ -234,7 +234,7 @@ void CallSetting::fromPj(const pjsua_call_setting &prm)
     this->audioCount        = prm.aud_cnt;
     this->videoCount        = prm.vid_cnt;
     this->mediaDir.clear();
-    this->customCallId        = pj2Str(prm.custom_call_id);
+    this->customCallId      = pj2Str(prm.custom_call_id);
 
     /* Since we don't know the size of media_dir array, we populate
      * mediaDir vector up to the element with non-default value.

diff --git a/pjsip/src/pjsua2/endpoint.cpp b/pjsip/src/pjsua2/endpoint.cpp
@@ -2287,11 +2287,14 @@ TransportInfo Endpoint::transportGetInfo(TransportId id) const PJSUA2_THROW(Erro
     return tinfo;
 }
 
+#if 0
+// pjsua_transport_set_enable() not implemented
 void Endpoint::transportSetEnable(TransportId id, bool enabled)
                                   PJSUA2_THROW(Error)
 {
     PJSUA2_CHECK_EXPR( pjsua_transport_set_enable(id, enabled) );
 }
+#endif
 
 void Endpoint::transportClose(TransportId id) PJSUA2_THROW(Error)
 {
-Original file line number
+Diff line change
@@ Expand Up @@
     }
+    #if 0
     /*
      * Disable a transport or re-enable it.
      */
@@ Expand All @@
         return PJ_EINVALIDOP;
     }
+    #endif
     /*
@@ Expand Down @@