diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2023-12-29 09:01:10 +0100 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2023-12-29 09:01:10 +0100 |
| commit | 6643627656e1b66654bb0ab1a744b50dbec9d2b6 (patch) | |
| tree | 4e21b4d11611fd71d75d248f6b09813f006b2c96 | |
| parent | ca2a412d6a992055e4a4f75175919fc6708471c0 (diff) | |
pjproject: sync patches with asterisk 20.5.2
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
| -rw-r--r-- | libs/pjproject/Makefile | 2 | ||||
| -rw-r--r-- | libs/pjproject/patches/0004-config_site.patch | 10 | ||||
| -rw-r--r-- | libs/pjproject/patches/0020-log-dropped-packet-in-debug.patch | 26 |
3 files changed, 36 insertions, 2 deletions
diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile index 9b5372c..326708c 100644 --- a/libs/pjproject/Makefile +++ b/libs/pjproject/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pjproject PKG_VERSION:=2.13.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_CPE_ID:=cpe:/a:pjsip:pjsip # download "vX.Y.tar.gz" as "pjproject-vX.Y.tar.gz" diff --git a/libs/pjproject/patches/0004-config_site.patch b/libs/pjproject/patches/0004-config_site.patch index 3a1e1b9..d9d67ae 100644 --- a/libs/pjproject/patches/0004-config_site.patch +++ b/libs/pjproject/patches/0004-config_site.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/pjlib/include/pj/config_site.h -@@ -0,0 +1,83 @@ +@@ -0,0 +1,91 @@ +/* + * Asterisk config_site.h + */ @@ -84,3 +84,11 @@ +#define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 0 +#define PJ_SSL_SOCK_OSSL_USE_THREAD_CB 0 +#define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 1 ++ ++/* ++ * The default is 32 with 8 being used by pjproject itself. ++ * Since this value is used in invites, dialogs, transports ++ * and subscriptions as well as the global pjproject endpoint, ++ * we don't want to increase it too much. ++ */ ++#define PJSIP_MAX_MODULE 38 diff --git a/libs/pjproject/patches/0020-log-dropped-packet-in-debug.patch b/libs/pjproject/patches/0020-log-dropped-packet-in-debug.patch new file mode 100644 index 0000000..e625f2e --- /dev/null +++ b/libs/pjproject/patches/0020-log-dropped-packet-in-debug.patch @@ -0,0 +1,26 @@ +--- a/pjsip/src/pjsip/sip_transport.c ++++ b/pjsip/src/pjsip/sip_transport.c +@@ -2088,15 +2088,17 @@ PJ_DEF(pj_ssize_t) pjsip_tpmgr_receive_p + * which were sent to keep NAT bindings. + */ + if (tmp.slen) { +- PJ_LOG(1, (THIS_FILE, +- "Error processing %d bytes packet from %s %s:%d %.*s:\n" +- "%.*s\n" +- "-- end of packet.", ++ PJ_LOG(2, (THIS_FILE, ++ "Dropping %d bytes packet from %s %s:%d %.*s\n", + msg_fragment_size, + rdata->tp_info.transport->type_name, +- rdata->pkt_info.src_name, ++ rdata->pkt_info.src_name, + rdata->pkt_info.src_port, +- (int)tmp.slen, tmp.ptr, ++ (int)tmp.slen, tmp.ptr)); ++ PJ_LOG(4, (THIS_FILE, ++ "Dropped packet:" ++ "%.*s\n" ++ "-- end of packet.", + (int)msg_fragment_size, + rdata->msg_info.msg_buf)); + } |