sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
290 discussions

git:5.5:9d039b60: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 May '22

05 May '22

Module: kamailio Branch: 5.5 Commit: 9d039b6023dc7c0bfb48509fc47f830eaeede90f URL: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-05T09:31:59+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth/README Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… Patch: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index c0badc4115..25c448901d 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -143,7 +143,8 @@ Chapter 1. Admin Guide 2. Dependencies - The module does not depend on any other module. + The following modules must be loaded before this module: + * sl - stateless reply. 3. Parameters diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index 3d46af3ba3..890952c7c5 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -757,11 +757,11 @@ $ kamcmd cfgutils.get_gflags Example 1.34. RANDOM pseudo-variable usage ... if (rand_event()) { - $avp(i:10) = ($RANDOM / 16777216); # 2^24 - if ($avp(i:10) < 10) { - $avp(i:10) = 10; + $var(value) = ($RANDOM / 16777216); # 2^24 + if ($var(value) < 10) { + $var(value) = 10; } - append_to_reply("Retry-After: $avp(i:10)\n"); + append_to_reply("Retry-After: $var(value)\n"); sl_send_reply("503", "Try later"); exit; };

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 05 May '22

05 May '22

- URL: https://github.com/kamailio/kamailio/commit/8614efb544374945a45b755586d9a05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:44:10+02:00 blst: docs - small formatting updates (cherry picked from commit 415f20804e423b503d5e0d1743e28c9f509f9c21) - URL: https://github.com/kamailio/kamailio/commit/ddcc1a24fc6b4323de09ee30c4dc64d… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Date: 2022-05-05T08:45:22+02:00 cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id (cherry picked from commit 62f7be2281f5dd91a5668c4b84e52a7d7169e21f) - URL: https://github.com/kamailio/kamailio/commit/fad03e0af24629b5dfdd835d251b350… Author: frederic <frederic.gaisnon(a)mmtt.fr> Date: 2022-05-05T08:47:31+02:00 topos: handle BYE sent by callee during non connected call with provitional response sent by callee (INVITE,180 and BYE from callee instead CANCEL) (cherry picked from commit e1974977a3e604996b752566d187b77da5072999) - URL: https://github.com/kamailio/kamailio/commit/d4a69b1b4878c808631fca078a5980c… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2022-05-05T08:47:59+02:00 smsops: Fix ucs2-to-utf8 for Accent chars (cherry picked from commit f9f16a6c700a7378fc30f6f9c0a767438fc638b9) - URL: https://github.com/kamailio/kamailio/commit/c30312a4f7e4bdacd777c5df2adfe85… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2022-05-05T08:48:19+02:00 siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses. (cherry picked from commit 57b1d5375927b987b162fcf0e2c99a39b717bd65) - URL: https://github.com/kamailio/kamailio/commit/fc454a5c2a9c83732ed11df7f42cb98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:49:38+02:00 core: parse sdp - detect multipart invalid format (cherry picked from commit 7076904d0f0980d6bfa0814e3b1a8c61ee0acecc) - URL: https://github.com/kamailio/kamailio/commit/afefd474c9571f7c0282823819335d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:49:49+02:00 core: parse sdp - removed redundant check (cherry picked from commit 355c02106c95400c44833a89aeea68c61ba2f200) - URL: https://github.com/kamailio/kamailio/commit/46eaf304de272134579519740f589dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:01+02:00 sanity: use dedicated functions for parsing From/To URIs - updates to parsing Contact headers (cherry picked from commit 5c99d7f87ed94cd52c6ab74d46f511447b3db2b9) - URL: https://github.com/kamailio/kamailio/commit/0947dde559a60afc52fb46c9dbcd123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:21+02:00 core: parser - helper functions to parse all record-/route headers (cherry picked from commit 22b8ecc24442dce775600dfb186a83bc947fd4ca) - URL: https://github.com/kamailio/kamailio/commit/d74d044f54d49cd4c80f9ae75fbd025… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:44+02:00 dispatcher: fix ds_reload() return logic - GH #3054 (cherry picked from commit 30079910bbb33b430621f188beae40c71592bcba) - URL: https://github.com/kamailio/kamailio/commit/4213ed97695dac97505422a8a9925c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:02+02:00 core: parse uri - detect empty user when @ is found (cherry picked from commit 0c101ffe713603e812759da6d396e0451cf13ba1) - URL: https://github.com/kamailio/kamailio/commit/140abc77f33861952c750e7013767b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:15+02:00 sipcapture: init buffers content (cherry picked from commit 9292b9f5daacfa5340b5fe1a5f02469a7e597d9b) - URL: https://github.com/kamailio/kamailio/commit/81b93c0858cf7ccc357b3d623336d79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:27+02:00 dmq: init peer structures (cherry picked from commit 0204232ba1f229edb9c7e0080e98e9d3b2500672) - URL: https://github.com/kamailio/kamailio/commit/44295fa538e0d0b88208264a516d15a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:42+02:00 sipcapture: more init buffers content (cherry picked from commit 0b684a5d9a2f5d17e64cb8cb5f4b53b06f180f06) - URL: https://github.com/kamailio/kamailio/commit/c16044f47def23c4d43fbc9b38ffc56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:58+02:00 pua_reginfo: init uri buffer (cherry picked from commit 692d15ce9bcc329fff55060dcdc8e5161f12c30e) - URL: https://github.com/kamailio/kamailio/commit/b16a4e5038c30a4fdd662ce1f080df9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:52:12+02:00 core: parse uri - sanity check for user part (cherry picked from commit eda4b3c51ce12d4fe052b7e9ad40be1ef6e56444) - URL: https://github.com/kamailio/kamailio/commit/f6995deb6c7a03542ca381b30279f76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:52:38+02:00 core: parse - fix typo in comment of previous commit (cherry picked from commit 8b20e6045dbebdb784a4e8f66d81fc79c0a17304) - URL: https://github.com/kamailio/kamailio/commit/5c65d50469dbffb3ce021ff2db2af61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:00+02:00 core: parser digest - warn if the header type is not set properly (cherry picked from commit 67e0fa5e53ef5d4dd9802e3027b2bc7ff6dcb671) - URL: https://github.com/kamailio/kamailio/commit/5b387fc146db587b01b961e1d07afe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:18+02:00 core: parser - catch special header types for get_hdr() (cherry picked from commit f9a38d6b621a2c3966a3c85dce6fdd2e6bb8d431) - URL: https://github.com/kamailio/kamailio/commit/cd3f1f8fe6ef1836ac2c8a43731dcf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:42+02:00 seas: check for header type value for flags comparison (cherry picked from commit e513d1cc549fea43eebc5fc504bb01270adbc10e) - URL: https://github.com/kamailio/kamailio/commit/841baf0fc851b1cd180da3c5e5bac54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:55+02:00 db_text: reworked the checks for database and table names (cherry picked from commit d4af1304778c10213cb1f98e23938c6c4b912723) - URL: https://github.com/kamailio/kamailio/commit/071fba8cc700d99b62aba59bc768681… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:32+02:00 db_redis: init allocated structure (cherry picked from commit b8c4d8b8d0f06267f2bc1a760307345fd06745ce) - URL: https://github.com/kamailio/kamailio/commit/9083eb3befc2a50df12b57ff3e1098a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:43+02:00 core: 0-terminate string for very long local network interface names (cherry picked from commit 476d763d8ee504b71c13063ca002ecfe158da94e) - URL: https://github.com/kamailio/kamailio/commit/ddc343f3a89faeacd85ae1374594e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:53+02:00 db_berkeley: covert blob values (cherry picked from commit dad443172628c3736b057fa24343c265ed3827b2) - URL: https://github.com/kamailio/kamailio/commit/22fd93ec58abbbe4a850343b85082f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:56:02+02:00 core: parse uri - extra check when user part is missing before @ (cherry picked from commit b32a9caf4797370a4704b5f94d2d704b6e52fdef) - URL: https://github.com/kamailio/kamailio/commit/08eeb04d40a3a66a139fd60df153724… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-05-05T08:57:03+02:00 utils: fixed sinitiser error [root@localhost]# kamcmd cfg.seti param_group param_name value ================================================================= ==2409977==ERROR: LeakSanitizer: detected memory leaks Direct leak of 38 byte(s) in 1 object(s) allocated from: #0 0xffff98c250af in malloc (/lib64/libasan.so.5+0xd50af) #1 0x41549f in parse_listen_id /root/kamailio/utils/kamcmd/parse_listen_id.c:133 #2 0x4144fb in main /root/kamailio/utils/kamcmd/kamcmd.c:2075 #3 0xffff97dc0de3 in __libc_start_main (/lib64/libc.so.6+0x20de3) #4 0x40260b (/usr/local/sbin/kamcmd+0x40260b) (cherry picked from commit d28ca884548b0f24a618ed9cbdc8e1b9538f2574) - URL: https://github.com/kamailio/kamailio/commit/d4b2b095e6da139d886ac71d3aae1e7… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2022-05-05T08:57:28+02:00 siptrace: fix pkg memory leak when module configured with core callbacks - Correctly freeng pkg memory in core callbacks when body modifications take place with X-Siptrace headers, also fix potential pkg_free with not dynamicaly allocated objects. (cherry picked from commit fc50ce1dbd31bbd28a11d672ed9bdbe9bd4ae5d0) - URL: https://github.com/kamailio/kamailio/commit/963842bc6afec81ef3d8ba8c7d0e9b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:59:49+02:00 core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6 (cherry picked from commit 2eac6a0c2f2dd7c8831ef65fa9d92b88a79d23af) - URL: https://github.com/kamailio/kamailio/commit/beb501f3ac2dd6095b0184c60f9fe41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:00:40+02:00 permissions: return ret variable set inside double_fixup() (cherry picked from commit e272eea0229678b4446a3907b7360c61c273caa7) - URL: https://github.com/kamailio/kamailio/commit/25b54ae9a62d6877f74356fedf0325b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-05T09:02:16+02:00 auth: Fix missing dependency in docs (cherry picked from commit dd15436e8697f70df6ef9d188da36f70e7116a74) - URL: https://github.com/kamailio/kamailio/commit/4be7e2573750c4bccef4e74eafd41bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:01+02:00 htable: reset entries field if hash table initialization fails (cherry picked from commit d542cb89afb1a34cba35cbcf0f40315581fbb767) - URL: https://github.com/kamailio/kamailio/commit/02b0340f8dcfc172d5f4c493bf97a60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:09+02:00 htable: track when records were successfully loaded from database - write back only in such case (cherry picked from commit b1fa63b1547fc5af6cc1e97db42ea76db1bf927b) - URL: https://github.com/kamailio/kamailio/commit/b8ad92740a35df43aba201e116641df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:22+02:00 htable: check if entries are initialized before sync'ing to db (cherry picked from commit 9a8974a80b8ce5ffc9166e81f43f8581777cd48f) - URL: https://github.com/kamailio/kamailio/commit/ccf116505f1784b635dc1e9e1f5e4e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:04:55+02:00 xmlops: coherent formatting (cherry picked from commit 098955e23289b82db40d5cef76ee03bf09e8a0da) - URL: https://github.com/kamailio/kamailio/commit/d6d73e3bb7d3fa1a07d816a136316f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:05:04+02:00 topos: use direction for loading invite record for other early dialog requests - GH #3090 (cherry picked from commit ceb688b3d364bb7b8d9f52b7238d560cb4e30b3d) - URL: https://github.com/kamailio/kamailio/commit/170126fb80bf93595a5d3e3b2f56c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:05:25+02:00 topos: restore attributes based on direction for early dialog requests - GH #3090 (cherry picked from commit c309122864eaa2bfa58253290bed49084ccc9302) - URL: https://github.com/kamailio/kamailio/commit/58a02618cec102455e35ad3dfbddf93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:06:53+02:00 core: mem/tlsf - handle return codes during memory pool init (cherry picked from commit ef62bfb27514dc7ec3b603bee661cfac18c4fe93) - URL: https://github.com/kamailio/kamailio/commit/fef9c3406c2f070bf25013997912124… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:07:04+02:00 rls: free resources in case of errors (cherry picked from commit 72443722d7fda4289390ef8bc20ad91990b895a7) - URL: https://github.com/kamailio/kamailio/commit/3b8f91d241ccf965c08bdb6ad560cf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:02+02:00 topos: catch INFO requests during early dialog phase (cherry picked from commit 67da7301f1eb74b6fff9e6e73b43f08dbc9c53bf) - URL: https://github.com/kamailio/kamailio/commit/0cc8bbad9fab44c387535b09fc51944… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:15+02:00 rls: safety check for dialog structur (cherry picked from commit b5aae4f5afd07db114c3ff7712b484f743663b26) - URL: https://github.com/kamailio/kamailio/commit/397b5c1c7f5c4e8743dbfcf851dede1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:28+02:00 xcap_client: init structure (cherry picked from commit cfb50124e67b68552520e418a20ad2dfec96117b) - URL: https://github.com/kamailio/kamailio/commit/c7d8f24f2237c03e493ddfe0fbb806b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:02+02:00 lrkproxy: init value for compiler warning (cherry picked from commit 9fd0cae960b0795a5e511c37f768f0962b7a15c1) - URL: https://github.com/kamailio/kamailio/commit/05e2b31ff419176cbc8be4f848c940f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:14+02:00 sms: use unsigned int for bit shifting for compiler warnings (cherry picked from commit cacae7fc5db5418a67d543995273280d57f027c6) - URL: https://github.com/kamailio/kamailio/commit/1d39dc57cda8fbb169a3848c5e4dba3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:37+02:00 presence_xml: free uri for http xcap auth (cherry picked from commit eba6c7d78088cde411f5cd1b7730ba458e62a69e) - URL: https://github.com/kamailio/kamailio/commit/a830c48802edeb0284dbfb7e554b39d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:22+02:00 core: main - check the debug cli param value (cherry picked from commit dfc407c4009acbd6e05ecfaf4e727b0636ab92a4) - URL: https://github.com/kamailio/kamailio/commit/a03721b4e0b9251b11dd2dcabbdce3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:41+02:00 core: modparam - safety check for str s pointer - deal with the case of argument with 'nonnull' attribute passed null (cherry picked from commit 69c004eec161c14d957f9e4011aeff4163af858d) - URL: https://github.com/kamailio/kamailio/commit/eac307296fafeb96047a4359f3d36de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:52+02:00 snmpstats: use same type as the pointer for sizeof (cherry picked from commit 3de5a781a3d0333352ab72c6b790f472f393df2b) - URL: https://github.com/kamailio/kamailio/commit/db3fb40e3b8e1b12ad6a0faf7274abf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:11:03+02:00 cdp: use same data type for size computing as pointer type (cherry picked from commit 47169b6774759131e9e535f2b9d358772b777b9c) - URL: https://github.com/kamailio/kamailio/commit/bb63c1212ba8ce1d2ea6d07c007c7d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:11:51+02:00 snmpstats: fix allocator sizeof operand mismatch (cherry picked from commit 0c99fed48403e2cc4f24441901b81b7c51411511) - URL: https://github.com/kamailio/kamailio/commit/3bccd877acbc03b136186fd45bc98ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:12:03+02:00 msilo: skip invalid stored records (cherry picked from commit e5efcbdd7be9897cf169b28a7a52c45bff24cac3) - URL: https://github.com/kamailio/kamailio/commit/2b3e09d781a157629c5f9bdb809f7c4… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-05T09:12:16+02:00 cfgutils: improve example for $RANDOM (cherry picked from commit 79b2e4b00ebf7a7cdf0ed3b9c4ab7f0176d78686) - URL: https://github.com/kamailio/kamailio/commit/a05a2f01bcc85ee1f5d9db707d289e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:19+02:00 lcr: init variable for fixing warning report (cherry picked from commit 7f359ca152e87ec72c6dd39fe09885bae630e36f) - URL: https://github.com/kamailio/kamailio/commit/17d9e99b6f3826cbad59e01dbbc1ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:30+02:00 tm: function to clean local parsed headers and body for uas request - some modules use t->uas.request for getting attributes of the transaction request when processing the response, which may result in pointers to private memory being stored in the shared memory, causing crashes when other processes try to use the pointers (cherry picked from commit 159224b254d9a67104c60fedab46a1b78cf19a83) - URL: https://github.com/kamailio/kamailio/commit/12ca7d43a262ef7a654933db65cde78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:42+02:00 tm: relocated defines not useful in the header file (cherry picked from commit 27b6c641b5d941503f974fea05af506972ac2ab5) - URL: https://github.com/kamailio/kamailio/commit/d5d2105b82503f747ed82803c0dab5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:52+02:00 presence: rename local variable that conflicts with tm define (cherry picked from commit 8e69474ab7fd23ebd03bd193387f7e9fe8e1346d) - URL: https://github.com/kamailio/kamailio/commit/259448fe45346eeb201d441a6cde471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:06+02:00 cdp: close socket in case of error (cherry picked from commit 993c036bb185f6053a3a2f0486be30398918a87c) - URL: https://github.com/kamailio/kamailio/commit/34d83298f0dfa79e228bdb5998b3c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:17+02:00 sanity: fix sanity_reply function name for config exports (cherry picked from commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043) - URL: https://github.com/kamailio/kamailio/commit/cbb86fe6451c4ed323a394ce6691f08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:34+02:00 Revert "sanity: fix sanity_reply function name for config exports" This reverts commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043. (cherry picked from commit d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe) - URL: https://github.com/kamailio/kamailio/commit/89c917534b76d936993ce1b590df6fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:46+02:00 sanity: fix sanity_reply() function name for config exports (cherry picked from commit 7c52c05b09abdf2cf754cc02f3a1ea0855cdedd0)

1 0

git:master:7c52c05b: sanity: fix sanity_reply() function name for config exports
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 7c52c05b09abdf2cf754cc02f3a1ea0855cdedd0 URL: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:33:47+02:00 sanity: fix sanity_reply() function name for config exports --- Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… Patch: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… --- diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 3f813bb021..832a0c2308 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:d9e0e371: Revert "sanity: fix sanity_reply function name for config exports"
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe URL: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:33:08+02:00 Revert "sanity: fix sanity_reply function name for config exports" This reverts commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043. --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_con.h Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… Patch: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 5dc0cabfb7..54b66d330b 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2003 FhG Fokus * Copyright (C) 2007-2008 1&1 Internet AG - * + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p LM_ERR("The configured db_url is too long\n"); return 0; } - + /* this is the root memory for this database connection. */ res = (db1_con_t*)pkg_malloc(con_size); if (!res) { diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h index fab02c0e62..3a026f1f93 100644 --- a/src/lib/srdb1/db_con.h +++ b/src/lib/srdb1/db_con.h @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -36,7 +36,6 @@ * are used as a connection handle from modules uses the db API. */ typedef struct { - long cpid; /*!< connection process id */ const str* table; /*!< Default table that should be used */ const char *tquote; /*!< Char to quote special tokens (table/column names) */ unsigned long tail; /*!< Variable length tail, database module specific */ diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 832a0c2308..3f813bb021 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:eeefe7dc: sanity: fix sanity_reply function name for config exports
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: eeefe7dcc2af90e7def8f1698e8f79d0dd020043 URL: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:25:03+02:00 sanity: fix sanity_reply function name for config exports --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_con.h Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… Patch: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 54b66d330b..5dc0cabfb7 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2003 FhG Fokus * Copyright (C) 2007-2008 1&1 Internet AG - * + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p LM_ERR("The configured db_url is too long\n"); return 0; } - + /* this is the root memory for this database connection. */ res = (db1_con_t*)pkg_malloc(con_size); if (!res) { diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h index 3a026f1f93..fab02c0e62 100644 --- a/src/lib/srdb1/db_con.h +++ b/src/lib/srdb1/db_con.h @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -36,6 +36,7 @@ * are used as a connection handle from modules uses the db API. */ typedef struct { + long cpid; /*!< connection process id */ const str* table; /*!< Default table that should be used */ const char *tquote; /*!< Char to quote special tokens (table/column names) */ unsigned long tail; /*!< Variable length tail, database module specific */ diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 3f813bb021..832a0c2308 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:993c036b: cdp: close socket in case of error
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 993c036bb185f6053a3a2f0486be30398918a87c URL: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T14:55:01+02:00 cdp: close socket in case of error --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… Patch: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0bff4131d3..692cc363ae 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -844,7 +844,7 @@ int receive_loop(peer *original_peer) */ int peer_connect(peer *p) { - int sock; + int sock = -1; int tmp = 0; unsigned int option = 1; @@ -922,17 +922,20 @@ int peer_connect(peer *p) if (valopt) { LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(valopt)); close(sock); + sock = -1; continue; } }else{ LM_ERR("peer_connect(): Timeout or error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); + sock = -1; continue; } } }else{ LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); + sock = -1; continue; } @@ -956,7 +959,6 @@ int peer_connect(peer *p) if (!send_fd(p->fd_exchange_pipe,sock,p)){ LM_ERR("peer_connect(): [%.*s] Error sending fd to respective receiver\n",p->fqdn.len,p->fqdn.s); - close(sock); goto error; } @@ -967,6 +969,7 @@ int peer_connect(peer *p) error: if (res) freeaddrinfo(res); if (sainfo) freeaddrinfo(sainfo); + if (sock!=-1) close(sock); return -1; }

1 0

git:master:b1eb0928: ims_ipsec_pcscf: safety check for pcontact search result
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: b1eb0928f8e68a697eccda3e75504eb2263cb95b URL: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T10:02:18+02:00 ims_ipsec_pcscf: safety check for pcontact search result --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… Patch: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 5013087c02..0651d4226f 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -667,7 +667,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0 || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -810,7 +810,8 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0 + || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -967,7 +968,7 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0 || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; }

1 0

git:master:5cac8b4e: ims_ipsec_pcscf: clean local parsed tm uas request headers
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 5cac8b4e99399ae3db4fb281fc084f73d8e8307f URL: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:57:53+02:00 ims_ipsec_pcscf: clean local parsed tm uas request headers --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… Patch: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index f8672a592a..5013087c02 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -140,7 +140,7 @@ static str get_www_auth_param(const char* param_name, str www_auth) return val; } -static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) +static int fill_contact(struct pcontact_info* ci, struct sip_msg* m, tm_cell_t *t) { contact_body_t* cb = NULL; struct via_body* vb = NULL; @@ -244,7 +244,6 @@ static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) } } else if(m->first_line.type == SIP_REPLY) { - struct cell *t = tmb.t_gett(); if (!t || t == (void*) -1) { LM_ERR("Reply without transaction\n"); return -1; @@ -651,9 +650,13 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) pcontact_t* pcontact = NULL; struct pcontact_info ci; int ret = IPSEC_CMD_FAIL; // FAIL by default + tm_cell_t *t = NULL; + if(m->first_line.type == SIP_REPLY) { + t = tmb.t_gett(); + } // Find the contact - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -681,7 +684,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) } // Get request from reply - struct cell *t = tmb.t_gett(); + if (!t) t = tmb.t_gett(); if (!t || t == (void*) -1) { LM_ERR("Reply without transaction\n"); goto cleanup; @@ -765,6 +768,9 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) // Do not free str* sec_header! It will be freed in data_lump.c -> free_lump() ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; } @@ -778,11 +784,12 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) unsigned short dst_port = 0; unsigned short src_port = 0; ip_addr_t via_host; - struct sip_msg* req = NULL; + struct cell *t = NULL; + if(m->first_line.type == SIP_REPLY) { // Get request from reply - struct cell *t = tmb.t_gett(); + t = tmb.t_gett(); if (!t) { LM_ERR("Error getting transaction\n"); return ret; @@ -796,7 +803,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // // Find the contact // - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -864,7 +871,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // for Request sends from P-CSCF client port src_port = s->port_pc; - + // for Request sends to UE server port dst_port = s->port_us; } @@ -934,6 +941,9 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) cleanup: ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; } @@ -943,11 +953,14 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) struct pcontact_info ci; pcontact_t* pcontact = NULL; int ret = IPSEC_CMD_FAIL; // FAIL by default + tm_cell_t *t = NULL; + + if(m->first_line.type == SIP_REPLY) { + t = tmb.t_gett(); + } - // // Find the contact - // - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -978,6 +991,9 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) cleanup: ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; }

1 0

git:master:8e69474a: presence: rename local variable that conflicts with tm define
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 8e69474ab7fd23ebd03bd193387f7e9fe8e1346d URL: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:05:03+02:00 presence: rename local variable that conflicts with tm define --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… Patch: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index b53528ce80..64c13a5f09 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -1303,7 +1303,7 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, str rec_route = {0, 0}; int rt = 0; contact_body_t *b; - struct to_body *pto, TO = {0}, *pfrom = NULL; + struct to_body *pto, tob = {0}, *pfrom = NULL; uint32_t lexpire; str rtag_value; struct sip_uri uri; @@ -1352,12 +1352,12 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, LM_DBG("'To' header ALREADY PARSED: <%.*s>\n", pto->uri.len, pto->uri.s); } else { - parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len + 1, &TO); - if(TO.uri.len <= 0) { + parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len + 1, &tob); + if(tob.uri.len <= 0) { LM_DBG("'To' header NOT parsed\n"); goto error; } - pto = &TO; + pto = &tob; } if(pto->parsed_uri.user.s && pto->parsed_uri.host.s @@ -1509,11 +1509,11 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, } getbflagsval(0, &subs->flags); - free_to_params(&TO); + free_to_params(&tob); return 0; error: - free_to_params(&TO); + free_to_params(&tob); return -1; }

1 0

git:master:27b6c641: tm: relocated defines not useful in the header file
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 27b6c641b5d941503f974fea05af506972ac2ab5 URL: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:00:55+02:00 tm: relocated defines not useful in the header file --- Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h --- Diff: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… Patch: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index ad9c8ae903..08e50a8ea9 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -46,6 +46,22 @@ #endif +#define CSEQ "CSeq: " +#define CSEQ_LEN (sizeof(CSEQ)-1) +#define TO "To: " +#define TO_LEN (sizeof(TO)-1) +#define CALLID "Call-ID: " +#define CALLID_LEN (sizeof(CALLID)-1) +#define FROM "From: " +#define FROM_LEN (sizeof(FROM)-1) +#define FROMTAG ";tag=" +#define FROMTAG_LEN (sizeof(FROMTAG)-1) +#define TOTAG ";tag=" +#define TOTAG_LEN (sizeof(TOTAG)-1) +#define MAXFWD_VALUE "70" +#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF +#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) + /* convenience macros */ #define memapp(_d,_s,_len) \ do{\ diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index e22bb0e1de..a97c1f9451 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -28,22 +28,6 @@ #include "h_table.h" #include "t_reply.h" -#define CSEQ "CSeq: " -#define CSEQ_LEN (sizeof(CSEQ)-1) -#define TO "To: " -#define TO_LEN (sizeof(TO)-1) -#define CALLID "Call-ID: " -#define CALLID_LEN (sizeof(CALLID)-1) -#define FROM "From: " -#define FROM_LEN (sizeof(FROM)-1) -#define FROMTAG ";tag=" -#define FROMTAG_LEN (sizeof(FROMTAG)-1) -#define TOTAG ";tag=" -#define TOTAG_LEN (sizeof(TOTAG)-1) -#define MAXFWD_VALUE "70" -#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF -#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) - char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to , struct cancel_reason* reason @@ -55,7 +39,7 @@ char *build_local_reparse(struct cell *Trans, unsigned int branch, ); char *build_uac_request( str msg_type, str dst, str from, - str fromtag, int cseq, str callid, str headers, + str fromtag, int cseq, str callid, str headers, str body, int branch, struct cell *t, unsigned int *len); @@ -71,7 +55,7 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT, * request should be send. The function is used by tm when it generates * local ACK to 200 OK (on behalf of applications using uac */ -char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, +char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, unsigned int branch, str *hdrs, str *body, unsigned int *len, struct dest_info* dst); @@ -79,8 +63,8 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, /* * Create a request */ -char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, - struct cell *t, int* len, struct dest_info* dst); +char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, + struct cell *t, int* len, struct dest_info* dst); int t_calc_branch(struct cell *t,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022