diff --git a/debian/patches/series b/debian/patches/series index b1e238c2a..b77fbb2d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,6 +32,11 @@ sipwise/sca-debug.patch sipwise/sca-fix-notify-after-bye.patch sipwise/sca-add-pai_avp-parameter.patch ## upstream 5.5 +upstream/nathelper-Fix-uninitialized-data.patch +upstream/tmx-use-trimmed-call-id-value-for-hashing.patch +upstream/topos_redis-contact-on-A-side-is-never-updated-on-di.patch +upstream/db_redis-clean-previous-connection-before-trying-to-.patch +upstream/pv-headers-ignore-skip-header-config-on-clone_branch.patch # https://github.com/kamailio/kamailio/pull/979 # collides with our changes to pua_dialoginfo sipwise/Revert-pua_dialoginfo-disable-publish-notifications-.patch @@ -44,6 +49,8 @@ upstream/tm_api_improvement_t_append_branches_with_contact.patch upstream/tsilo_append_by_contact.patch upstream/core_sdp_parser_improve_ice_options_and_cloning.patch upstream/core_sdp_parser_check_value_of_ptr_with_white_space.patch +upstream/permissions-don-t-remove-old-data-at-the-end-of-the-.patch +upstream/permissions-trusted_cleanup_interval.patch ### relevant for upstream sipwise/pua_dialoginfo-refresh_pubruri_avps_flag.patch sipwise/pua_dialoginfo-local_identity_dlg_var.patch @@ -61,11 +68,6 @@ sipwise/db_redis_sscan_fix_empty_key.patch sipwise/kamctl-TMPDIR-config.patch ### active development sipwise/lcr-stopper_mode-parameter.patch -sipwise/db_redis-clean-previous-connection-before-trying-to-.patch -# -sipwise/pv-headers-clone-branch-ignore-skip-header.patch -upstream/permissions-don-t-remove-old-data-at-the-end-of-the-.patch -upstream/permissions-trusted_cleanup_interval.patch # ### Don't just put stuff in any order ### use gbp pq import/export tooling to help maintain patches diff --git a/debian/patches/sipwise/db_redis-clean-previous-connection-before-trying-to-.patch b/debian/patches/upstream/db_redis-clean-previous-connection-before-trying-to-.patch similarity index 84% rename from debian/patches/sipwise/db_redis-clean-previous-connection-before-trying-to-.patch rename to debian/patches/upstream/db_redis-clean-previous-connection-before-trying-to-.patch index a456e5b7b..2910293d2 100644 --- a/debian/patches/sipwise/db_redis-clean-previous-connection-before-trying-to-.patch +++ b/debian/patches/upstream/db_redis-clean-previous-connection-before-trying-to-.patch @@ -1,7 +1,9 @@ From: Victor Seva Date: Mon, 28 Feb 2022 15:24:21 +0100 -Subject: db_redis: clean previous connection before trying to reconnect +Subject: [PATCH] db_redis: clean previous connection before trying to + reconnect +(cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) --- src/modules/db_redis/redis_connection.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/patches/upstream/nathelper-Fix-uninitialized-data.patch b/debian/patches/upstream/nathelper-Fix-uninitialized-data.patch new file mode 100644 index 000000000..f81a23c76 --- /dev/null +++ b/debian/patches/upstream/nathelper-Fix-uninitialized-data.patch @@ -0,0 +1,33 @@ +From: Matthias Urlichs +Date: Tue, 22 Feb 2022 18:22:52 +0100 +Subject: [PATCH] nathelper: Fix uninitialized data + +- the IP checksum is part of the header and must be zeroed before checksumming +- also silence another (benign) warning + +(cherry picked from commit 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2) +--- + src/modules/nathelper/nathelper.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c +index 9e45a61..3cb138e 100644 +--- a/src/modules/nathelper/nathelper.c ++++ b/src/modules/nathelper/nathelper.c +@@ -1615,7 +1615,7 @@ static inline int replace_sdp_ip( + { + str body1, oldip, newip; + str body = *org_body; +- int pf, pf1 = 0; ++ int pf = 0, pf1 = 0; + str body2; + char *bodylimit = body.s + body.len; + int ret; +@@ -1974,6 +1974,7 @@ static int send_raw(const char *buf, int buf_len, union sockaddr_union *to, + ip->ip_off = 0; + ip->ip_ttl = 69; + ip->ip_p = 17; ++ ip->ip_sum = 0; + ip->ip_src.s_addr = s_ip; + ip->ip_dst.s_addr = to->sin.sin_addr.s_addr; + diff --git a/debian/patches/sipwise/pv-headers-clone-branch-ignore-skip-header.patch b/debian/patches/upstream/pv-headers-ignore-skip-header-config-on-clone_branch.patch similarity index 81% rename from debian/patches/sipwise/pv-headers-clone-branch-ignore-skip-header.patch rename to debian/patches/upstream/pv-headers-ignore-skip-header-config-on-clone_branch.patch index cba58d4a6..12ed6d34f 100644 --- a/debian/patches/sipwise/pv-headers-clone-branch-ignore-skip-header.patch +++ b/debian/patches/upstream/pv-headers-ignore-skip-header-config-on-clone_branch.patch @@ -1,7 +1,8 @@ From: Sipwise Development Team Date: Thu, 10 Mar 2022 16:34:37 +0100 -Subject: pv-headers-clone-branch-ignore-skip-header +Subject: [PATCH] pv-headers: ignore skip-header config on clone_branch +(cherry picked from commit 473e051bef688d9e78bc4c28abebbedfffd1f549) --- src/modules/pv_headers/pvh_xavp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/patches/upstream/tmx-use-trimmed-call-id-value-for-hashing.patch b/debian/patches/upstream/tmx-use-trimmed-call-id-value-for-hashing.patch new file mode 100644 index 000000000..64bc89099 --- /dev/null +++ b/debian/patches/upstream/tmx-use-trimmed-call-id-value-for-hashing.patch @@ -0,0 +1,22 @@ +From: Daniel-Constantin Mierla +Date: Wed, 16 Feb 2022 12:45:33 +0100 +Subject: [PATCH] tmx: use trimmed call-id value for hashing + +(cherry picked from commit 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb) +--- + src/modules/tmx/tmx_pretran.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c +index 256c82b..7bb2315 100644 +--- a/src/modules/tmx/tmx_pretran.c ++++ b/src/modules/tmx/tmx_pretran.c +@@ -243,7 +243,7 @@ int tmx_check_pretran(sip_msg_t *msg) + sftag = get_from(msg)->tag_value; + trim(&sftag); + +- chid = get_hash1_raw(msg->callid->body.s, msg->callid->body.len); ++ chid = get_hash1_raw(scallid.s, scallid.len); + slotid = chid & (_tmx_ptran_size-1); + + if(unlikely(_tmx_proc_ptran == NULL)) { diff --git a/debian/patches/upstream/topos_redis-contact-on-A-side-is-never-updated-on-di.patch b/debian/patches/upstream/topos_redis-contact-on-A-side-is-never-updated-on-di.patch new file mode 100644 index 000000000..114a3b3c9 --- /dev/null +++ b/debian/patches/upstream/topos_redis-contact-on-A-side-is-never-updated-on-di.patch @@ -0,0 +1,23 @@ +From: frederic +Date: Wed, 2 Mar 2022 15:59:41 +0100 +Subject: [PATCH] topos_redis: contact on A side is never updated on dialog + update + +(cherry picked from commit 86d233d34b06016fc3436ca4574155959d24bb16) +--- + src/modules/topos_redis/topos_redis_storage.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c +index 0d21cbc..456d54e 100644 +--- a/src/modules/topos_redis/topos_redis_storage.c ++++ b/src/modules/topos_redis/topos_redis_storage.c +@@ -1321,7 +1321,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, + argc++; + + if(mode & TPS_DBU_CONTACT) { +- TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, ++ TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, + argv, argvlen); + TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + argv, argvlen);