sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
321 discussions

git:master:4fe95ab7: core: parser - assign ids for more methods
by Daniel-Constantin Mierla 04 Jun '18

04 Jun '18

Module: kamailio Branch: master Commit: 4fe95ab7db7f3fca83578bb7e2b2f478828793d3 URL: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-04T08:24:29+02:00 core: parser - assign ids for more methods - KDMQ and HTTP method types GET, POST, PUT and DELETE --- Modified: src/core/parser/msg_parser.h Modified: src/core/parser/parse_methods.c --- Diff: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… Patch: https://github.com/kamailio/kamailio/commit/4fe95ab7db7f3fca83578bb7e2b2f47… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 9d9d73a36e..5922cfc1cc 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -74,7 +74,12 @@ typedef enum request_method { METHOD_UPDATE=2048, /*!< 2048 - 2^11 */ METHOD_REFER=4096, /*!< 4096 - 2^12 */ METHOD_PUBLISH=8192, /*!< 8192 - 2^13 */ - METHOD_OTHER=16384 /*!< 16384 - 2^14 */ + METHOD_KDMQ=16384, /*!< 16384 - 2^14 */ + METHOD_GET=32768, /*!< 32768 - 2^15 */ + METHOD_POST=65536, /*!< 65536 - 2^16 */ + METHOD_PUT=131072, /*!< 131072 - 2^17 */ + METHOD_DELETE=262144, /*!< 262144 - 2^18 */ + METHOD_OTHER=524288 /*!< 524288 - 2^19 */ } request_method_t; #define FL_FORCE_RPORT (1 << 0) /*!< force rport */ diff --git a/src/core/parser/parse_methods.c b/src/core/parser/parse_methods.c index de36d602c1..5823a48a10 100644 --- a/src/core/parser/parse_methods.c +++ b/src/core/parser/parse_methods.c @@ -65,7 +65,7 @@ int parse_method_name(const str* const s, enum request_method* const method) } switch ((s->s)[0]) { - /* ordered after probability of aparition on a normal proxy */ + /* ordered after probability of apparition on a normal proxy */ case 'R': case 'r': if (likely((s->len == 8) &&

1 0

git:5.0:f07dabff: core: improve header safe guards for Via handling
by Henning Westerholt 03 Jun '18

03 Jun '18

Module: kamailio Branch: 5.0 Commit: f07dabffef98c7088cdbc2bd695a4ae7a241b159 URL: https://github.com/kamailio/kamailio/commit/f07dabffef98c7088cdbc2bd695a4ae… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-03T21:03:15+02:00 core: improve header safe guards for Via handling (cherry picked from commit ad68e402ece8089f133c10de6ce319f9e28c0692) --- Modified: src/core/crc.c Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/f07dabffef98c7088cdbc2bd695a4ae… Patch: https://github.com/kamailio/kamailio/commit/f07dabffef98c7088cdbc2bd695a4ae… --- diff --git a/src/core/crc.c b/src/core/crc.c index 4628463245..23b2876ecf 100644 --- a/src/core/crc.c +++ b/src/core/crc.c @@ -231,6 +231,8 @@ void crcitt_string_array( char *dst, str src[], int size ) ccitt = 0xFFFF; str_len=CRC16_LEN; for (i=0; i<size; i++ ) { + /* invalid str with positive length and null char pointer */ + if( unlikely(src[i].s==NULL)) break; c=src[i].s; len=src[i].len; while(len) { diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 201e3a5e1d..58978f958c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -168,12 +168,17 @@ static int check_via_address(struct ip_addr* ip, str *name, (name->s[name->len-1]==']')&& (strncasecmp(name->s+1, s, len)==0)) ) - ) + ) { return 0; - else - + } + else { + if (unlikely(name->s==NULL)) { + LM_CRIT("invalid Via host name\n"); + return -1; + } if (strncmp(name->s, s, name->len)==0) return 0; + } }else{ LM_CRIT("could not convert ip address\n"); return -1;

1 0

git:5.1:d67b2f98: core: improve header safe guards for Via handling
by Henning Westerholt 03 Jun '18

03 Jun '18

Module: kamailio Branch: 5.1 Commit: d67b2f9874ca23bd69f18df71b8f53b1b6151f6d URL: https://github.com/kamailio/kamailio/commit/d67b2f9874ca23bd69f18df71b8f53b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-03T21:02:35+02:00 core: improve header safe guards for Via handling (cherry picked from commit ad68e402ece8089f133c10de6ce319f9e28c0692) --- Modified: src/core/crc.c Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/d67b2f9874ca23bd69f18df71b8f53b… Patch: https://github.com/kamailio/kamailio/commit/d67b2f9874ca23bd69f18df71b8f53b… --- diff --git a/src/core/crc.c b/src/core/crc.c index 4628463245..23b2876ecf 100644 --- a/src/core/crc.c +++ b/src/core/crc.c @@ -231,6 +231,8 @@ void crcitt_string_array( char *dst, str src[], int size ) ccitt = 0xFFFF; str_len=CRC16_LEN; for (i=0; i<size; i++ ) { + /* invalid str with positive length and null char pointer */ + if( unlikely(src[i].s==NULL)) break; c=src[i].s; len=src[i].len; while(len) { diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 201e3a5e1d..58978f958c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -168,12 +168,17 @@ static int check_via_address(struct ip_addr* ip, str *name, (name->s[name->len-1]==']')&& (strncasecmp(name->s+1, s, len)==0)) ) - ) + ) { return 0; - else - + } + else { + if (unlikely(name->s==NULL)) { + LM_CRIT("invalid Via host name\n"); + return -1; + } if (strncmp(name->s, s, name->len)==0) return 0; + } }else{ LM_CRIT("could not convert ip address\n"); return -1;

1 0

git:master:ad68e402: core: improve header safe guards for Via handling
by Henning Westerholt 03 Jun '18

03 Jun '18

Module: kamailio Branch: master Commit: ad68e402ece8089f133c10de6ce319f9e28c0692 URL: https://github.com/kamailio/kamailio/commit/ad68e402ece8089f133c10de6ce319f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-03T20:59:32+02:00 core: improve header safe guards for Via handling --- Modified: src/core/crc.c Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/ad68e402ece8089f133c10de6ce319f… Patch: https://github.com/kamailio/kamailio/commit/ad68e402ece8089f133c10de6ce319f… --- diff --git a/src/core/crc.c b/src/core/crc.c index 4628463245..23b2876ecf 100644 --- a/src/core/crc.c +++ b/src/core/crc.c @@ -231,6 +231,8 @@ void crcitt_string_array( char *dst, str src[], int size ) ccitt = 0xFFFF; str_len=CRC16_LEN; for (i=0; i<size; i++ ) { + /* invalid str with positive length and null char pointer */ + if( unlikely(src[i].s==NULL)) break; c=src[i].s; len=src[i].len; while(len) { diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4dd648e874..2e649ac6c6 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -170,12 +170,17 @@ static int check_via_address(struct ip_addr* ip, str *name, (name->s[name->len-1]==']')&& (strncasecmp(name->s+1, s, len)==0)) ) - ) + ) { return 0; - else - + } + else { + if (unlikely(name->s==NULL)) { + LM_CRIT("invalid Via host name\n"); + return -1; + } if (strncmp(name->s, s, name->len)==0) return 0; + } }else{ LM_CRIT("could not convert ip address\n"); return -1;

1 0

git:master:07f710bd: core: small formatting fix - if has no brackets
by Henning Westerholt 03 Jun '18

03 Jun '18

Module: kamailio Branch: master Commit: 07f710bdbbf99ff2bc75218b6d972481eaaba1e4 URL: https://github.com/kamailio/kamailio/commit/07f710bdbbf99ff2bc75218b6d97248… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-03T19:01:26+02:00 core: small formatting fix - if has no brackets --- Modified: src/core/tags.h --- Diff: https://github.com/kamailio/kamailio/commit/07f710bdbbf99ff2bc75218b6d97248… Patch: https://github.com/kamailio/kamailio/commit/07f710bdbbf99ff2bc75218b6d97248… --- diff --git a/src/core/tags.h b/src/core/tags.h index 192fdc3b1d..ddfdaae411 100644 --- a/src/core/tags.h +++ b/src/core/tags.h @@ -52,7 +52,7 @@ static inline void calc_crc_suffix( struct sip_msg *msg, char *tag_suffix) suffix_source[1]=msg->via1->port_str; if (msg->via1->branch) suffix_source[ss_nr++]=msg->via1->branch->value; - crcitt_string_array( tag_suffix, suffix_source, ss_nr ); + crcitt_string_array( tag_suffix, suffix_source, ss_nr ); } static void inline init_tags( char *tag, char **suffix,

1 0

[kamailio/kamailio] Bugfix issue 1168 - Unregistered Terminating Services (PSI) Configured at HSS (#1538)
by Christoph VALENTIN 02 Jun '18

02 Jun '18

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally against Version 5.1.0 - [x] Related to issue #1168 (replace XXXX with an open issue number) #### Description  The ims_isc module cannot cope with the fact that asynchronous Response from HSS (Diameter SAA message) is received as "FAILURE_ROUTE". ims_isc module erroneously assumes, it is an answer from the AS. Change: added a "firstflag", which makes a difference between first call (SAA from HSS) and subsequent call (FAILURE ROUTE from AS). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1538 -- Commit Summary -- * ims_isc: initial fix of issue #1168 * ims_isc: implement regexec for isc_checker_find() for wildcarded PSIs * ims_isc: fix: use null terminated strings for regex functions * ims_isc: delete regexec for wildcarded PSIs from isc_checker_find() * ims_isc: remove KCCVICT tagging * Merge branch 'devel_rewi_psi' into bugfix_issue_1168 -- File Changes -- M src/modules/ims_isc/ims_isc_mod.c (9) M src/modules/ims_isc/isc.c (4) M src/modules/ims_isc/isc.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1538.patch https://github.com/kamailio/kamailio/pull/1538.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1538

4 10

git:master:e7ee14f0: topos: fix warning about uninitialized variable
by Henning Westerholt 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: e7ee14f0d168c36c62cd6bef58334db1f0871470 URL: https://github.com/kamailio/kamailio/commit/e7ee14f0d168c36c62cd6bef58334db… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-01T22:46:37+02:00 topos: fix warning about uninitialized variable --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e7ee14f0d168c36c62cd6bef58334db… Patch: https://github.com/kamailio/kamailio/commit/e7ee14f0d168c36c62cd6bef58334db… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index da141888c3..66169f7b02 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -371,7 +371,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) */ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) { - int ret; + int ret = -1; /* error if dialog == 0 */ str suid; if(dialog==0) {

1 0

git:master:5aa636bc: ss7ops: fix warning about uninitialized variable
by Henning Westerholt 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 5aa636bc94728db1284ac90e922d0a222d20d7c5 URL: https://github.com/kamailio/kamailio/commit/5aa636bc94728db1284ac90e922d0a2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-01T22:46:23+02:00 ss7ops: fix warning about uninitialized variable --- Modified: src/modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5aa636bc94728db1284ac90e922d0a2… Patch: https://github.com/kamailio/kamailio/commit/5aa636bc94728db1284ac90e922d0a2… --- diff --git a/src/modules/ss7ops/ss7ops_mod.c b/src/modules/ss7ops/ss7ops_mod.c index 9a6b000e1b..54017381f4 100644 --- a/src/modules/ss7ops/ss7ops_mod.c +++ b/src/modules/ss7ops/ss7ops_mod.c @@ -327,6 +327,7 @@ static int ki_isup_to_json(sip_msg_t *_m, int proto) srjson_DeleteDoc(isup_json); isup_last = NULL; isup_json = NULL; + mtp_type = 0; data = fetch_payload(_m, "$var(payload)", &int_len); if (!data) @@ -744,4 +745,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_ss7ops_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:42265d01: sipt: fix warning about uninitialized variable
by Henning Westerholt 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: 42265d011f40f4f8ec90799489db120b156ef6e1 URL: https://github.com/kamailio/kamailio/commit/42265d011f40f4f8ec90799489db120… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-01T22:46:03+02:00 sipt: fix warning about uninitialized variable --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/42265d011f40f4f8ec90799489db120… Patch: https://github.com/kamailio/kamailio/commit/42265d011f40f4f8ec90799489db120… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index 8c7f3f03a8..a1f0b348d1 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -689,7 +689,7 @@ static int sipt_destination2(struct sip_msg *msg, char *_destination, char *_hop unsigned int int_nai = 0; str2int(nai, &int_nai); str * terminator = (str*)_terminator; - unsigned int int_terminator; + unsigned int int_terminator = 0; /* if the str2int later fail */ str2int(terminator, &int_terminator); str * destination = (str*)_destination; struct sdp_mangler mangle;

1 0

git:master:b07d4d0e: cfgutils: fix warning about uninitialized variable
by Henning Westerholt 01 Jun '18

01 Jun '18

Module: kamailio Branch: master Commit: b07d4d0e5c9c5db07d4d0806e6a1540b73b6c333 URL: https://github.com/kamailio/kamailio/commit/b07d4d0e5c9c5db07d4d0806e6a1540… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-01T22:45:26+02:00 cfgutils: fix warning about uninitialized variable --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/b07d4d0e5c9c5db07d4d0806e6a1540… Patch: https://github.com/kamailio/kamailio/commit/b07d4d0e5c9c5db07d4d0806e6a1540… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index c0872ec33c..b2fe2bd4bd 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -208,7 +208,7 @@ struct module_exports exports = { /**************************** fixup functions ******************************/ static int fixup_prob( void** param, int param_no) { - unsigned int myint; + unsigned int myint = 1000; /* stop if str2int later fail */ str param_str; /* we only fix the parameter #1 */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018