November 2016 - sr-dev - kamailio.org

git:4.4:d29fd285: modules: readme files regenerated - crypto ...
by Kamailio Dev 02 Nov '16

02 Nov '16

Module: kamailio Branch: 4.4 Commit: d29fd2852f9125f88e52312cf6b0f78355a5db3a URL: https://github.com/kamailio/kamailio/commit/d29fd2852f9125f88e52312cf6b0f78… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-11-02T11:01:24+01:00 modules: readme files regenerated - crypto ... --- Modified: modules/crypto/README Modified: modules/dispatcher/README Modified: modules/nathelper/README Modified: modules/permissions/README Modified: modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/d29fd2852f9125f88e52312cf6b0f78… Patch: https://github.com/kamailio/kamailio/commit/d29fd2852f9125f88e52312cf6b0f78…

1 0

git: new commits in branch 4.4
by Daniel-Constantin Mierla 02 Nov '16

02 Nov '16

- URL: https://github.com/kamailio/kamailio/commit/1873b4536e5371e33a7135fafe862c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:16:29+01:00 core: parser - removed level and function prefix from log messages for identity info (cherry picked from commit d7b0c68b825222f139aaa16a73de23fe2c07312a) - URL: https://github.com/kamailio/kamailio/commit/592aad9ad1cb53ae868cb2a9e6f5e01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:17:25+01:00 tm: fixed misleading indentation of block after an IF (reported by gcc 6.2) (cherry picked from commit b20b076e292fc7720352f64ccabb3caafbfae1d3) - URL: https://github.com/kamailio/kamailio/commit/98ffcd408ff536361faa70c91cd1c57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:17:58+01:00 pv: adjusted indentation after if blocks to avoid gcc 6.2 warnings (cherry picked from commit 8c169ba0919e46222f1732d6ab084f499ea2972b) - URL: https://github.com/kamailio/kamailio/commit/0b2d30d79670e473c87d119ee305551… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:18:28+01:00 ldap: removed unused variable (cherry picked from commit 564f5c612999d762b24bcaf2047bb063d1d5ecbf) - URL: https://github.com/kamailio/kamailio/commit/07a023d03700a73b545a82b9de6930a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:18:42+01:00 db_perlvdb: fixed warning of using static function inside inline one (cherry picked from commit 0f791078260f2ccfd22a268831fb8dcfb00b24f3) - URL: https://github.com/kamailio/kamailio/commit/4ea04ef7c5c317d30c691915b9790bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:18:52+01:00 presence: remove unused variable - coherent whitespacing (cherry picked from commit 1014788aa32468e734cd082d9c770adc7daa05e4) - URL: https://github.com/kamailio/kamailio/commit/3484127bedefd9ca7dc882ef2b45803… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:19:42+01:00 pua_xmpp: fixed misleading missing guard for if block - coherent whitespacing (cherry picked from commit 52424c5e3748dbad9802a8c92bfda7c8457a9a62) - URL: https://github.com/kamailio/kamailio/commit/a84f0e1ec76a6999d3a5285e6e23007… Author: Phil Lavin <phil(a)lavin.me.uk> Date: 2016-11-02T10:20:33+01:00 purple: Fix multiple memory leaks in DB code (cherry picked from commit a361686b2c872cad6493804eb71b8b8e7e151a4f) - URL: https://github.com/kamailio/kamailio/commit/c7d59bd0daefd677e70a8ec2b69e819… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:23:49+01:00 core: print the len for added header in debug message (cherry picked from commit eb9d4e0fe99b0b81e9f33106e080112be22b28a5) - URL: https://github.com/kamailio/kamailio/commit/02f4834bc002717bd0527615b07a5f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:24:14+01:00 core: msg parser - relocated static inline functions from header file - copes beter with latest compiler versions - coherent whitespacing and indentation (cherry picked from commit a830e5271c4567073cef4fee0cde65f7c0979176) - URL: https://github.com/kamailio/kamailio/commit/4c60c2205923513d15761f248d9e64b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:24:29+01:00 core: msg parser - more log message for get body function (cherry picked from commit 69a89021f95b19c803cff3919bf38be2cb1dbbd2) - URL: https://github.com/kamailio/kamailio/commit/293c8dbe6fb93162976d4bc8a8f0a65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:25:05+01:00 ctl: split the definition of default ctl socket (cherry picked from commit 26ed56da94fde2df51fa0e12e67a790922116d37) - URL: https://github.com/kamailio/kamailio/commit/871f864bd18643f5d5a64d3bbd989fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:25:14+01:00 ctl: take in consideration runtime_dir when creation the ctl socket (cherry picked from commit 99f25469c5ce8070210769f9dfe2a16b7333c14d) - URL: https://github.com/kamailio/kamailio/commit/8ded27355991a098f22e1b70f3f5cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:25:26+01:00 Makefile.defs: option to disable raw sockets at compile time make RAW_SOCKS=no ... (cherry picked from commit 0f3123426d3c9d8e10b8e74557d0791a6df85648) - URL: https://github.com/kamailio/kamailio/commit/cc7b222b2752601648fc512d390aaaf… Author: Chocolatbuddha <chocolatbuddha(a)gmail.com> Date: 2016-11-02T10:25:48+01:00 Presence: Fix startup inconsistency in presentity hash table pres_htable_restore(): Remove check of expired presentity entries when initially filling the hash table to represent the number of expired + valid entries. Because hash.c::delete_phtable() decrements publ_count on removal of _every_ expired DB entry. get_p_notify_body(): Compensate the fix on hash table restore by checking for the expires time on building the NOTIFY. This also fixes a problem when a SUBSCRIBE is received for an expired entry before the cleaner can remove the entry from the DB. (cherry picked from commit 1dceaa24ded727aba5870f28fb63e26ed98464f3) - URL: https://github.com/kamailio/kamailio/commit/a53c91ccf933a500e1858bac778f192… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:26:00+01:00 dialog: propre reparse of msg structure when doing cseq refresh ops - triggering parsing from scratch always resulted in improper propagation of parsing flags and failure to detect end of headers - credits to JÃ¶ran Vinzens for assistance with troubleshooting - GH #819 (cherry picked from commit dd0b7e403404a977707aa1524783111190cc5f3e) - URL: https://github.com/kamailio/kamailio/commit/4fb274c9654769468ecd1a7fd386b05… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-11-02T10:27:16+01:00 janssonrpc-c: fix memory leak when using janssonrpc_notification (cherry picked from commit c6b38e437387aba003bef8ef9496d5a7568e9c97) - URL: https://github.com/kamailio/kamailio/commit/0d82942a6d7c30c577b60e7eda7e884… Author: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-11-02T10:28:19+01:00 mem: TLSF bit ops cleanup / 64 bits improvement - remove unsupproted compilers - use 64 bits __builtin_clzl() instead of twice 32 bits __builtin_clz() (cherry picked from commit 0683df11e319aa3db45cd9b18af3a3c3b02088a8) - URL: https://github.com/kamailio/kamailio/commit/e28a66fb3fd42226f477bc0efc8bbac… Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: 2016-11-02T10:28:41+01:00 pv: Use memcpy to copy len bytes instead of strcpy The sipcapture plugin stores bytes with VAR_VAL_STR and when copying the data it would end up being truncated. Use memcpy instead of strncpy and assume that the original string already has the NUL termination (or not as with the hep plugin). Config example: $var(payload) = hep(0x00f) (cherry picked from commit 2531dd069bc76f945c5c19253e35fe8b1ef9ed15) - URL: https://github.com/kamailio/kamailio/commit/402fd315a9239806a669701827e6d47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:28:54+01:00 rr: more log details when 2nd rr with r2=on is not matching a local socket (cherry picked from commit b814c5aadc690ceeca75e6ce25bf850ddfc4b44a) - URL: https://github.com/kamailio/kamailio/commit/d8e27514f9f576d4653a15ebe8210f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:29:06+01:00 rr: fixed typo in log message - due to previous commit - reported by Alberto Llamas (cherry picked from commit e310762f71afd3e290e709f2d6786d44ce15ee1a) - URL: https://github.com/kamailio/kamailio/commit/306cf67a03f07f55ec8d7049eaaa623… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2016-11-02T10:29:25+01:00 permissions: update doc with missing MI and RPC commands: mi: perm_domain_dump rpc: permissions.domainDump (cherry picked from commit 5b5ac65cc8adcecf940cf9098d99ad7bbaaddc07) - URL: https://github.com/kamailio/kamailio/commit/7fdfb649cc4a6992be70a67555aff1f… Author: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2016-11-02T10:29:49+01:00 rr: use default port for protocol if it is omitted in route header When using double route headers the selection of the outgoing socket is only done on IP address if the port is omitted in that route header. This fix defaults the port to 5060/5061 depending on protocol so the correct listen socket is chosen. When no socket is found it will fallback to the current behaviour keeping backwards interoperability. (cherry picked from commit aaec127fbf1f3be41e49601330d7eafe7353c53a) - URL: https://github.com/kamailio/kamailio/commit/e17aba9e458743c93c5637982afbc62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:30:15+01:00 lib/srdb1: fix the memset to 0 in util function (cherry picked from commit d7431dd190bb1f4aba8e2373807047ac6fe8db90) - URL: https://github.com/kamailio/kamailio/commit/f82b12c5a34c299b7e37c5f1049ed9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:30:31+01:00 db_postgres: safety check of str buffer pointer before writing (cherry picked from commit 8ed8d8349dad1e2abd2ac026b4540e9a296c866b) - URL: https://github.com/kamailio/kamailio/commit/33aa99a906bf7f352fc6ba1d021348e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:30:46+01:00 htable: earlier init of jdoc used for dmq for proper clean on error cases (cherry picked from commit 13ff91b1955d7248f8aaaf350675275e425443dc) - URL: https://github.com/kamailio/kamailio/commit/3f7c250a14f77c35e7dc5fd16785137… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:31:02+01:00 pua: copy over subs flag in subscribe_cbparam() (cherry picked from commit 82e22fb36c5155d920b60e8cad689578eec8fb70) - URL: https://github.com/kamailio/kamailio/commit/6966751ea1fcf9cde904dc0762f20ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:31:10+01:00 pua: one more proper propagation of ua_flags in subs_cbparam_indlg() (cherry picked from commit 1e2060c0e0aa28fc1c2129d5e5fe3e210827e850) - URL: https://github.com/kamailio/kamailio/commit/5f9c8a2966eccf977fd8c17a715446b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:31:21+01:00 pua: fix propagation of ua_flag - it is func param, not in subs (cherry picked from commit 62c5d0d9cbd87a6b47c1a211588230ebc2652b8f) - URL: https://github.com/kamailio/kamailio/commit/3b8172225eefcffee04c87851424a58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:31:39+01:00 core: parser - use square brakets for log messages of addr-spec parsing - replace angle brakets, which can mislead because they are part of values (cherry picked from commit 7c43359e3c2ebe9aab8a69717225f83737d18345) - URL: https://github.com/kamailio/kamailio/commit/5ae104fcf8753b13cce40b699249038… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:31:47+01:00 core: parse addr spec - removed old style log message prefixes (cherry picked from commit 1a2918e2d962e2a61a8c185974e49fe9cc09c631) - URL: https://github.com/kamailio/kamailio/commit/ac19fef4e452fa7e4e29c41b96527f4… Author: albertollamaso <albertollamaso(a)gmail.com> Date: 2016-11-02T10:32:12+01:00 permissions: doc typo fixed (cherry picked from commit 26c41e16512f04b7d83d66432a78f277852a8664) - URL: https://github.com/kamailio/kamailio/commit/d506cd01562cb23ddd1fa22d662a17b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:32:24+01:00 uac: coherent indentation of code for replace from/to values (cherry picked from commit 00571fd1d07edbfb5950ca6786e898ecbc0b33f5) - URL: https://github.com/kamailio/kamailio/commit/b38167923bd13abb6bbe4d58a57ed05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:32:35+01:00 uac: safety check for new uri to include only printable characters - related to GH #833 (cherry picked from commit 49dd3315b7298addeaa85dd1628cd0a25ddef5b1) - URL: https://github.com/kamailio/kamailio/commit/5bb035929c81ab16b06694316b67582… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:33:14+01:00 ndb_redis: get the srv structure after checking parameter sanity (cherry picked from commit c5681600a5fdd650a4830e77aca2b4804766ccfa) - URL: https://github.com/kamailio/kamailio/commit/eb63cc8639e10a9fe413b6a29c31ab5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:33:54+01:00 lib/srutils: removed valueint field from json struct - numbers are stored in the valuedouble - helper macros added to retrivie fixed type numbers (cherry picked from commit ecd22245336f2d3d6d2f9404ebfdd4369f19bd97) - URL: https://github.com/kamailio/kamailio/commit/e443eba3010a24a02bb73d15f1f7d55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:34:04+01:00 dialog: converted to use json helper macros for dlg profile (cherry picked from commit d7653eb9e7e6ffe21988f2a616deae0c01083c57) - URL: https://github.com/kamailio/kamailio/commit/2a37ae7f9c712951034d41107ab2aa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:34:17+01:00 dmq_usrloc: use usigned int for contact info values - switched to using json helper macros for numbers (cherry picked from commit f68f0864c77e8556e48db4d5681ba8dc3ea06f62) - URL: https://github.com/kamailio/kamailio/commit/d6daa134c5b908a7c202af213758cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:34:29+01:00 htable: switched to json macros for numbers in dmq operations (cherry picked from commit 114ec80c58f06c876fc76d884b73095c5dcc8bff) - URL: https://github.com/kamailio/kamailio/commit/704a21b462dcc740cd8763c1c802293… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:34:40+01:00 rtjson: use json macros to retrieve int values (cherry picked from commit b8d6b99a36e57b65f7b7d9fba321e2088032178b) - URL: https://github.com/kamailio/kamailio/commit/7e85486f93c101f69df8aec97492ea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:34:53+01:00 jsonrpc-s: switched to use json helper macros for numbers (cherry picked from commit 2853500cc73a5dfc66654e6f3555c1c40e072817) - URL: https://github.com/kamailio/kamailio/commit/e94ff2a8f9347e3d61bb1b5e7e9fdd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:35:06+01:00 lib/srutils: srjson - init number value for null, true and false (cherry picked from commit 2c22664610de2a007bbb881fead5640048ed24ba) - URL: https://github.com/kamailio/kamailio/commit/e3b8f63bfe3f6e220672c5cb9de1ee8… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-02T10:35:29+01:00 modules/nathelper: fix small typo in documentation (cherry picked from commit 90781fc664ab3b843390c67f6367240a513828c0) - URL: https://github.com/kamailio/kamailio/commit/2e7869c8dfd059f4cf5d5d0f7d31fd8… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-02T10:35:38+01:00 modules/sanity: fix small typo in documentation (cherry picked from commit 463569b8b0c2e29da1c82683e8edab0c2f67a9da) - URL: https://github.com/kamailio/kamailio/commit/c54fc3126fb5f4139b41e016aaf320a… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-02T10:35:47+01:00 modules/dispatcher: fix small typo in documentation (cherry picked from commit 02482d1b71dc618467978b060bc23bfedaa502fb) - URL: https://github.com/kamailio/kamailio/commit/fd5b6e83ffac3137d43792edd5feef9… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-11-02T10:35:57+01:00 modules/crypto: fix small typo in documentation (cherry picked from commit bb62b0f32543e6961972679cfe34c48091329a63) - URL: https://github.com/kamailio/kamailio/commit/2cffb6ffd4e6b082098301cf584f613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:36:17+01:00 domain: fixed typo in the log message - fixed warning on allocating hash_table with a different size than the content of the pointer - coherent indentation and whitespacing (cherry picked from commit 96fea675022cc923e4f253454b5095fa810ab313) - URL: https://github.com/kamailio/kamailio/commit/b813a47ea5aa8ee322f238e529fc008… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:36:27+01:00 mi_datagram: safety check so the length of mi socket doesn't result in overflow (cherry picked from commit d4f3c96cdf2efc8db8fa115a35f7ea9545ea4c9f) - URL: https://github.com/kamailio/kamailio/commit/36c939dfe75cec797cfdd7caa3f9aed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:36:49+01:00 core: parser/sdp - init pf variable to avoid compile time warnings (cherry picked from commit d7871cd82e22bfe8444e2d150b38565265343223) - URL: https://github.com/kamailio/kamailio/commit/05a7e71cca01325095cfcd2315f6ea6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:37:09+01:00 rr: removed unused assignment (cherry picked from commit 6b1d18c3ba184b60a7be567f23ba4cda6efee4af) - URL: https://github.com/kamailio/kamailio/commit/d4169f1b598c6e92a470d2f12259333… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:37:26+01:00 janssonrpc-c: declare variables at beginning of netstring_read_fd() (cherry picked from commit 30cdc11f30e10bca5821609d86d31ffc1b5bd3c8) - URL: https://github.com/kamailio/kamailio/commit/e20230bb36f0ca63cdb0dd81c1d6a87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T10:37:43+01:00 core: parser/parse_diversion - allow comma separated bodies - still only the first body is cacshed in msg->diversion - reported by GH #841 (cherry picked from commit 47f1ff4d31101c8a8d16a08b3c2f1069b85b3d47)

1 0

git:master:47f1ff4d: core: parser/parse_diversion - allow comma separated bodies
by Daniel-Constantin Mierla 02 Nov '16

02 Nov '16

Module: kamailio Branch: master Commit: 47f1ff4d31101c8a8d16a08b3c2f1069b85b3d47 URL: https://github.com/kamailio/kamailio/commit/47f1ff4d31101c8a8d16a08b3c2f106… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T09:39:57+01:00 core: parser/parse_diversion - allow comma separated bodies - still only the first body is cacshed in msg->diversion - reported by GH #841 --- Modified: parser/parse_diversion.c --- Diff: https://github.com/kamailio/kamailio/commit/47f1ff4d31101c8a8d16a08b3c2f106… Patch: https://github.com/kamailio/kamailio/commit/47f1ff4d31101c8a8d16a08b3c2f106… --- diff --git a/parser/parse_diversion.c b/parser/parse_diversion.c index cc60600..4578087 100644 --- a/parser/parse_diversion.c +++ b/parser/parse_diversion.c @@ -13,20 +13,21 @@ * 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 */ /*! \file * \brief Parser :: Diversion header - * + * * \ingroup parser */ - + #include <stdlib.h> -#include <string.h> +#include <string.h> #include "../dprint.h" #include "../ut.h" #include "../mem/mem.h" @@ -40,41 +41,49 @@ * params: msg : sip msg * returns 0 on success, * -1 on failure. + * + * limitations: it parses only the first occurence */ int parse_diversion_header(struct sip_msg *msg) { - struct to_body* diversion_b; - - if (!msg->diversion && (parse_headers(msg, HDR_DIVERSION_F, 0) == -1 || - !msg->diversion)) { - goto error; - } - - /* maybe the header is already parsed! */ - if (msg->diversion->parsed) - return 0; - - /* bad luck! :-( - we have to parse it */ - /* first, get some memory */ - diversion_b = pkg_malloc(sizeof(struct to_body)); - if (diversion_b == 0) { - LOG(L_ERR, "ERROR:parse_diversion_header: out of pkg_memory\n"); - goto error; - } - - /* now parse it!! */ - memset(diversion_b, 0, sizeof(struct to_body)); - parse_to(msg->diversion->body.s, msg->diversion->body.s + msg->diversion->body.len + 1, diversion_b); - if (diversion_b->error == PARSE_ERROR) { - LOG(L_ERR, "ERROR:parse_diversion_header: bad diversion header\n"); - free_to(diversion_b); - goto error; - } - msg->diversion->parsed = diversion_b; - - return 0; - error: - return -1; + struct to_body* diversion_b; + + if (!msg->diversion && (parse_headers(msg, HDR_DIVERSION_F, 0) == -1)) { + goto error; + } + + if (!msg->diversion) { + /* header not found */ + return -1; + } + + /* maybe the header is already parsed! */ + if (msg->diversion->parsed) + return 0; + + /* bad luck! :-( - we have to parse it */ + /* first, get some memory */ + diversion_b = pkg_malloc(sizeof(struct to_body)); + if (diversion_b == 0) { + LM_ERR("out of pkg_memory\n"); + goto error; + } + + /* now parse it!! */ + memset(diversion_b, 0, sizeof(struct to_body)); + parse_addr_spec(msg->diversion->body.s, + msg->diversion->body.s + msg->diversion->body.len + 1, + diversion_b, 1); + if (diversion_b->error == PARSE_ERROR) { + LM_ERR("bad diversion header\n"); + free_to(diversion_b); + goto error; + } + msg->diversion->parsed = diversion_b; + + return 0; +error: + return -1; } @@ -83,22 +92,22 @@ int parse_diversion_header(struct sip_msg *msg) */ str *get_diversion_param(struct sip_msg *msg, str* name) { - struct to_param *params; + struct to_param *params; - if (parse_diversion_header(msg) < 0) { - ERR("could not get diversion parameter\n"); + if (parse_diversion_header(msg) < 0) { + LM_ERR("could not get diversion parameter\n"); return 0; - } + } - params = ((struct to_body*)(msg->diversion->parsed))->param_lst; + params = ((struct to_body*)(msg->diversion->parsed))->param_lst; - while (params) { + while (params) { if ((params->name.len == name->len) && - (strncmp(params->name.s, name->s, name->len) == 0)) { + (strncmp(params->name.s, name->s, name->len) == 0)) { return &params->value; } params = params->next; - } - - return 0; + } + + return 0; }

1 0

git:master:cfcc10a8: app_python: adjusted the realloc size to char pointers
by Daniel-Constantin Mierla 02 Nov '16

02 Nov '16

Module: kamailio Branch: master Commit: cfcc10a809feb89c2365c6cacec72ae01ee3888a URL: https://github.com/kamailio/kamailio/commit/cfcc10a809feb89c2365c6cacec72ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T18:11:17+01:00 app_python: adjusted the realloc size to char pointers --- Modified: modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/cfcc10a809feb89c2365c6cacec72ae… Patch: https://github.com/kamailio/kamailio/commit/cfcc10a809feb89c2365c6cacec72ae… --- diff --git a/modules/app_python/python_support.c b/modules/app_python/python_support.c index 28f92da..47b4640 100644 --- a/modules/app_python/python_support.c +++ b/modules/app_python/python_support.c @@ -184,14 +184,14 @@ char *make_message(const char *fmt, ...) va_list ap; size = 100; /* Guess we need no more than 100 bytes. */ - p = (char *)pkg_realloc(NULL, size * sizeof(char *)); + p = (char *)pkg_realloc(NULL, size * sizeof(char)); if (!p) { LM_ERR("Can't allocate memory (%lu bytes), pkg_malloc() has failed:" - " Not enough memory.\n", (unsigned long)(size * sizeof(char *))); + " Not enough memory.\n", (unsigned long)(size * sizeof(char))); return NULL; } - memset(p, 0, size * sizeof(char *)); + memset(p, 0, size * sizeof(char)); while (1) { @@ -207,11 +207,11 @@ char *make_message(const char *fmt, ...) else /* glibc 2.0 */ size *= 2; - np = (char *)pkg_realloc(p, size * sizeof(char *)); + np = (char *)pkg_realloc(p, size * sizeof(char)); if (!np) { LM_ERR("Can't allocate memory (%lu bytes), pkg_realloc() has failed:" - " Not enough memory.\n", (unsigned long)size * sizeof(char *)); + " Not enough memory.\n", (unsigned long)size * sizeof(char)); if (p) pkg_free(p); return NULL;

1 0

git:master:30cdc11f: janssonrpc-c: declare variables at beginning of netstring_read_fd()
by Daniel-Constantin Mierla 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 30cdc11f30e10bca5821609d86d31ffc1b5bd3c8 URL: https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:37:08+01:00 janssonrpc-c: declare variables at beginning of netstring_read_fd() --- Modified: modules/janssonrpc-c/netstring.c --- Diff: https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ff… Patch: https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ff… --- diff --git a/modules/janssonrpc-c/netstring.c b/modules/janssonrpc-c/netstring.c index a559224..7414f0d 100644 --- a/modules/janssonrpc-c/netstring.c +++ b/modules/janssonrpc-c/netstring.c @@ -141,12 +141,14 @@ int netstring_read_fd(int fd, netstring_t **netstring) int bytes, offset; size_t read_len; char *temp_buffer; + int total; + int i, len; + char peek[10]={0}; temp_buffer = NULL; offset = 0; if (*netstring == NULL) { /* No buffer yet. Peek at first 10 bytes, to get length and colon. */ - char peek[10]={0}; bytes = recv(fd,peek,10,MSG_PEEK); if (bytes < 3) return NETSTRING_INCOMPLETE; @@ -158,7 +160,6 @@ int netstring_read_fd(int fd, netstring_t **netstring) /* The netstring must start with a number */ if (!isdigit(peek[0])) return NETSTRING_ERROR_NO_LENGTH; - int i, len; len = i = 0; /* Read the number of bytes */ @@ -194,7 +195,8 @@ int netstring_read_fd(int fd, netstring_t **netstring) /* Read from the socket */ bytes = recv(fd, temp_buffer, read_len, 0); - int total = (*netstring)->read += bytes; + (*netstring)->read += bytes; + total = (*netstring)->read; /* See if we have the whole netstring yet */ if (read_len > bytes) {

1 0

git:master:6b1d18c3: rr: removed unused assignment
by Daniel-Constantin Mierla 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 6b1d18c3ba184b60a7be567f23ba4cda6efee4af URL: https://github.com/kamailio/kamailio/commit/6b1d18c3ba184b60a7be567f23ba4cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:33:16+01:00 rr: removed unused assignment --- Modified: modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/6b1d18c3ba184b60a7be567f23ba4cd… Patch: https://github.com/kamailio/kamailio/commit/6b1d18c3ba184b60a7be567f23ba4cd… --- diff --git a/modules/rr/record.c b/modules/rr/record.c index 6c7cc05..2f93adf 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -686,7 +686,6 @@ static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_d } memcpy(p, _data->s, _data->len); - p += _data->len; p = suffix; if (tag && tag->len) {

1 0

git:master:d7871cd8: core: parser/sdp - init pf variable to avoid compile time warnings
by Daniel-Constantin Mierla 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: d7871cd82e22bfe8444e2d150b38565265343223 URL: https://github.com/kamailio/kamailio/commit/d7871cd82e22bfe8444e2d150b38565… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:30:18+01:00 core: parser/sdp - init pf variable to avoid compile time warnings --- Modified: parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/d7871cd82e22bfe8444e2d150b38565… Patch: https://github.com/kamailio/kamailio/commit/d7871cd82e22bfe8444e2d150b38565… --- diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 1e53940..e6708d8 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -375,6 +375,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ * - shorcut useful for multi-part bodies and sdp operations */ _sdp->text = *sdp_body; + pf = AF_INET; /* * Parsing of SDP body.

1 0

git:master:64d3d1de: app_python: fixed realloc size for local buf variables
by Daniel-Constantin Mierla 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 64d3d1de13666277e3b1bd707e05880e63fd6ccf URL: https://github.com/kamailio/kamailio/commit/64d3d1de13666277e3b1bd707e05880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:23:00+01:00 app_python: fixed realloc size for local buf variables - removed unreachable code --- Modified: modules/app_python/apy_kemi.c Modified: modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/64d3d1de13666277e3b1bd707e05880… Patch: https://github.com/kamailio/kamailio/commit/64d3d1de13666277e3b1bd707e05880… --- diff --git a/modules/app_python/apy_kemi.c b/modules/app_python/apy_kemi.c index 431b0d9..fd4ed7f 100644 --- a/modules/app_python/apy_kemi.c +++ b/modules/app_python/apy_kemi.c @@ -542,8 +542,6 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) fname.len, fname.s); return sr_kemi_apy_return_false(); } - - return sr_kemi_apy_return_false(); } /** diff --git a/modules/app_python/python_support.c b/modules/app_python/python_support.c index fd5a4a6..28f92da 100644 --- a/modules/app_python/python_support.c +++ b/modules/app_python/python_support.c @@ -114,7 +114,7 @@ void python_handle_exception(const char *fmt, ...) msglen = strlen(msg); buflen += ++msglen; - buf = (char *)pkg_realloc(buf, buflen * sizeof(char *)); + buf = (char *)pkg_realloc(buf, buflen * sizeof(char)); if (!buf) { LM_ERR("Can't allocate memory (%lu bytes), pkg_realloc() has failed."

1 0

git:master:27ba383b: sipcapture: initialize variable to get rid of compile warning
by Daniel-Constantin Mierla 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: 27ba383b5aaabd84c25653a887738d06532fcf9f URL: https://github.com/kamailio/kamailio/commit/27ba383b5aaabd84c25653a887738d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:19:56+01:00 sipcapture: initialize variable to get rid of compile warning --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/27ba383b5aaabd84c25653a887738d0… Patch: https://github.com/kamailio/kamailio/commit/27ba383b5aaabd84c25653a887738d0… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 955e036..19ffbe6 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2496,7 +2496,7 @@ static int report_capture(struct sip_msg *msg, str *_table, str* _corr, str *_d struct timezone tz; char tmp_node[100]; time_t epoch_time_as_time_t; - str corrtmp, tmp; + str corrtmp = STR_NULL, tmp; _capture_mode_data_t *c = NULL;

1 0

git:master:d4f3c96c: mi_datagram: safety check so the length of mi socket doesn't result in overflow
by Daniel-Constantin Mierla 01 Nov '16

01 Nov '16

Module: kamailio Branch: master Commit: d4f3c96cdf2efc8db8fa115a35f7ea9545ea4c9f URL: https://github.com/kamailio/kamailio/commit/d4f3c96cdf2efc8db8fa115a35f7ea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:14:41+01:00 mi_datagram: safety check so the length of mi socket doesn't result in overflow --- Modified: modules/mi_datagram/mi_datagram.c --- Diff: https://github.com/kamailio/kamailio/commit/d4f3c96cdf2efc8db8fa115a35f7ea9… Patch: https://github.com/kamailio/kamailio/commit/d4f3c96cdf2efc8db8fa115a35f7ea9… --- diff --git a/modules/mi_datagram/mi_datagram.c b/modules/mi_datagram/mi_datagram.c index 3260420..a06e2f2 100644 --- a/modules/mi_datagram/mi_datagram.c +++ b/modules/mi_datagram/mi_datagram.c @@ -200,7 +200,7 @@ static int mi_mod_init(void) LM_ERR("invalid port number; must be in [1024,%d]\n",MAX_NB_PORT); return -1; } - + if(! (host = resolvehost(host_s)) ) { LM_ERR("failed to resolve %s\n", host_s); return -1; @@ -212,10 +212,10 @@ static int mi_mod_init(void) } mi_socket_domain = host->h_addrtype; goto done; - } + } /* in case of a Unix socket*/ LM_DBG("we have an UNIX socket\n"); - + n=stat(mi_socket, &filestat); if( n==0) { LM_INFO("the socket %s already exists, trying to delete it...\n", mi_socket); @@ -235,14 +235,14 @@ static int mi_mod_init(void) LM_WARN("cannot specify mi_unix_socket_mode = 0, forcing it to rw-------\n"); mi_unix_socket_mode = S_IRUSR| S_IWUSR; } - + if (mi_unix_socket_uid_s) { if (user2uid(&mi_unix_socket_uid, &mi_unix_socket_gid, mi_unix_socket_uid_s)<0) { LM_ERR("bad user name %s\n", mi_unix_socket_uid_s); return -1; } } - + if (mi_unix_socket_gid_s) { if (group2gid(&mi_unix_socket_gid, mi_unix_socket_gid_s)<0) { LM_ERR("bad group name %s\n", mi_unix_socket_gid_s); @@ -252,7 +252,11 @@ static int mi_mod_init(void) /*create the unix socket address*/ mi_dtgram_addr.unix_addr.sun_family = AF_LOCAL; - memcpy( mi_dtgram_addr.unix_addr.sun_path, mi_socket, strlen(mi_socket)); + if(strlen(mi_socket)>=sizeof(mi_dtgram_addr.unix_addr.sun_path)-1) { + LM_ERR("mi socket path is too long\n"); + return -1; + } + memcpy(mi_dtgram_addr.unix_addr.sun_path, mi_socket, strlen(mi_socket)); done: /* add space for extra processes */ @@ -369,7 +373,7 @@ static int mi_destroy(void) if (n==0) { if(config_check==0) { if (unlink(mi_socket)<0){ - LM_ERR("cannot delete the socket (%s): %s\n", + LM_ERR("cannot delete the socket (%s): %s\n", mi_socket, strerror(errno)); goto error; }

1 0