From a1007ee5343019c2b244f8f2c3ac9f5e8d709559 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Fri, 23 Mar 2018 12:49:08 +0000 Subject: main/kamailio: tmx and lcr fixes lcr - fixed checking if there is more uris available for next_gw tmx - allocate space to store ending 0 for branch value --- main/kamailio/APKBUILD | 10 +++++++- ...-there-is-more-uris-available-for-next_gw.patch | 28 ++++++++++++++++++++++ ...-space-to-store-ending-0-for-branch-value.patch | 26 ++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 main/kamailio/lcr-fixed-checking-if-there-is-more-uris-available-for-next_gw.patch create mode 100644 main/kamailio/tmx-allocate-space-to-store-ending-0-for-branch-value.patch diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD index c29a4261e31..b4ec943aaf0 100644 --- a/main/kamailio/APKBUILD +++ b/main/kamailio/APKBUILD @@ -13,7 +13,7 @@ _gittag=HEAD pkgver=4.4.0 -pkgrel=1 +pkgrel=2 [ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}" pkgdesc="Open Source SIP Server" @@ -236,6 +236,8 @@ source="http://www.kamailio.org/pub/kamailio/$pkgver/src/${pkgname}-${pkgver}${_ 0001-musl-fixes.patch 0003-kamdbctl-backslash.patch 0004-remove-spurious-execinfo.patch + tmx-allocate-space-to-store-ending-0-for-branch-value.patch + lcr-fixed-checking-if-there-is-more-uris-available-for-next_gw.patch kamailio.cfg kamailio.initd " @@ -512,17 +514,23 @@ md5sums="e9fa206f67346a6b01c015d76ec2db9d kamailio-4.4.0_src.tar.gz 18863791d386659eae6ef0c82a2517ae 0001-musl-fixes.patch 8c83bc9102a77711e30dcac6e9bba534 0003-kamdbctl-backslash.patch e613ef3611f9a5091ce05084daf9c9a5 0004-remove-spurious-execinfo.patch +c683bee8ee68c250e57862165dc51455 tmx-allocate-space-to-store-ending-0-for-branch-value.patch +9d2c4c39143a90aa52000b3472ba9328 lcr-fixed-checking-if-there-is-more-uris-available-for-next_gw.patch 299706d97e30a4f0d9b4c873df422866 kamailio.cfg 39dc9355fa7d8fec425d3b17c2fb26e0 kamailio.initd" sha256sums="96b5aaac7980f21b022609846e85b2e4244f39b053d22a5e5f7efe5120cdf2b4 kamailio-4.4.0_src.tar.gz 254ea5d4699417aec49e1aae45398a802067a8967060f2a469e278779d876d22 0001-musl-fixes.patch 9aa3b9afea6f0d2d8d306c2f7d093cb846189285e560ce3c62fa2ec2f3d461fe 0003-kamdbctl-backslash.patch fb9c13dd3cd5cd07cf7599cf6688c46739334a18ade64f8bf44f84fb179e8409 0004-remove-spurious-execinfo.patch +693c95fb67facca3c05a4c91e29e8abc70b18d758898b12526433b5be24abcb7 tmx-allocate-space-to-store-ending-0-for-branch-value.patch +ab8382789134d27179b60def4d0f2ec2a06e1b07ec5de8ab75fd4a7b5b761bba lcr-fixed-checking-if-there-is-more-uris-available-for-next_gw.patch 8b742ff710ef67ff59ec07a260690ebcdda24fb6f0b7b64dc50433a1bacf99f2 kamailio.cfg ba928fa914feea2b95b8c659832e3fbea25eb6ac1ce56e4c23ff58c09f1ec3b8 kamailio.initd" sha512sums="3a0df08c705df822f41e96a88cfdaba33db9c8cb3d38c12d858e2f99d5ead1c94a967033cce7e5119f2df64e2d34c383cdb7bf43f4ac52c61cf0323d9b70bf3b kamailio-4.4.0_src.tar.gz 32c8e723ee858b24a3bd1313537e9348bdd895e709041d52199b7d2c4054565f3f8d203458b5a7bd5f4b09a782a972cf87f931de5bb8199e6f9786a3c9bfb3ba 0001-musl-fixes.patch b71457ee4badf2c1848f4ea86afddfd2be2383791e559f5758fd8502d87e434f0149485eb1c33722d111999508b81b0acb56c9dcb462b6522a5f4cbfae05dfde 0003-kamdbctl-backslash.patch d962f7bb7fe5c0747dff050d4c2d74f16eedba903a3347b3f86b42e5d7778f5f8b973a6134fd6714c0a62189bc475396e8225db3468390f6e1a84fc1d44f0d87 0004-remove-spurious-execinfo.patch +ad4dc74c2f800e46a58b1572cab2fd6467cc541b6290d5b7a8723af2e56e94801670da9e0060acf5774378484e4afecd13e89ef98c3c40f1fc952f63bcde35fb tmx-allocate-space-to-store-ending-0-for-branch-value.patch +429e86e6598a522eb74d29731d697d0174f1045ad03ad1d99e738106d5b3c5f0b8a1b101d43c1bfd4f6e7c3728277e6e54289d3db55a1cb129a0396cf4ce90c9 lcr-fixed-checking-if-there-is-more-uris-available-for-next_gw.patch c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b kamailio.cfg cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd" diff --git a/main/kamailio/lcr-fixed-checking-if-there-is-more-uris-available-for-next_gw.patch b/main/kamailio/lcr-fixed-checking-if-there-is-more-uris-available-for-next_gw.patch new file mode 100644 index 00000000000..18e349ebb86 --- /dev/null +++ b/main/kamailio/lcr-fixed-checking-if-there-is-more-uris-available-for-next_gw.patch @@ -0,0 +1,28 @@ +From 1b3e22dcb12d650e08316c28382dc224e9b75148 Mon Sep 17 00:00:00 2001 +From: Daniel-Constantin Mierla +Date: Mon, 12 Feb 2018 08:50:54 +0100 +Subject: [PATCH] lcr: fixed checking if there is more uris available for + next_gw + +- manual backport for 732a3153a0a41d5f951fff85de607f0b46ae73da + +(cherry picked from commit 43c9ad6f4dc2e20dd40a2d3dfa6b03f3dd79e3d4) +--- + modules/lcr/lcr_mod.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c +index a90fb89d7c..91a3f40c58 100644 +--- a/modules/lcr/lcr_mod.c ++++ b/modules/lcr/lcr_mod.c +@@ -2460,8 +2460,8 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) + * Take Request-URI user from ruri_user_avp and generate Request + * and Destination URIs. */ + +- if (!generate_uris(_m, r_uri, &(ruri_user_val.s), &r_uri_len, dst_uri, +- &dst_uri_len, &addr, &gw_index, &flags, &tag_str)) { ++ if (generate_uris(_m, r_uri, &(ruri_user_val.s), &r_uri_len, dst_uri, ++ &dst_uri_len, &addr, &gw_index, &flags, &tag_str) <= 0) { + return -1; + } + } diff --git a/main/kamailio/tmx-allocate-space-to-store-ending-0-for-branch-value.patch b/main/kamailio/tmx-allocate-space-to-store-ending-0-for-branch-value.patch new file mode 100644 index 00000000000..02e3e0c70c0 --- /dev/null +++ b/main/kamailio/tmx-allocate-space-to-store-ending-0-for-branch-value.patch @@ -0,0 +1,26 @@ +From be85408733333f20792de7f1144f987cf9f5b666 Mon Sep 17 00:00:00 2001 +From: Daniel-Constantin Mierla +Date: Sat, 10 Feb 2018 22:05:42 +0100 +Subject: [PATCH] tmx: allocate space to store ending 0 for branch value + +- reported by Alfred Farrugia and Sandro Gauci + +(cherry picked from commit e1d8008a09d9390ebaf698abe8909e10dfec4097) +(cherry picked from commit 7d783adc7de603972966f50106471c06a6be2fac) +--- + modules/tmx/tmx_pretran.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/tmx/tmx_pretran.c b/modules/tmx/tmx_pretran.c +index 00f571bb4a..b92f28befb 100644 +--- a/modules/tmx/tmx_pretran.c ++++ b/modules/tmx/tmx_pretran.c +@@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) + if(likely(vbr!=NULL)) { + svbranch = vbr->value; + trim(&svbranch); +- dsize += svbranch.len; ++ dsize += svbranch.len + 1; + } + if(dsize<256) dsize = 256; + -- cgit v1.2.3