sipwise
/
kamailio
mirror of https://github.com/sipwise/kamailio.git
1
0
Fork 0
Code Issues Releases Wiki Activity

New upstream version 5.7.7

Browse Source
mr10.5 upstream/5.7.7
Victor Seva 11 months ago
parent 725ee8e89b
commit 64f9e533ae
54 changed files with 1006 additions and 148 deletions
Show Stats Download Patch File Download Diff File

592
ChangeLog
Unescape View File

@ -1,3 +1,595 @@
===================== 2025-05-21 Version 5.7.7 Released =====================
===================== Changes Since Version 5.7.6 ===========================
commit 690a41609bb6308834527f5081a19e20bd63e0ca
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed May 21 09:10:42 2025 +0200
Makefile.defs: version set to 5.7.7
commit ebb630f9c7ff6e67209b8dbb67da69403b979661
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed May 21 08:55:54 2025 +0200
pkg: deb specs updated for v5.7.7
commit 951e53600f17bf4b05f414b1dbfe8f8853cb0a70
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed May 21 08:48:18 2025 +0200
pkg: version set to 5.7.7 for rpms and alpine specs
commit 1796009f5ebf77c32014a669a21c1d0861f306b4
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Apr 1 19:38:01 2025 +0200
parser/sdp: check if value is exceeded when looking for o= version field
(cherry picked from commit c532a67db654efb21f81e058b7e3a86229766a40)
(cherry picked from commit d3d62bde97a86faa7dd1189bf10b697f28d84a63)
(cherry picked from commit 44cb112ea155eccf2788400b65f85e8b1c77f589)
commit ee8c50f6033eeb1c3035ac3e1aa72e9865ea3c9e
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Mar 28 08:15:13 2025 +0100
core: allow route(...) usage inside onsend_route block
- GH #4130
(cherry picked from commit 6343713bcc91a499c772fc6f548597693f220c35)
(cherry picked from commit 0b48c889623a19ed223c252ada049cabebee45f2)
(cherry picked from commit 7335ac5b8d174a14a4481215cc787e7cb5cd4542)
commit 42d33d7526fc64c34dce0d51a72f474e70392824
Author: Alessio Garzi <agarzi@sipwise.com>
Date: Mon Mar 24 12:52:29 2025 +0100
fix typo on sanity checks module
(cherry picked from commit 3b48fff143b49f16b328475a7b26017209e98666)
(cherry picked from commit ecb00946bf684b4c8405d71fe9306d35aba21359)
(cherry picked from commit 52772bf03ad07758e92eea4a71d22f5df8e976f4)
commit 0fc84abd5710ff982d4867ea36560f0ae1df20b1
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Feb 14 12:17:23 2025 +0100
http_client: free dumplicated name in case of errors
(cherry picked from commit 39ba53a2499dd1f0e080bb011d7438a60ea5faec)
(cherry picked from commit 7274e353d7c05f5387c64aaf90197c9a8e8d1dd4)
(cherry picked from commit 99852d486bd4180c4f571864bfccda526f3e259d)
commit efec4195cb2905434a7674c7886a52bd6c33ea85
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Feb 14 08:37:23 2025 +0100
ctl: refactored error handling and removed unnecessary code
(cherry picked from commit edbb5b11e9453be3519e6e9a945937307c95709e)
(cherry picked from commit 691eb2600c1fcf24d0d1f9b2648e7257499537a8)
(cherry picked from commit 83a4165fc62710027ddf006058c66f082d01b51f)
commit 84035480eaf6d8624faa0859f2ec8bb6f24b68da
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Feb 14 10:16:00 2025 +0100
xmlrpc: removed unnecessary code
(cherry picked from commit e65b03cdd946d735a3ef33ae3582bcfad464d2c7)
(cherry picked from commit 6d06293f3fe1c5897a3e01272fdc9ac409925f3d)
(cherry picked from commit eaa0d1af8a46fe9a74d0eb1bbb2fbf2089f4e3fb)
commit c827311923457119d15b2a375e2e454c8aecdc6e
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Feb 13 11:45:06 2025 +0100
pv: free next field on error when parsing xav* names
(cherry picked from commit b875e7368dcc8e221007caafa3599c3e354404f7)
(cherry picked from commit 8b7637140c5362bf90046ccb3b34ea74ef658c0a)
(cherry picked from commit ce55c093d490fd19f10c50e11d12e188b64c1686)
commit 6b4fb8ddea8d4674a9e74c261cf5c16d69111682
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Feb 13 09:43:43 2025 +0100
ctl: fifo - clean intermediary buffer
(cherry picked from commit 4c4d7f7967a99d4dd4acdc5e198bce493bf15d67)
(cherry picked from commit c68522f5c3c59cb915feb873bd3351e57a8db579)
(cherry picked from commit 90122e3a46169e9f10dc7d8e01638d5f89cfaae5)
commit c51cc44b7380847d7d1bc04bb6a0d1b7b96ea974
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Feb 13 09:40:00 2025 +0100
xmlrpc: clean allocated buffer
(cherry picked from commit ff712539566c903312ebba2f8e2585f9c80ffdcf)
(cherry picked from commit e1398e53e9825db6c20590e1576d960ac0c3c429)
(cherry picked from commit 1f6dc4df8572c07280478858087182f273c25fe3)
commit dffd625bf7953d7314287fe67b17c8bf583034bd
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed Feb 12 17:48:42 2025 +0100
ctl: free rpc struct in case of error
(cherry picked from commit 4a71d3c9e6a4f92ef33ce8e62372b2c4dba62a56)
(cherry picked from commit 5024235f876df4b3239ef746de700ade362cc7b2)
(cherry picked from commit 5e836af2ff198481bde0485a315bbfdf39043f9d)
commit 7876e1ec4785d0199f817cf3cc59c8ae9bd56fd8
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Feb 11 12:41:26 2025 +0100
core: check for unexpected long value return by pathconf()
(cherry picked from commit 2ba6d4ff2727031e7bca5d3d1da016bfe508b8df)
(cherry picked from commit 718692c6d402b6942e0b1e8ebd8e64b306813495)
(cherry picked from commit f123ebae553624525ca04d34ddd4c9453eac855a)
commit 3c3c7107980fa23c892e5fe85b524d82c04bd645
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Feb 11 11:30:34 2025 +0100
core: pass fd - check for unexpected read size overflow
(cherry picked from commit 6c12477f1dad2279431d703d1a4f63fcfc6543b8)
(cherry picked from commit ac0a4a5052e9aaf6531130675c8140fdd5c11e97)
(cherry picked from commit 42260f34079ddad7662742a64696d2550ee1cce9)
commit e5c2f3ff4eded8f6d9537fdc6e2ccff0f90fa568
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Feb 4 08:05:28 2025 +0100
msrp: send failure response after referening the buffer
(cherry picked from commit 5f8adb625b6bae81ef44613d774106bf3a943bb0)
(cherry picked from commit 4ff58bb3e02b76e2489144867c8b0dc5041dc621)
(cherry picked from commit 0f8b36091a64de012377bd2460e299529886a45c)
commit aa81e83c5fa7b916148c274be9cb0c32356b79aa
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Sat Feb 1 07:40:11 2025 +0100
msrp: variable for extra headers used in local replies
(cherry picked from commit 7a73e08b0e5b4c3fbeb4f097c1f891d06c74651d)
(cherry picked from commit c29d9d661b3954906cdee7e98a4f9b6502673490)
(cherry picked from commit 724a58813d50dcfe965e69914fbdc93291811a85)
commit 63fd213aab064df3ec669047ee3b0abf1bfdea5a
Author: Sergey Safarov <s.safarov@anycast-lb.net>
Date: Wed Jan 29 09:12:44 2025 +0200
janssonrpcc: fixed warning var may be used uninitialized
(cherry picked from commit 3039c02404e05da05a031f6ccf68913a8c1c80eb)
(cherry picked from commit ddd98b09c80dc0d15af080e37961b59ecde17689)
(cherry picked from commit f4aed91f5ab78cddbe782e94306c3cf4c49b09c6)
commit b85e5fb31813cbbcae350262e52394b2807c7e0b
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Mon Jan 20 17:10:05 2025 +0100
core: parser/sdp - check if still before end of the value
(cherry picked from commit b96bc11a54f11ec688429c057bf5a90c40c147b3)
(cherry picked from commit 76ffc6d3d4053bc43b81c3363e837c10360b0089)
commit b01dcd5b4d48b36aa2c3fe4e46a43dfdf84f29e9
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed Jan 15 07:24:29 2025 +0100
sanity: log as debug when Content-Length is missing for datagram protocols
- the header is optional for datagram protocols (RFC3261, 20.14)
(cherry picked from commit e38c7f8bac1aef9890d266fa466cea1561346732)
(cherry picked from commit 50e69e9a269e5d5dba0251f893abc34907a12970)
commit 458abc7692f2f700735af6c37856da95513fad32
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Dec 3 08:03:57 2024 +0100
xlog: evaluate prefix for kemi functions
(cherry picked from commit 76e18d0d13a41e93094f9084ac44e0809f91b109)
(cherry picked from commit 68e3447e04c06059d47e1f001ae0b34e7f88b2f5)
commit 641541066953e8b52a4e433c01c8d621063899ff
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Mon Dec 2 20:19:45 2024 +0100
xlog: use crit level with prefix for kemi xcrit() and xlog()
- GH #4048
(cherry picked from commit a493e2e0006f89d2f8b5e903134407109ef587da)
(cherry picked from commit 98f20996606a200f025dd78f96fbb50cd426f756)
commit 601e86bcd5f95138a9ad03de2db7faa4a7e0c2a6
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed Nov 27 15:36:33 2024 +0100
corez: set sndinfo attributes for corex_sip_reply_out()
(cherry picked from commit b003a7184a02da5fd6dfe27def8d928d363e36ce)
(cherry picked from commit b512a9e809a658dc9ac731a359afce8fa8acd049)
commit 1cddf420cbd557a1c756105eb2bf933eb9fb1e79
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Oct 29 08:20:44 2024 +0100
core: parser sdp - check body end for extract_ice_option()
(cherry picked from commit 79d7fae0f26f577356f017cfff5e00c348cf259c)
(cherry picked from commit 351157cad257986a014dc659231ae0ee48a8d538)
commit ad292d121d0fe41a712385b5f28c83ec3c07ddb3
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Oct 25 20:45:59 2024 +0200
core: parser sdp - check len gor extracting fmtp
(cherry picked from commit d10257fbfdbb3e3e73c0fe60a224585822bdd7b3)
(cherry picked from commit 18dad74a091e693a0bf939dddf144348409e6402)
commit 3a5db8000dcea0a16c491ee54eb35324f2e7bdd7
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Oct 22 07:41:08 2024 +0200
core: parser sdp - check length for rtpmap extract
(cherry picked from commit c823f41350ab9186a323707e9be32e31922bec17)
(cherry picked from commit 0408c2cb412f0df0a17b70aa4d15026a9ef3a9a7)
commit bec9f1cc738f35d7a74556bf5a8918814ae019e3
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Oct 17 08:21:43 2024 +0200
core: parser sdp - check if body is enough for rtpmap
(cherry picked from commit c7f89e81504c425a83f3423bc4b4d9d1a8a48909)
(cherry picked from commit a688b24ac777cb93306a1a777e687de625d6e4d0)
commit 778ee6deab8376a61e5ec6aff20536799ccf08f9
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Oct 11 12:37:08 2024 +0200
core: parser sdp - check field length when extracting the value
(cherry picked from commit e802f9187383feb7fdd96c4ded44fda403da4535)
(cherry picked from commit e650ace5948c76ea2d8eb7eaeebb5c349970447d)
commit 1413ce8512d8a0c00c39243fe1d9d9c308bf8ad7
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Oct 11 12:00:53 2024 +0200
core: parse sdp - check for body limit on mixed content
(cherry picked from commit d4bbde619bbf808edebb31e131b3783ba2a4b34d)
(cherry picked from commit eb058dba967bb772c8413356163ec6c13533ab6b)
commit 8b830220984d2604c1a89ce3ae7bfa68cdcbf3bb
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Oct 11 11:41:02 2024 +0200
core: parser sdp - check for length of sendrecv attribute
(cherry picked from commit fc4817064f81ef9a82b1b1468b1b8a4ae352c1f2)
(cherry picked from commit 0ba1666fec15ed292e7fe1764bfa985ef282d84e)
commit aceb2a89ed79c4bc28b21d70eedfe8527dff2bbd
Author: Thomas <1258170+ThomasSevestre@users.noreply.github.com>
Date: Mon Sep 2 20:27:26 2024 +0200
topos_redis : show redis error for post mortem analysis
(cherry picked from commit 72889e945041b6475a43c371aa4e20e99f5d1240)
(cherry picked from commit 8331cb1f87b31f66f87a90e7fbaa2553ea3f2728)
commit e65cf6e5393c5dd430a7e5e421f566cc88c1a2ce
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed Sep 4 12:43:59 2024 +0200
auth_xkey: use memcpy() instead of strncpy()
(cherry picked from commit 29686758e1ce51abb8d8dd5bebb0d7fa1a019dc6)
(cherry picked from commit 6c88ef7c6abc45f72571aaa713f1d0dfb2d626e6)
commit 0f56bad610ee3397ce82fcc10626651fe2789da0
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Jul 30 09:07:36 2024 +0200
corex: switch to unsigned long long for iflag lookup
(cherry picked from commit 072c44330297c653675b5078fb0facdc399a5ab4)
(cherry picked from commit a024fb3c028b8df18a9b855fff99bcddc3a61ef2)
commit 5a5fbdf6d5bb8ea3cc15063bdf66cd6a1280d3bf
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Jul 30 08:55:08 2024 +0200
corex: proper check for iflag lookup return code
(cherry picked from commit fdb0ef987ca2b013104b06ece006f67bf8ae07d3)
(cherry picked from commit d102f40856512d2c51707bf5ec5a6c949c550890)
commit dc009570a7d79de99ce0156c8a163c29f9ab7eb9
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Jul 30 08:44:03 2024 +0200
corex: small formatting of iflag list
(cherry picked from commit 70606e3ea575228b3ccc662d6f9048aa0eb899ce)
(cherry picked from commit e14522cab01eba9c5fa636a7c0f6ed40200c6871)
commit bfc6a9c0e5cad418ca892d33709636b7aeb075e6
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Sun Jul 28 18:44:45 2024 +0200
core: tcp - use long long constants for operations
(cherry picked from commit fc2f34e8bab022b0c99e8313aee3e4a87c1f2e52)
(cherry picked from commit bc8ea1022718c94fbdf9bb93c35759e1a6ce3cde)
commit 9a8f9f13c4b98c14bc260680dae15e869034d147
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Sat Jul 27 18:16:40 2024 +0200
db_berkeley: buffer size set to the argument of strftime()
(cherry picked from commit e86d6ee30227a3fc5cff98e7983d4a80f0c42c4b)
(cherry picked from commit 1eb7db2f18724b91d18c6b30b529b51117d176b0)
commit 06a86869b9157783bdd185aa3b43e3517c23d007
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Jul 26 19:49:57 2024 +0200
core: cfg select - check res when getting the variable
(cherry picked from commit 3333611a3ef9078cbcb9867db88921f0c48fce1b)
(cherry picked from commit dfc2531cf7db70e315613b3242d1b5b41ac20857)
commit 17fe6cc64140e2d302e678a34534804cd34015d0
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Jul 25 10:58:40 2024 +0200
janssonrpcc: free new servers list on error
(cherry picked from commit b4efe7725728392d0c8921c006d6fbc6455e9b8f)
(cherry picked from commit f8201e6d4848081a2dd564e0d5b216fca47ef3f0)
commit f75b968d428f23241bde329622f1e2e86b60d222
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Jul 25 08:44:15 2024 +0200
core: cfg select - check res before initializing
(cherry picked from commit a6c415713bb209b03ff110d4ae891173d04ac471)
(cherry picked from commit 61eb4fe44e66a952ba14e39e1c664878ef52919d)
commit a71d34d64b6539592b8d7532abc3714d2c4e4125
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed Jul 24 10:43:18 2024 +0200
jsonrpcc: declare variables are the beginning of function
(cherry picked from commit 7ba313f6f96ffa6042c163027c0c7bb65106fef7)
(cherry picked from commit 5baf49a179194ba0eaa5e7f4caba613c72859b0c)
commit 1d561bc70e30cae3ba94aacd51c33e8cf1cf3737
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed Jul 24 10:37:21 2024 +0200
jsonrpcc: free allocated pkg buffer on error
(cherry picked from commit 796bcc038d7885e01dbad34abc68bf612062c533)
(cherry picked from commit c447bf60d528d8fdc1f5aee52a796ed5f77b2f5a)
commit 61e3e21f42d4b18c69ad9b1c2378dabce5cd6f47
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Tue Jul 23 11:57:48 2024 +0200
erlang: init xavps for safety destroy on error
(cherry picked from commit 29510872607deb3238411b358c422d004fb307b7)
(cherry picked from commit f57accd1820b26b40f14d420465402188cb13df1)
commit d7766ffceb98fbc0ceaf58d2f271cfa1870c15b0
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Mon Jul 22 11:01:16 2024 +0200
utils: jump to error on pkg allocation failure
(cherry picked from commit 34749ab13b31504358761c964f794b283931394c)
(cherry picked from commit e016d1ada08edca0adacd42ffa67ffd3c8c2c384)
commit f32863addeb3a927b80db65c56a258be8c27b85c
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Sun Jul 21 22:41:45 2024 +0200
tls: check lenght when parsing pv alt name
(cherry picked from commit 79a668b8bdb0e085adb3581d718e5fd5ae73e2e4)
(cherry picked from commit dd4d5e44a60a658772e8288d94193596f7a982a7)
commit 6e1940120cee766a7d90ae0b581e9d7ebdf5885d
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Sun Jul 21 22:23:29 2024 +0200
tls: remove uselss pv format parsing in pv_parse_alt_name()
(cherry picked from commit 7c06997a1b6e77ae0642d369f532219dc35ef8e0)
(cherry picked from commit 4732a4a88df9f4cbd2260564b94269157b3c0647)
commit 8eee8bcf1ba579d012a0f583525ec32df3bb189c
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Jul 18 12:17:10 2024 +0200
core: set digit 0 in the md5 buffer in case of error inside char_msg_val()
(cherry picked from commit 15b2a5467f11e009ae4efad1ee29af860326095f)
(cherry picked from commit d69e65fa4e9448701729ac8f41b069dad294a51e)
commit 6cd797906c82927037e5a89a638c3150d99ba579
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Jul 18 12:00:47 2024 +0200
core: init res inside select_cfg_var()
(cherry picked from commit a471d34d6162387a1427f5d0c5b3c6079a2b0bdc)
(cherry picked from commit 92a3cc4549073d70b1b229149b29017e3a9cf06f)
commit ae3734307499c5ca48089dc060dba8409bd4a342
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Fri Jul 12 08:06:36 2024 +0200
stun: check message len for response
(cherry picked from commit 87e1a4a7f5d565a59a362f22e9372697f2f2f2af)
(cherry picked from commit e11c132cbf57ea1ae6289e734f601104ba83fc25)
commit 634aa6f2843b468a69ba63fe312a068c6562db2c
Author: Xenofon Karamanos <xk@gilawa.com>
Date: Tue Jan 28 11:31:57 2025 +0000
outbound: Fix flow_token_secret bug
- flow_token_secret is of type str and not char*
- check the length of the string instead of memory for initialization
(cherry picked from commit 046ba41e431fec7fad0c82a9091ea9e27d9f677d)
commit 95465330fbc8916e3798122083cb895030171e00
Author: Victor Seva <linuxmaniac@torreviejawireless.org>
Date: Thu Dec 12 14:50:42 2024 +0100
outbound: reformat exported structures
(cherry picked from commit 793a494f5b23f2ef5e82664924c3bed3893105bb)
commit e85d6e5dd499dce586e72fdca2ee7cbff6520327
Author: Nikolay Ivanuschak <ivanuschak.nikolay@gmail.com>
Date: Mon Nov 4 22:58:44 2024 +0300
http_async_client: fixed crash on curl callback
commit 4ddd8de2d6c6a02a5c156d0505feb9164a7d5a3e
Author: Victor Seva <linuxmaniac@torreviejawireless.org>
Date: Fri Nov 15 11:09:34 2024 +0100
doc: update manpage with missing -B option [skip ci]
(cherry picked from commit 77f03aabd871dbf86c5106a93eb32ce67d7762bf)
(cherry picked from commit 6816f992696fe894b3a47cd511a59e1b5a0ed89b)
commit 73e860525a52d8c8e07aced4b7aa6a9ee6c95865
Author: Xenofon Karamanos <xk@gilawa.com>
Date: Thu Nov 14 16:10:38 2024 +0000
tm: Fix log level
(cherry picked from commit af0f0000c4755d01f668570bc6db71f2f534a5c0)
commit ec35516f38f0495aa4eb6f1f1f0c67a61d3238a8
Author: Xenofon Karamanos <22965395+xkaraman@users.noreply.github.com>
Date: Wed Sep 18 12:04:10 2024 +0000
tm: move local-request event route to the right location to access CANCEL
(cherry picked from commit ccc106922802213253f03f181d10fe83aa93da94)
commit b0864208cc818ee6ed568485c9f25640fad9e620
Author: Xenofon Karamanos <22965395+xkaraman@users.noreply.github.com>
Date: Tue Aug 27 13:59:31 2024 +0000
tm: Emit request event when cancel is called
(cherry picked from commit faca8e7a20255d90a4786fd4043005ead9dfc5df)
commit f9e8112e87f914549368d04e8fd9b68765d24771
Author: anmartan <a.martin@zaleos.net>
Date: Thu Jul 4 09:30:02 2024 +0200
core: Improved URN parsing according to RFC8141
- Improved URN parsing to allow consuming URNs that contain 3 or more colons. Previosly URI parser treated some of the colons as separator between host and port causing the URN parsing to fail.
(cherry picked from commit 6cdd56bb85e1a10ebbb29c2633fb47bf7b56585e)
commit 859888876418605abdffcc57bea8b5988860476d
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Thu Sep 19 08:54:32 2024 +0200
tm: remove extra + used before MAXFWD_HEADER_LEN
(cherry picked from commit 307d6db88c218ffd5dc9d6e7de6425ac4ef24748)
(cherry picked from commit 672c3e75c4679681c1ddfb42f852682d93e42c31)
commit 30776c97b97f0b6836b313af3f4d385fd6492073
Author: Juha Heinanen <jh@tutpro.com>
Date: Mon May 20 11:41:42 2024 +0300
tm: add mandatory Max-Forwards header to local AC
(cherry picked from commit 3a34b468ad93904c507bd0fc7ef592b25321807f)
commit bb770156f7f73485fb523576cc6639b334da4aa5
Author: Sergey Safarov <s.safarov@gmail.com>
Date: Fri Sep 13 22:08:17 2024 +0300
pkg/kamailio: fixed python module build on RHEL based dists
(cherry picked from commit b1c9dac2c382a98997d5771921af5aa3235876c0)
commit 58732164c199ed6c565ea650998d6e34e5dcb451
Author: S-P Chan <shihping.chan@gmail.com>
Date: Thu Aug 29 16:11:22 2024 +0800
app_python3: bump to 3.12 for el8/el9
(cherry picked from commit 4d87f29248d36d873784827204f272116050343d)
commit 2deec6b43b8149ebb8c027a68709c2a708f01be9
Author: Victor Seva <linuxmaniac@torreviejawireless.org>
Date: Thu Jul 18 17:26:33 2024 +0200
sipcapture: add missing headers for inet_ntop()
fixes #3927
(cherry picked from commit fe505c9654541ec60f14e5a50896bb11751e61e4)
(cherry picked from commit 164d1ecca7e94beba24013f31276bdc1f2ee04a1)
commit 184aaf991b6ad74b63a7f8724058cd4066f3bbd3
Author: Victor Seva <linuxmaniac@torreviejawireless.org>
Date: Wed Jun 19 15:00:12 2024 +0200
db_mysql: switch warn to dbg for log messages for opt_ssl_ca option
fixes #3884
(cherry picked from commit be5172a84b02a1ab4fc7e97e7dc0813056302bdd)
(cherry picked from commit 4c75991aa662bddc1bbe65c83f7861cb72a65a61)
commit 64f0c3f3979de7a40732067792d89c6d3b1c23d4
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Date: Wed Jun 19 10:43:12 2024 +0200
db_mysql: switch warn to dbg for log messages for opt_ssl_mode
- GH #3884
(cherry picked from commit 8f98317e92da61160a1c416e0da45938a205d358)
(cherry picked from commit 7360ab7fbe672259c7433b1a5199467d24183d79)
===================== 2024-07-02 Version 5.7.6 Released =====================
===================== Changes Since Version 5.7.5 ===========================

9
doc/man/kamailio.8
Unescape View File

@ -8,7 +8,7 @@ kamailio \- a very fast and configurable SIP server
.SH SYNOPSIS
.B kamailio
[
.B \-hfcmMdVIhEeblLnvKrRDTNWwtugPGSQOaAxXY
.B \-hfcmMdVIhEebBlLnvKrRDTNWwtugPGSQOaAxXY
] [
.BI \-a " auto\-aliases\-mode"
] [
@ -16,6 +16,8 @@ kamailio \- a very fast and configurable SIP server
] [
.BI \-b " max_rcv_buf_size"
] [
.BI \-B " max_snd_buf_size"
] [
.BI \-f " config\-file"
] [
.BI \-g " gid"
@ -68,7 +70,10 @@ default is yes.
Add config pre-processor define (e.g., -A WITH_AUTH, -A N=1, -A X='"Y"')
.TP
.BI \-b " max_rcv_buf_size"
Maximum receive buffer size which will not be exceeded by the auto-probing procedure even if the OS allows.
Maximum OS UDP receive buffer size which will not be exceeded by auto-probing-and-increase procedure even if OS allows.
.TP
.BI \-B " max_snd_buf_size"
Maximum OS UDP send buffer size which will not be exceeded by auto-probing-and-increase procedure even if OS allows.
.TP
.BI \-c
Checks the config file and displays the aliases and listen interface list.

2
pkg/kamailio/alpine/APKBUILD
Unescape View File

@ -4,7 +4,7 @@
# Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
pkgname=kamailio
pkgver=5.7.6
pkgver=5.7.7
pkgrel=0
# If building from a git snapshot, specify the gitcommit

6
pkg/kamailio/deb/bionic/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/bookworm/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/bullseye/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/buster/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/debian/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/focal/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/jammy/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/jessie/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/precise/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/sid/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/stretch/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/trusty/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/wheezy/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

6
pkg/kamailio/deb/xenial/changelog
Unescape View File

@ -1,3 +1,9 @@
kamailio (5.7.7) unstable; urgency=medium
* version set 5.7.7
-- Victor Seva <vseva@debian.org> Wed, 21 May 2025 08:53:27 +0200
kamailio (5.7.6) unstable; urgency=medium
* version set 5.7.6

12
pkg/kamailio/obs/kamailio.spec
Unescape View File

@ -1,5 +1,5 @@
%define name kamailio
%define ver 5.7.6
%define ver 5.7.7
%define rel dev1.0%{dist}
%if 0%{?fedora}
@ -847,9 +847,9 @@ Requires: python2, kamailio = %ver
BuildRequires: python2, python2-devel
%endif
%if %{with python3}
%if 0%{?rhel} == 8
Requires: python39, kamailio = %ver
BuildRequires: python39, python39-devel
%if 0%{?rhel} == 8 || 0%{?rhel} == 9
Requires: python3.12, kamailio = %ver
BuildRequires: python3.12, python3.12-devel
%else
Requires: python3, kamailio = %ver
BuildRequires: python3, python3-devel
@ -1236,7 +1236,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \
FREERADIUS=1 \
%endif
%if 0%{?rhel} >= 8
PYTHON3=python3.9 \
PYTHON3=python3.12 \
%endif
group_include="kstandard kautheph kberkeley kcarrierroute \
%if %{with cnxcc}
@ -1343,7 +1343,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \
FREERADIUS=1 \
%endif
%if 0%{?rhel} >= 8
PYTHON3=python3.9 \
PYTHON3=python3.12 \
%endif
group_include="kstandard kautheph kberkeley kcarrierroute \
%if %{with cnxcc}

2
src/Makefile.defs
Unescape View File

@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)
# version number
VERSION = 5
PATCHLEVEL = 7
SUBLEVEL = 6
SUBLEVEL = 7
EXTRAVERSION =
# memory manager switcher

4
src/core/autover.h
Unescape View File

@ -2,6 +2,6 @@
* DO NOT EDIT IT
*/
#define REPO_VER "c718a7"
#define REPO_HASH "c718a7"
#define REPO_VER "b22881"
#define REPO_HASH "b22881"
#define REPO_STATE ""

1
src/core/cfg.y
Unescape View File

@ -2766,6 +2766,7 @@ fcmd:
case MODULE5_T:
case MODULE6_T:
case MODULEX_T:
case ROUTE_T:
case SET_FWD_NO_CONNECT_T:
case SET_RPL_NO_CONNECT_T:
case SET_FWD_CLOSE_T:

14
src/core/cfg/cfg_select.c
Unescape View File

@ -147,6 +147,11 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg)
int i;
static char buf[INT2STR_MAX_LEN];
if(res != NULL) {
res->s = 0;
res->len = 0;
}
if(msg == NULL) {
/* fixup call */
@ -207,7 +212,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg)
group = (cfg_group_t *)s->params[1].v.p;
var = (cfg_mapping_t *)s->params[2].v.p;
if(!group || !var)
if(!group || !var || !res)
return -1;
/* use the module's handle to access the variable, so the variables
@ -228,12 +233,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg)
break;
case CFG_VAR_STR:
if(p) {
memcpy(res, p, sizeof(str));
} else {
res->s = 0;
res->len = 0;
}
memcpy(res, p, sizeof(str));
break;
default:

7
src/core/char_msg_val.h
Unescape View File

@ -41,8 +41,11 @@ inline static int char_msg_val(struct sip_msg *msg, char *cv)
str sempty = str_init("");
if(unlikely(!check_transaction_quadruple(msg))) {
LM_ERR("can't calculate char_value due to a parsing error\n");
memset(cv, '0', MD5_LEN);
int i;
for(i = 0; i < MD5_LEN; i++) {
cv[i] = '0';
}
LM_ERR("cannot calculate char_value due to a parsing error\n");
return 0;
}
/* to body is automatically parsed (via check_transactionquadruple /

48
src/core/parser/parse_uri.c
Unescape View File

@ -237,28 +237,30 @@ int parse_uri(char *buf, int len, struct sip_uri *uri)
} else \
goto error_bad_char
#define check_host_end \
case ':': \
/* found the host */ \
uri->host.s = s; \
uri->host.len = p - s; \
state = URI_PORT; \
s = p + 1; \
break; \
case ';': \
uri->host.s = s; \
uri->host.len = p - s; \
state = URI_PARAM; \
s = p + 1; \
break; \
case '?': \
uri->host.s = s; \
uri->host.len = p - s; \
state = URI_HEADERS; \
s = p + 1; \
break; \
case '&': \
case '@': \
#define check_host_end \
case ':': \
/* found the host */ \
if(scheme != URN_SCH) { \
uri->host.s = s; \
uri->host.len = p - s; \
state = URI_PORT; \
s = p + 1; \
} \
break; \
case ';': \
uri->host.s = s; \
uri->host.len = p - s; \
state = URI_PARAM; \
s = p + 1; \
break; \
case '?': \
uri->host.s = s; \
uri->host.len = p - s; \
state = URI_HEADERS; \
s = p + 1; \
break; \
case '&': \
case '@': \
goto error_bad_char
@ -493,7 +495,7 @@ int parse_uri(char *buf, int len, struct sip_uri *uri)
case '@': /* error no user part, or
* be forgiving and accept it ? */
default:
state = URI_USER;
state = (scheme == URN_SCH) ? URI_HOST : URI_USER;
}
break;
case URI_USER:

6
src/core/parser/sdp/sdp.c
Unescape View File

@ -810,9 +810,11 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t *_sdp)
} /* end of while */
/* and now we need to parse the content */
if(start_parsing) {
while(('\n' == *rest) || ('\r' == *rest) || ('\t' == *rest)
|| (' ' == *rest))
while((rest < bodylimit)
&& (('\n' == *rest) || ('\r' == *rest) || ('\t' == *rest)
|| (' ' == *rest))) {
rest++; /* Skip any whitespace */
}
_sdp->raw_sdp.s = rest;
_sdp->raw_sdp.len = d2p - rest;
/* LM_DBG("we need to check session %d: <%.*s>\n", session_num, _sdp.raw_sdp.len, _sdp.raw_sdp.s); */

43
src/core/parser/sdp/sdp_helpr_funcs.c
Unescape View File

@ -151,8 +151,12 @@ int extract_rtpmap(str *body, str *rtpmap_payload, str *rtpmap_encoding,
char *cp, *cp1;
int len;
if(body->len <= 9) {
return -1;
}
if(strncasecmp(body->s, "a=rtpmap:", 9) != 0) {
/*LM_DBG("We are not pointing to an a=rtpmap: attribute =>`%.*s'\n", body->len, body->s); */
/*LM_DBG("We are not pointing to an a=rtpmap: attribute =>`%.*s'\n",
* body->len, body->s); */
return -1;
}
@ -214,8 +218,12 @@ int extract_fmtp(str *body, str *fmtp_payload, str *fmtp_string)
char *cp, *cp1;
int len;
if(body->len <= 7) {
return -1;
}
if(strncasecmp(body->s, "a=fmtp:", 7) != 0) {
/*LM_DBG("We are not pointing to an a=fmtp: attribute =>`%.*s'\n", body->len, body->s); */
/*LM_DBG("We are not pointing to an a=fmtp: attribute =>`%.*s'\n",
* body->len, body->s); */
return -1;
}
@ -346,13 +354,16 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream)
}
/* generic method for attribute extraction
/* generic method for attribute value extraction
* field must has format "a=attrname:" */
int extract_field(str *body, str *value, str field)
{
if(strncmp(body->s, field.s, field.len < body->len ? field.len : body->len)
!= 0) {
/*LM_DBG("We are not pointing to an %.* attribute =>`%.*s'\n", field.len, field.s, body->len, body->s); */
if(body->len < field.len) {
return -1;
}
if(strncmp(body->s, field.s, field.len) != 0) {
/* LM_DBG("We are not pointing to an %.* attribute =>`%.*s'\n",
field.len, field.s, body->len, body->s); */
return -1;
}
@ -368,22 +379,24 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream)
sdp_ice_opt_t *ice_opt;
char *ptr_src;
char *end;
int max_options =
10; /* protection - max options can be listed in one line */
int length = 0; /* each option length */
/* a=ice-options: */
if((body->len < 14) || (strncasecmp(body->s, ICE_OPTIONS, 14) != 0))
if((body->len <= 14) || (strncasecmp(body->s, ICE_OPTIONS, 14) != 0))
return -1;
end = body->s + body->len;
ptr_src = body->s + 14;
if(*ptr_src == 32)
ptr_src++; /* if starts with a space, skip it */
/* identify all existing ICE options, if they are listed in one row */
while(*ptr_src && *ptr_src != '\r' && *ptr_src != '\n'
while(ptr_src < end && *ptr_src && *ptr_src != '\r' && *ptr_src != '\n'
&& max_options-- > 0) {
while(*ptr_src != 32 && *ptr_src && *ptr_src != '\r'
while(ptr_src < end && *ptr_src && *ptr_src != 32 && *ptr_src != '\r'
&& *ptr_src != '\n') {
length++;
ptr_src++;
@ -400,7 +413,7 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream)
trim_len(ice_opt->option.len, ice_opt->option.s, ice_opt->option);
length = 0;
if(*ptr_src == 32)
if(ptr_src < end && *ptr_src == 32)
ptr_src++; /* skip space */
}
@ -447,6 +460,9 @@ int extract_sendrecv_mode(str *body, str *sendrecv_mode, int *is_on_hold)
{
char *cp1;
if(body->len < 10) {
return -1;
}
cp1 = body->s;
if(!((strncasecmp(cp1, "a=sendrecv", 10) == 0)
|| (strncasecmp(cp1, "a=recvonly", 10) == 0))) {
@ -715,7 +731,12 @@ int extract_sess_version(str *oline, str *sess_version)
}
i++;
} while(len < oline->len && i < 3);
} while((cp < oline->s + oline->len) && i < 3);
if(cp >= oline->s + oline->len) {
LM_ERR("broken o= line - version field not found\n");
return -1;
}
len = cp - cp0 - 1;
LM_DBG("end %d: >%.*s<\n", len, len, cp0);

10
src/core/pass_fd.c
Unescape View File

@ -33,6 +33,7 @@
#include <sys/socket.h>
#include <sys/uio.h>
#include <stdlib.h> /* for NULL definition on openbsd */
#include <limits.h>
#include <errno.h>
#include <string.h>
#ifdef NO_MSG_WAITALL
@ -287,9 +288,14 @@ again:
/* blocking recv_all */
n = recv_all(
unix_socket, (char *)data + ret, data_len - ret, MSG_WAITALL);
if(n >= 0)
if(n >= 0) {
if(ret >= INT_MAX - n) {
LM_ERR("int size overflowing: %d + %d\n", ret, n);
ret = -1;
goto error;
}
ret += n;
else {
} else {
ret = n;
goto error;
}

4
src/core/tcp_read.c
Unescape View File

@ -449,9 +449,9 @@ int tcp_read_headers(struct tcp_connection *c, rd_conn_flags_t *read_flags)
if(bytes <= 0)
return bytes;
gettimeofday(&tvnow, NULL);
tvdiff = 1000000 * (tvnow.tv_sec - r->tvrstart.tv_sec)
tvdiff = 1000000LL * (tvnow.tv_sec - r->tvrstart.tv_sec)
+ (tvnow.tv_usec - r->tvrstart.tv_usec);
if(tvdiff >= ksr_tcp_msg_read_timeout * 1000000) {
if(tvdiff >= 1000000LL * ksr_tcp_msg_read_timeout) {
LM_ERR("message reading timeout after %lld usec\n", tvdiff);
r->parsed = r->buf;
r->content_len = 0;

3
src/core/ut.h
Unescape View File

@ -543,7 +543,8 @@ inline static int pathmax(void)
#endif
if(pathmax == 0) { /* init */
pathmax = pathconf("/", _PC_PATH_MAX);
pathmax = (pathmax <= 0) ? PATH_MAX_GUESS : pathmax + 1;
pathmax = (pathmax <= 0 || pathmax >= INT_MAX - 1) ? PATH_MAX_GUESS
: pathmax + 1;
}
return pathmax;
}

4
src/modules/auth_xkeys/auth_xkeys.c
Unescape View File

@ -250,10 +250,10 @@ int auth_xkeys_add(sip_msg_t *msg, str *hdr, str *key, str *alg, str *data)
return -1;
}
strncpy(xdata.s, hdr->s, hdr->len);
memcpy(xdata.s, hdr->s, hdr->len);
xdata.s[hdr->len] = ':';
xdata.s[hdr->len + 1] = ' ';
strncpy(xdata.s + hdr->len + 2, xout, xdata.len);
memcpy(xdata.s + hdr->len + 2, xout, xdata.len);
xdata.len += hdr->len + 2;
xdata.s[xdata.len] = '\r';
xdata.s[xdata.len + 1] = '\n';

37
src/modules/corex/corex_mod.c
Unescape View File

@ -491,16 +491,20 @@ typedef struct _msg_iflag_name
int value;
} msg_iflag_name_t;
/* clang-format off */
static msg_iflag_name_t _msg_iflag_list[] = {
{str_init("USE_UAC_FROM"), FL_USE_UAC_FROM},
{str_init("USE_UAC_TO"), FL_USE_UAC_TO},
{str_init("UAC_AUTH"), FL_UAC_AUTH}, {{0, 0}, 0}};
{str_init("USE_UAC_FROM"), FL_USE_UAC_FROM},
{str_init("USE_UAC_TO"), FL_USE_UAC_TO},
{str_init("UAC_AUTH"), FL_UAC_AUTH},
{{0, 0}, 0}
};
/* clang-format on */
/**
*
*/
static int msg_lookup_flag(str *fname)
static unsigned long long msg_lookup_flag(str *fname)
{
int i;
for(i = 0; _msg_iflag_list[i].name.len > 0; i++) {
@ -510,21 +514,22 @@ static int msg_lookup_flag(str *fname)
return _msg_iflag_list[i].value;
}
}
return -1;
return 0;
}
/**
*
*/
static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2)
{
int fv;
unsigned long long fv;
str fname;
if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) {
LM_ERR("cannot get the msg flag name parameter\n");
return -1;
}
fv = msg_lookup_flag(&fname);
if(fv == 1) {
if(fv == 0) {
LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s);
return -1;
}
@ -537,14 +542,14 @@ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2)
*/
static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2)
{
int fv;
unsigned long long fv;
str fname;
if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) {
LM_ERR("cannot get the msg flag name parameter\n");
return -1;
}
fv = msg_lookup_flag(&fname);
if(fv < 0) {
if(fv == 0) {
LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s);
return -1;
}
@ -557,14 +562,14 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2)
*/
static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2)
{
int fv;
unsigned long long fv;
str fname;
if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) {
LM_ERR("cannot get the msg flag name parameter\n");
return -1;
}
fv = msg_lookup_flag(&fname);
if(fv < 0) {
if(fv == 0) {
LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s);
return -1;
}
@ -1232,6 +1237,16 @@ static int corex_sip_reply_out(sr_event_param_t *evp)
str evname = str_init("corex:reply-out");
memset(&sndinfo, 0, sizeof(onsend_info_t));
sndinfo.dst = evp->dst;
if(evp->rpl != NULL) {
sndinfo.msg = evp->rpl;
sndinfo.buf = evp->rpl->buf;
sndinfo.len = evp->rpl->len;
} else {
sndinfo.msg = evp->req;
sndinfo.buf = evp->req->buf;
sndinfo.len = evp->req->len;
}
if(corex_evrt_reply_out_no >= 0 || corex_evcb_reply_out.len > 0) {
run_onsend_evroute(&sndinfo, corex_evrt_reply_out_no,

23
src/modules/ctl/binrpc_run.c
Unescape View File

@ -1025,7 +1025,7 @@ static int rpc_add(struct binrpc_ctx *ctx, char *fmt, ...)
int err;
str st;
str *sp;
struct rpc_struct_l *rs;
struct rpc_struct_l *rs = NULL;
str null_value = str_init("<null string>");
double d;
@ -1069,12 +1069,14 @@ static int rpc_add(struct binrpc_ctx *ctx, char *fmt, ...)
if(err < 0)
goto error_add;
rs = new_rpc_struct();
if(rs == 0)
if(rs == NULL)
goto error_mem;
rs->offset = binrpc_pkt_len(&ctx->out.pkt);
err = binrpc_end_struct(&ctx->out.pkt);
if(err < 0)
if(err < 0) {
ctl_free(rs);
goto error_add;
}
clist_append(&ctx->out.structs, rs, next, prev);
*(va_arg(ap, void **)) = rs;
break;
@ -1180,7 +1182,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...)
va_list ap;
int err;
struct binrpc_val avp;
struct rpc_struct_l *rs;
struct rpc_struct_l *rs = NULL;
str *sp;
str null_value = str_init("<null string>");
@ -1226,7 +1228,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...)
goto error_add;
}
rs = new_rpc_struct();
if(rs == 0) {
if(rs == NULL) {
LM_ERR("not enough memory (%c)\n", *fmt);
goto error_mem;
}
@ -1234,6 +1236,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...)
err = binrpc_end_struct(&s->pkt);
if(err < 0) {
LM_ERR("failed to end struct (%c)\n", *fmt);
ctl_free(rs);
goto error_add;
}
clist_append(&s->substructs, rs, next, prev);
@ -1289,8 +1292,8 @@ static int rpc_array_add(struct rpc_struct_l *s, char *fmt, ...)
va_list ap;
int err;
str st;
str *sp;
struct rpc_struct_l *rs;
str *sp = NULL;
struct rpc_struct_l *rs = NULL;
str null_value = str_init("<null string>");
double d;
@ -1334,12 +1337,14 @@ static int rpc_array_add(struct rpc_struct_l *s, char *fmt, ...)
if(err < 0)
goto error_add;
rs = new_rpc_struct();
if(rs == 0)
if(rs == NULL)
goto error_mem;
rs->offset = binrpc_pkt_len(&s->pkt);
err = binrpc_end_struct(&s->pkt);
if(err < 0)
if(err < 0) {
ctl_free(rs);
goto error_add;
}
clist_append(&s->substructs, rs, next, prev);
*(va_arg(ap, void **)) = rs;
break;

13
src/modules/ctl/fifo_server.c
Unescape View File

@ -1259,7 +1259,7 @@ err:
static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...)
{
int n, buf_size;
char *buf;
char *buf = NULL;
char *buf0;
va_list ap;
str s, nm;
@ -1288,7 +1288,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...)
&nm, 1); /* Escape all characters, including : and , */
if(!m) {
rpc_fault(ctx, 500, "Internal Server Error");
goto err;
goto error;
}
s.s = buf;
@ -1298,7 +1298,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...)
rpc_fault(ctx, 500, "Internal Server Error");
free_chunk(m);
ERR("Error while creating text_chunk structure");
goto err;
goto error;
}
l->flags |= CHUNK_MEMBER_VALUE;
@ -1312,6 +1312,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...)
c->next = m;
if(c == ctx->last)
ctx->last = m;
ctl_free(buf);
return 0;
}
/* Else try again with more space. */
@ -1323,12 +1324,12 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...)
if((buf0 = ctl_realloc(buf, buf_size)) == 0) {
rpc_fault(ctx, 500, "Internal Server Error (No memory left)");
ERR("No memory left\n");
goto err;
goto error;
}
buf = buf0;
}
return 0;
err:
error:
if(buf)
ctl_free(buf);
return -1;

2
src/modules/db_berkeley/km_bdb_lib.c
Unescape View File

@ -676,7 +676,7 @@ int km_bdblib_create_journal(table_p _tp)
{
char *s;
char fn[1024];
char d[64];
char d[128];
FILE *fp = NULL;
struct tm *t;
int bl;

8
src/modules/db_mysql/km_my_con.c
Unescape View File

@ -133,7 +133,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id)
#if MYSQL_VERSION_ID >= 100339
mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1});
#else
LM_WARN("ssl mode not supported by %s\n", MARIADB_BASE_VERSION);
LM_DBG("ssl mode not supported by %s\n", MARIADB_BASE_VERSION);
#endif
break;
case 5: /* SSL_MODE_VERIFY_IDENTITY */
@ -141,7 +141,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id)
(void *)&(int){1});
break;
default:
LM_WARN("opt_ssl_mode = %d not supported by MariaDB Connector/C\n",
LM_DBG("opt_ssl_mode = %d not supported by MariaDB Connector/C\n",
db_mysql_opt_ssl_mode);
break;
}
@ -174,8 +174,8 @@ struct my_con *db_mysql_new_connection(const struct db_id *id)
mysql_options(
ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca);
#else
LM_WARN("opt_ssl_ca option not supported by mysql version (value %s) - "
"ignoring\n",
LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - "
"ignoring\n",
db_mysql_opt_ssl_ca);
#endif /* MYSQL_OPT_SSL_CA */

4
src/modules/erlang/pv_tuple.c
Unescape View File

@ -56,8 +56,8 @@ int pv_tuple_set(
sr_xavp_t *tuples_root;
sr_xavp_t *tuple;
sr_xavp_t *th, *new, *old, *prv = NULL;
sr_xavp_t *tuple_xavp;
sr_xavp_t *elem_xavp;
sr_xavp_t *tuple_xavp = NULL;
sr_xavp_t *elem_xavp = NULL;
sr_xval_t tuple_val;
pv_param_t p;
pv_value_t empty;

4
src/modules/http_async_client/http_multi.c
Unescape View File

@ -157,10 +157,12 @@ void event_cb(int fd, short kind, void *userp)
/* CURLMOPT_SOCKETFUNCTION */
int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp)
{
struct http_m_cell *cell;
struct http_m_global *g = (struct http_m_global *)cbp;
struct http_m_cell *cell = (struct http_m_cell *)sockp;
const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"};
cell = http_m_cell_lookup(e);
LM_DBG("socket callback: s=%d e=%p what=%s\n", s, e, whatstr[what]);
if(what == CURL_POLL_REMOVE) {
/* if cell is NULL the handle has been removed by the event callback for timeout */

14
src/modules/http_client/curlcon.c
Unescape View File

@ -582,21 +582,29 @@ int curl_parse_conn(void *param, cfg_parser_t *parser, unsigned int flags)
t.start.line, t.start.col);
return -1;
}
pkg_str_dup(&name, &t.val);
if(pkg_str_dup(&name, &t.val) < 0) {
return -1;
}
ret = cfg_get_token(&t, parser, 0);
if(ret < 0)
if(ret < 0) {
pkg_free(name.s);
return -1;
}
if((ret > 0) || (t.type != ']')) {
LM_ERR("%s:%d:%d: Syntax error, ']' expected\n", parser->file,
t.start.line, t.start.col);
pkg_free(name.s);
return -1;
}
if(cfg_eat_eol(parser, flags))
if(cfg_eat_eol(parser, flags)) {
pkg_free(name.s);
return -1;
}
raw_cc = pkg_malloc(sizeof(raw_http_client_conn_t));
if(raw_cc == NULL) {
pkg_free(name.s);
return -1;
}
memset(raw_cc, 0, sizeof(raw_http_client_conn_t));

1
src/modules/janssonrpcc/janssonrpc_server.c
Unescape View File

@ -130,6 +130,7 @@ int jsonrpc_parse_server(char *server_s, jsonrpc_server_group_t **group_ptr)
param_t *pit = NULL;
param_t *freeme = NULL;
str conn;
conn.s = NULL;
str addr;
addr.s = NULL;
str srv;

1
src/modules/janssonrpcc/janssonrpc_srv.c
Unescape View File

@ -90,6 +90,7 @@ int refresh_srv(jsonrpc_srv_t *srv_obj)
srv_record = (struct srv_rdata *)l->rdata;
if(srv_record == NULL) {
free_rdata_list(head);
free_server_list(new_servers);
ERR("BUG: null rdata\n");
return -1;
}

20
src/modules/jsonrpcc/netstring.c
Unescape View File

@ -35,11 +35,13 @@ int netstring_read_fd(int fd, char **netstring)
{
int i, bytes;
size_t len = 0;
size_t read_len = 0;
char buffer[10] = {0};
char *buffer2 = NULL;
int x;
*netstring = NULL;
char buffer[10] = {0};
/* Peek at first 10 bytes, to get length and colon */
bytes = recv(fd, buffer, 10, MSG_PEEK);
@ -68,8 +70,8 @@ int netstring_read_fd(int fd, char **netstring)
return NETSTRING_ERROR_NO_COLON;
/* Read the whole string from the buffer */
size_t read_len = i + len + 1;
char *buffer2 = pkg_malloc(read_len);
read_len = i + len + 1;
buffer2 = pkg_malloc(read_len);
if(!buffer2) {
LM_ERR("Out of memory!");
return -1;
@ -77,17 +79,19 @@ int netstring_read_fd(int fd, char **netstring)
bytes = recv(fd, buffer2, read_len, 0);
/* Make sure we got the whole netstring */
if(read_len > bytes)
if(read_len > bytes) {
pkg_free(buffer2);
return NETSTRING_ERROR_TOO_SHORT;
}
/* Test for the trailing comma */
if(buffer2[read_len - 1] != ',')
if(buffer2[read_len - 1] != ',') {
pkg_free(buffer2);
return NETSTRING_ERROR_NO_COMMA;
}
buffer2[read_len - 1] = '\0';
int x;
for(x = 0; x <= read_len - i - 1; x++) {
buffer2[x] = buffer2[x + i];
}

11
src/modules/msrp/msrp_cmap.c
Unescape View File

@ -156,6 +156,7 @@ int msrp_cmap_save(msrp_frame_t *mf)
char sbuf[MSRP_SBUF_SIZE];
str srcaddr;
str srcsock;
str xhdrs;
int msize;
int expires;
msrp_citem_t *it;
@ -172,16 +173,18 @@ int msrp_cmap_save(msrp_frame_t *mf)
expires = msrp_auth_max_expires;
if(expires < msrp_auth_min_expires) {
LM_DBG("expires is lower than min value\n");
srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Min-Expires: %d\r\n",
xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Min-Expires: %d\r\n",
msrp_auth_min_expires);
msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &srcaddr);
xhdrs.s = sbuf;
msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs);
return -3;
}
if(expires > msrp_auth_max_expires) {
LM_DBG("expires is greater than max value\n");
srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\n",
xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\n",
msrp_auth_max_expires);
msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &srcaddr);
xhdrs.s = sbuf;
msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs);
return -4;
}
if(msrp_frame_get_first_from_path(mf, &fpeer) < 0) {

35
src/modules/outbound/outbound_mod.c
Unescape View File

@ -59,29 +59,36 @@ static unsigned int ob_force_no_flag = (unsigned int)-1;
static str ob_key = {0, 0};
static str flow_token_secret = {0, 0};
/* clang-format off */
static cmd_export_t cmds[] = {
{"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0}};
{"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0},
{0, 0, 0, 0, 0, 0}
};
static param_export_t params[] = {
{"force_outbound_flag", PARAM_INT, &ob_force_flag},
{"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag},
{"flow_token_secret", PARAM_STRING, &flow_token_secret}, {0, 0, 0}};
{"force_outbound_flag", PARAM_INT, &ob_force_flag},
{"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag},
{"flow_token_secret", PARAM_STR, &flow_token_secret},
{0, 0, 0}
};
struct module_exports exports = {
"outbound", DEFAULT_DLFLAGS, /* dlopen flags */
cmds, /* exported functions */
params, /* exported parameters */
0, /* exported·RPC·methods */
0, /* exported pseudo-variables */
0, /* response·function */
mod_init, /* module initialization function */
0, /* per-child initialization function */
destroy /* destroy function */
"outbound",
DEFAULT_DLFLAGS, /* dlopen flags */
cmds, /* exported functions */
params, /* exported parameters */
0, /* RPC method exports */
0, /* exported pseudo-variables */
0, /* response handling function */
mod_init, /* module initialization function */
0, /* per-child init function */
destroy /* module destroy function */
};
/* clang-format on */
static void mod_init_openssl(void)
{
if(flow_token_secret.s) {
if(flow_token_secret.s && flow_token_secret.len > 0) {
assert(ob_key.len == SHA_DIGEST_LENGTH);
LM_DBG("flow_token_secret mod param set. use persistent ob_key");
#if OPENSSL_VERSION_NUMBER < 0x030000000L

12
src/modules/pv/pv_xavp.c
Unescape View File

@ -516,6 +516,10 @@ done:
error:
if(xname != NULL) {
if(xname->next != NULL) {
pkg_free(xname->next);
xname->next = NULL;
}
pv_xavp_name_destroy(xname);
pkg_free(xname);
}
@ -953,6 +957,10 @@ done:
error:
if(xname != NULL) {
if(xname->next != NULL) {
pkg_free(xname->next);
xname->next = NULL;
}
pv_xavu_name_destroy(xname);
pkg_free(xname);
}
@ -1100,6 +1108,10 @@ done:
error:
if(xname != NULL) {
if(xname->next != NULL) {
pkg_free(xname->next);
xname->next = NULL;
}
pv_xavi_name_destroy(xname);
pkg_free(xname);
}

8
src/modules/sanity/sanity.c
Unescape View File

@ -624,7 +624,11 @@ int check_cl(sip_msg_t *msg)
}
LM_DBG("check_cl passed\n");
} else {
LM_WARN("content length header missing in request\n");
if(msg->rcv.proto != PROTO_UDP && msg->rcv.proto != PROTO_SCTP) {
LM_WARN("content length header missing in request\n");
} else {
LM_DBG("content length header missing in request\n");
}
}
return SANITY_CHECK_PASSED;
@ -806,7 +810,7 @@ int check_parse_uris(sip_msg_t *msg, int checks)
if(!msg->to || !msg->to->body.s) {
msg->msg_flags |= FL_MSG_NOREPLY;
} else {
if(sanity_reply(msg, 400, "Ivalid To Header") < 0) {
if(sanity_reply(msg, 400, "Invalid To Header") < 0) {
LM_WARN("failed to send 400 via sl reply (missing To)\n");
}
}

2
src/modules/sipcapture/hep.c
Unescape View File

@ -21,6 +21,8 @@
*
*/
#include <arpa/inet.h>
#include "../../core/sr_module.h"
#include "../../core/dprint.h"
#include "../../core/events.h"

4
src/modules/stun/kam_stun.c
Unescape View File

@ -512,6 +512,10 @@ static int stun_create_response(struct stun_msg *req, struct stun_msg *res,
}
}
if(res->msg.buf.len < sizeof(struct stun_hdr)) {
LM_ERR("invalid message\n");
return FATAL_ERROR;
}
res->hdr.len = htons(res->msg.buf.len - sizeof(struct stun_hdr));
memcpy(&res->msg.buf.s[sizeof(USHORT_T)], (void *)&res->hdr.len,
sizeof(USHORT_T));

15
src/modules/tls/tls_select.c
Unescape View File

@ -1187,21 +1187,16 @@ static int pv_comp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res)
int pv_parse_alt_name(pv_spec_p sp, str *in)
{
pv_elem_t *fmt = NULL;
if(in->s == NULL || in->len <= 0)
return -1;
if(pv_parse_format(in, &fmt) < 0 || fmt == NULL) {
LM_ERR("wrong format[%.*s]\n", in->len, in->s);
return -1;
}
if(strncmp(in->s, "DNS", 3) == 0) {
if(in->len == 3 && strncmp(in->s, "DNS", 3) == 0) {
sp->pvp.pvn.u.isname.name.n = PV_COMP_HOST;
} else if(strncmp(in->s, "URI", 3) == 0) {
} else if(in->len == 3 && strncmp(in->s, "URI", 3) == 0) {
sp->pvp.pvn.u.isname.name.n = PV_COMP_URI;
} else if(strncmp(in->s, "EMAIL", 5) == 0) {
} else if(in->len == 5 && strncmp(in->s, "EMAIL", 5) == 0) {
sp->pvp.pvn.u.isname.name.n = PV_COMP_E;
} else if(strncmp(in->s, "IP", 2) == 0) {
} else if(in->len == 2 && strncmp(in->s, "IP", 2) == 0) {
sp->pvp.pvn.u.isname.name.n = PV_COMP_IP;
} else {
LM_ERR("Unsupported alt name %s\n", in->s);

48
src/modules/tm/t_cancel.c
Unescape View File

@ -29,6 +29,7 @@
#include "t_funcs.h"
#include "../../core/dprint.h"
#include "../../core/ut.h"
#include "../../core/kemi.h"
#include "t_reply.h"
#include "t_cancel.h"
#include "t_msgbuilder.h"
@ -36,6 +37,8 @@
#include "t_hooks.h"
extern str tm_event_callback;
typedef struct cancel_reason_map
{
int code;
@ -210,6 +213,11 @@ int cancel_branch(
struct cancel_info tmp_cd;
void *pcbuf;
int reply_status;
int rt, backup_rt;
struct run_act_ctx ctx;
sip_msg_t msg;
sr_kemi_eng_t *keng = NULL;
str evname = str_init("tm:local-request");
crb = &t->uac[branch].local_cancel;
irb = &t->uac[branch].request;
@ -326,6 +334,46 @@ int cancel_branch(
crb->buffer_len = len;
LM_DBG("sending cancel...\n");
rt = -1;
if(tm_event_callback.s == NULL || tm_event_callback.len <= 0) {
rt = route_lookup(&event_rt, evname.s);
if(rt < 0 || event_rt.rlist[rt] == NULL) {
LM_DBG("tm:local-request not found\n");
}
} else {
keng = sr_kemi_eng_get();
if(keng == NULL) {
LM_DBG("event callback (%s) set, but no cfg engine\n",
tm_event_callback.s);
}
}
// /* Check if msg is null */
if(build_sip_msg_from_buf(&msg, crb->buffer, crb->buffer_len, 0) < 0) {
LM_ERR("fail to parse msg\n");
}
/* Call event */
backup_rt = get_route_type();
set_route_type(REQUEST_ROUTE);
init_run_actions_ctx(&ctx);
if(rt >= 0) {
LM_DBG("tm:local-request found [%d]\n", rt);
run_top_route(event_rt.rlist[rt], &msg, 0);
} else {
if(keng != NULL) {
if(sr_kemi_route(
keng, &msg, EVENT_ROUTE, &tm_event_callback, &evname)
< 0) {
LM_ERR("error running event route kemi callback\n");
}
}
}
set_route_type(backup_rt);
free_sip_msg(&msg);
if(SEND_BUFFER(crb) >= 0) {
if(unlikely(has_tran_tmcbs(t, TMCB_REQUEST_OUT)))
run_trans_callbacks_with_buf(

5
src/modules/tm/t_msgbuilder.c
Unescape View File

@ -1246,7 +1246,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans,
/* headers */
*len += Trans->from_hdr.len + Trans->callid_hdr.len + to->len
+ Trans->cseq_hdr_n.len + 1 + ACK_LEN + CRLF_LEN;
+ Trans->cseq_hdr_n.len + 1 + ACK_LEN + MAXFWD_HEADER_LEN
+ CRLF_LEN;
/* copy'n'paste Route headers */
@ -1291,6 +1292,8 @@ char *build_dlg_ack(struct sip_msg *rpl, struct cell *Trans,
append_str(p, Trans->callid_hdr.s, Trans->callid_hdr.len);
append_str(p, to->s, to->len);
append_str(p, MAXFWD_HEADER, MAXFWD_HEADER_LEN);
append_str(p, Trans->cseq_hdr_n.s, Trans->cseq_hdr_n.len);
append_str(p, " ", 1);
append_str(p, ACK, ACK_LEN);

9
src/modules/topos_redis/topos_redis_storage.c
Unescape View File

@ -677,6 +677,9 @@ int tps_redis_load_initial_method_branch(
if(rrpl->type != REDIS_REPLY_ARRAY) {
LM_WARN("invalid redis result type: %d\n", rrpl->type);
if(rrpl->type == REDIS_REPLY_ERROR) {
LM_ERR("Redis error:%s\n", rrpl->str);
}
freeReplyObject(rrpl);
return -1;
}
@ -832,6 +835,9 @@ int tps_redis_load_branch(
if(rrpl->type != REDIS_REPLY_ARRAY) {
LM_WARN("invalid redis result type: %d\n", rrpl->type);
if(rrpl->type == REDIS_REPLY_ERROR) {
LM_ERR("Redis error:%s\n", rrpl->str);
}
freeReplyObject(rrpl);
return -1;
}
@ -1037,6 +1043,9 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd)
if(rrpl->type != REDIS_REPLY_ARRAY) {
LM_WARN("invalid redis result type: %d\n", rrpl->type);
if(rrpl->type == REDIS_REPLY_ERROR) {
LM_ERR("Redis error:%s\n", rrpl->str);
}
freeReplyObject(rrpl);
return -1;
}

4
src/modules/utils/xcap_auth.c
Unescape View File

@ -418,11 +418,13 @@ int get_rules_doc(str *user, str *domain, int type, str **rules_doc)
doc = (str *)pkg_malloc(sizeof(str));
if(doc == NULL) {
PKG_MEM_ERROR;
goto error;
}
doc->s = (char *)pkg_malloc(body.len * sizeof(char));
if(doc->s == NULL) {
pkg_free(doc);
PKG_MEM_ERROR;
goto error;
}
memcpy(doc->s, body.s, body.len);
doc->len = body.len;
@ -514,4 +516,4 @@ int w_xcap_auth_status(struct sip_msg *_msg, char *_sp1, char *_sp2)
}
return ki_xcap_auth_status(_msg, &watcher_uri, &presentity_uri);
}
}

22
src/modules/xlog/xlog.c
Unescape View File

@ -883,6 +883,7 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg)
int lf = xlog_facility;
pv_elem_t *xmodel = NULL;
str txt = {0, 0};
char *_xlog_prefix_val = _xlog_prefix;
if(!is_printable(llevel))
return 1;
@ -898,6 +899,18 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg)
return -1;
}
if(_xlog_prefix_mode) {
str _xlog_prefix_str;
_xlog_prefix_str.s = _xlog_prefix_buf;
_xlog_prefix_str.len = buf_size;
if(pv_printf(msg, _xlog_prefix_pvs, _xlog_prefix_str.s,
&_xlog_prefix_str.len)
== 0
&& _xlog_prefix_str.len > 0) {
_xlog_prefix_val = _xlog_prefix_buf;
}
}
if(lfacility != NULL) {
lfacility->s[lfacility->len] = '\0';
lf = str2facility(lfacility->s);
@ -907,8 +920,7 @@ int ki_xlog_ex(sip_msg_t *msg, str *lfacility, int llevel, str *lmsg)
lf = xlog_facility;
}
}
LOG_FN(lf, llevel, _xlog_prefix, "%.*s", txt.len, txt.s);
;
LOG_FN(lf, llevel, _xlog_prefix_val, "%.*s", txt.len, txt.s);
pv_elem_free_all(xmodel);
return 1;
}
@ -921,10 +933,12 @@ int ki_xlog_get_level(str *slevel)
llevel = L_ALERT;
} else if(slevel->len == 5 && strncasecmp(slevel->s, "l_bug", 5) == 0) {
llevel = L_BUG;
} else if(slevel->len == 7 && strncasecmp(slevel->s, "l_crit0", 7) == 0) {
llevel = L_CRIT;
} else if(slevel->len == 7 && strncasecmp(slevel->s, "l_crit2", 7) == 0) {
llevel = L_CRIT2;
} else if(slevel->len == 6 && strncasecmp(slevel->s, "l_crit", 6) == 0) {
llevel = L_CRIT;
llevel = L_CRIT2;
} else if(slevel->len == 5 && strncasecmp(slevel->s, "l_err", 5) == 0) {
llevel = L_ERR;
} else if(slevel->len == 6 && strncasecmp(slevel->s, "l_warn", 6) == 0) {
@ -986,7 +1000,7 @@ int ki_xalert(sip_msg_t *msg, str *lmsg)
int ki_xcrit(sip_msg_t *msg, str *lmsg)
{
return ki_xlog_ex(msg, NULL, L_CRIT, lmsg);
return ki_xlog_ex(msg, NULL, L_CRIT2, lmsg);
}
/**

7
src/modules/xmlrpc/xmlrpc.c
Unescape View File

@ -2019,7 +2019,7 @@ static int rpc_struct_printf(
struct rpc_struct *s, char *member_name, char *fmt, ...)
{
int n, buf_size;
char *buf;
char *buf = NULL;
va_list ap;
str st, name;
struct xmlrpc_reply *reply;
@ -2071,6 +2071,7 @@ static int rpc_struct_printf(
if(add_xmlrpc_reply(out, &member_suffix) < 0)
goto err;
mxr_free(buf);
return 0;
}
/* Else try again with more space. */
@ -2085,7 +2086,7 @@ static int rpc_struct_printf(
goto err;
}
}
return 0;
err:
if(buf)
mxr_free(buf);
@ -2740,7 +2741,7 @@ static int ki_xmlrpc_reply(sip_msg_t *msg, int rcode, str *reason)
if(add_xmlrpc_reply(&reply, &int_suffix) < 0)
goto error;
if(add_xmlrpc_reply(&reply, &success_suffix) < 0)
return -1;
goto error;
}
if(send_reply(msg, &reply.body) < 0)
goto error;

Write Preview
Loading…
Cancel
Save