sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
303 discussions

git:master:abf9f244: core: main - checking of optarg for covering all unixes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: abf9f244a96a9c2112036af24a1cc3435b6be41d URL: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T09:34:29+02:00 core: main - checking of optarg for covering all unixes --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… Patch: https://github.com/kamailio/kamailio/commit/abf9f244a96a9c2112036af24a1cc34… --- diff --git a/src/main.c b/src/main.c index 44fb940393..405b442158 100644 --- a/src/main.c +++ b/src/main.c @@ -2095,6 +2095,10 @@ int main(int argc, char** argv) ksr_cfg_print_mode = 1; break; case KARGOPTVAL+10: + if (optarg == NULL) { + fprintf(stderr, "bad atexit value\n"); + goto error; + } if(optarg[0]=='y' || optarg[0]=='1') { ksr_atexit_mode = 1; } else if(optarg[0]=='n' || optarg[0]=='0') { @@ -2234,6 +2238,10 @@ int main(int argc, char** argv) }; break; case 'u': + if (optarg == NULL) { + fprintf(stderr, "bad -u parameter\n"); + goto error; + } /* user needed for possible shm. pre-init */ user=optarg; break; @@ -2293,6 +2301,10 @@ int main(int argc, char** argv) /* long options */ case KARGOPTVAL: + if (optarg == NULL) { + fprintf(stderr, "bad alias parameter\n"); + goto error; + } if(parse_phostport(optarg, &tmp, &tmp_len, &port, &proto)!=0) { fprintf(stderr, "Invalid alias value '%s'\n", optarg); @@ -2304,24 +2316,40 @@ int main(int argc, char** argv) } break; case KARGOPTVAL+1: + if (optarg == NULL) { + fprintf(stderr, "bad subst parameter\n"); + goto error; + } if(pp_subst_add(optarg)<0) { LM_ERR("failed to add subst expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+2: + if (optarg == NULL) { + fprintf(stderr, "bad substdef parameter\n"); + goto error; + } if(pp_substdef_add(optarg, 0)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+3: + if (optarg == NULL) { + fprintf(stderr, "bad substdefs parameter\n"); + goto error; + } if(pp_substdef_add(optarg, 1)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; } break; case KARGOPTVAL+4: + if (optarg == NULL) { + fprintf(stderr, "bad server if parameter\n"); + goto error; + } server_id=(int)strtol(optarg, &tmp, 10); if ((tmp==0) || (*tmp)){ LM_ERR("bad server_id value: %s\n", optarg); @@ -2383,12 +2411,20 @@ int main(int argc, char** argv) while((c=getopt_long(argc, argv, options, long_options, &option_index))!=-1) { switch(c) { case KARGOPTVAL+5: + if (optarg == NULL) { + fprintf(stderr, "bad load module parameter\n"); + goto error; + } if (load_module(optarg)!=0) { LM_ERR("failed to load the module: %s\n", optarg); goto error; } break; case KARGOPTVAL+6: + if (optarg == NULL) { + fprintf(stderr, "bad modparam parameter\n"); + goto error; + } if(set_mod_param_serialized(optarg) < 0) { LM_ERR("failed to set modparam: %s\n", optarg); goto error;

3 years, 7 months

New Module Hash Table

by Dave Greeko

Dear All, I've successfully created a Kamailio module(thanks to the concise documentation.) My logic requires a synchronized access to an in-memory-only hash table from multiple Kamailio child-processes. Here is what I am trying to do: 1. Create a hash table(s) upon module init 2. Insert entries from any child process (based on business logic) 3. Retrieve entries from any child process with proper locking 4. Delete entries from any child process I would really appreciate it if anyone can point me to some samples where I can incorporate into my module the hash table functionalities that already exists in kamailio tree instead of doing my own because I would like to take advantage of Kamailio's memory managers(shared and private). Best Regards, Dave

3 years, 7 months

[CRON] Still Failing: dbank888/kamailio#131 (master - 491e19e)

by Travis CI

Build Update for dbank888/kamailio ------------------------------------- Build: #131 Status: Still Failing Duration: 5 mins and 30 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/github/dbank888/kamailio/builds/766405168?utm_medium=… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 7 months

git:master:42d90d36: rr: conditions adjustmets for append from tag in record route preset

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 42d90d3665256c3d38945193b0a14ad199221bc6 URL: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T13:19:17+02:00 rr: conditions adjustmets for append from tag in record route preset --- Modified: src/modules/rr/record.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… Patch: https://github.com/kamailio/kamailio/commit/42d90d3665256c3d38945193b0a14ad… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 083955803f..8624ee5e13 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -570,7 +570,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) hdr.len += user.len + 1; /* @ */ hdr.len += _data->len; - if (append_fromtag && from->tag_value.len) { + if (append_fromtag && from && from->tag_value.len) { hdr.len += RR_FROMTAG_LEN + from->tag_value.len; } @@ -612,7 +612,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) memcpy(p, _data->s, _data->len); p += _data->len; - if (append_fromtag && from->tag_value.len) { + if (append_fromtag && from && from->tag_value.len) { memcpy(p, RR_FROMTAG, RR_FROMTAG_LEN); p += RR_FROMTAG_LEN; memcpy(p, from->tag_value.s, from->tag_value.len); diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index d9cfedfaf9..67828d5d2d 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -253,7 +253,6 @@ static int direction_fixup(void** param, int param_no) return E_CFG; } if (param_no==1) { - n = 0; s = (char*) *param; if ( strcasecmp(s,"downstream")==0 ) { n = RR_FLOW_DOWNSTREAM;

3 years, 7 months

git:master:f33abd5e: nat_traversal: check parameter for send_keepalive()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f33abd5e2d5978ba9e6e8a48066b0daff70c0b3b URL: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T12:05:07+02:00 nat_traversal: check parameter for send_keepalive() --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… Patch: https://github.com/kamailio/kamailio/commit/f33abd5e2d5978ba9e6e8a48066b0da… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 27dbf2736d..4cfe8d4018 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1554,6 +1554,11 @@ static void send_keepalive(NAT_Contact *contact) unsigned short lport; char lproto; + if(contact==NULL || contact->socket==NULL) { + LM_ERR("invalid parameters\n"); + return; + } + if(keepalive_params.from == NULL) { if(contact->socket != last_socket) { memcpy(from_ip, contact->socket->address_str.s,

3 years, 7 months

git:master:7ea3b97c: core: dns cache - safety checks for rdata field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7ea3b97c8acf8b623563b7a9fbf4ba23ea3e9170 URL: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:37:08+02:00 core: dns cache - safety checks for rdata field --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… Patch: https://github.com/kamailio/kamailio/commit/7ea3b97c8acf8b623563b7a9fbf4ba2… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 9a63a5bd21..7dbde8f378 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -4012,7 +4012,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, size = e->total_size; if (rdata_size) { /* we have to extend the entry */ - rounded_size = ROUND_POINTER(size); /* size may not have been + rounded_size = ROUND_POINTER(size); /* size may not have been rounded previously */ switch (e->type) { case T_A: @@ -4064,7 +4064,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, /* fix the pointers inside the rr structures */ last_rr = NULL; for (rr=new->rr_lst; rr; rr=rr->next) { - rr->rdata = (void*)translate_pointer((char*)new, (char*)e, + rr->rdata = (void*)translate_pointer((char*)new, (char*)e, (char*)rr->rdata); if (rr->next) rr->next = (struct dns_rr*)translate_pointer((char*)new, (char*)e, @@ -4074,6 +4074,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, switch(e->type){ case T_NAPTR: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the NAPTR rdata stucture */ ((struct naptr_rdata*)rr->rdata)->flags = translate_pointer((char*)new, (char*)e, @@ -4092,6 +4096,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, ((struct naptr_rdata*)rr->rdata)->repl); break; case T_TXT: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the TXT structure */ for (i=0; i<((struct txt_rdata*)rr->rdata)->cstr_no; i++){ ((struct txt_rdata*)rr->rdata)->txt[i].cstr= @@ -4100,6 +4108,10 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, } break; case T_EBL: + if(rr->rdata==NULL) { + LM_WARN("null rdata filed for type: %u\n", e->type); + break; + } /* there are pointers inside the EBL structure */ ((struct ebl_rdata*)rr->rdata)->separator = translate_pointer((char*)new, (char*)e, @@ -4140,7 +4152,7 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, * If there is an existing record with the same name and value * (ip address in case of A/AAAA record, name in case of SRV record) * only the remaining fields are updated. - * + * * Note that permanent records cannot be overwritten unless * the new record is also permanent. A permanent record * completely replaces a non-permanent one.

3 years, 7 months

git:master:c200d2e9: rtpengine: reworked condition around locking for easier pairing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c200d2e9109a5581491bebd91c30162716b0f4fa URL: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:54:33+02:00 rtpengine: reworked condition around locking for easier pairing - inside rtpengine_hash_table_insert() --- Modified: src/modules/rtpengine/rtpengine_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… Patch: https://github.com/kamailio/kamailio/commit/c200d2e9109a5581491bebd91c30162… --- diff --git a/src/modules/rtpengine/rtpengine_hash.c b/src/modules/rtpengine/rtpengine_hash.c index eda947fe26..770bf494e0 100644 --- a/src/modules/rtpengine/rtpengine_hash.c +++ b/src/modules/rtpengine/rtpengine_hash.c @@ -221,16 +221,16 @@ int rtpengine_hash_table_insert(str callid, str viabranch, struct rtpengine_hash // get entry list hash_index = str_hash(callid); entry = rtpengine_hash_table->row_entry_list[hash_index]; - last_entry = entry; - // lock - if (rtpengine_hash_table->row_locks[hash_index]) { - lock_get(rtpengine_hash_table->row_locks[hash_index]); - } else { - LM_ERR("NULL rtpengine_hash_table->row_locks[%d]\n", hash_index); + if (entry==NULL || rtpengine_hash_table->row_locks[hash_index]==NULL) { + LM_ERR("NULL entry or lock for hash table slot[%d]\n", hash_index); return 0; } + last_entry = entry; + // lock + lock_get(rtpengine_hash_table->row_locks[hash_index]); + while (entry) { // if found, don't add new entry if (str_equal(entry->callid, new_entry->callid) &&

3 years, 7 months

git:master:9c7a509f: tm: t_fifo.c - free app in case of error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c7a509f7189de8ce600a97b7c1c5f9e4f5afdb1 URL: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:25:05+02:00 tm: t_fifo.c - free app in case of error --- Modified: src/modules/tm/t_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… Patch: https://github.com/kamailio/kamailio/commit/9c7a509f7189de8ce600a97b7c1c5f9… --- diff --git a/src/modules/tm/t_fifo.c b/src/modules/tm/t_fifo.c index cd3bb296ab..ea4e96b99a 100644 --- a/src/modules/tm/t_fifo.c +++ b/src/modules/tm/t_fifo.c @@ -214,6 +214,7 @@ int parse_tw_append( modparam_t type, void* val) app->name.s = (char*)pkg_malloc( foo.len+1 ); if (app->name.s==0) { PKG_MEM_ERROR; + pkg_free(app); goto error; } memcpy( app->name.s, foo.s, foo.len);

3 years, 7 months

git:master:1737e944: core: parse headers - check if anything was parsed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1737e9443d6617350c5e6044aef07be565a345d0 URL: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T11:20:32+02:00 core: parse headers - check if anything was parsed --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… Patch: https://github.com/kamailio/kamailio/commit/1737e9443d6617350c5e6044aef07be… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 4efb875d85..795c96a350 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -316,13 +316,14 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int if (unlikely(next)) { orig_flag = msg->parsed_flag; msg->parsed_flag &= ~flags; - }else + } else { orig_flag=0; + } #ifdef EXTRA_DEBUG DBG("flags=%llx\n", (unsigned long long)flags); #endif - while( tmp<end && (flags & msg->parsed_flag) != flags){ + while(tmp<end && (flags & msg->parsed_flag) != flags) { prefetch_loc_r(tmp+64, 1); hf=pkg_malloc(sizeof(struct hdr_field)); if (unlikely(hf==0)){ @@ -619,18 +620,25 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int #endif tmp=rest; } + skip: msg->unparsed=tmp; + if(msg->headers==NULL) { + /* nothing parsed - invalid input sip message */ + goto error1; + } /* restore original flags */ msg->parsed_flag |= orig_flag; return 0; error: - ser_error=E_BAD_REQ; if (hf) { clean_hdr_field(hf); pkg_free(hf); } + +error1: + ser_error=E_BAD_REQ; /* restore original flags */ msg->parsed_flag |= orig_flag; return -1;

3 years, 7 months

git:master:74fa6c55: core: main - coherent behaviour for fix_cfg_file()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 74fa6c5570d6394af8c5352bd37e21e970f1575c URL: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:38:48+02:00 core: main - coherent behaviour for fix_cfg_file() - duplicate to build the output always, safer not to try to change the static string defined via macro at runtime --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… Patch: https://github.com/kamailio/kamailio/commit/74fa6c5570d6394af8c5352bd37e21e… --- diff --git a/src/main.c b/src/main.c index 4dac30179c..44fb940393 100644 --- a/src/main.c +++ b/src/main.c @@ -1260,14 +1260,15 @@ static struct name_lst* parse_phostport_mh(char* s, char** host, int* hlen, -/** Update \c cfg_file variable to contain full pathname. The function updates +/** Update \c cfg_file variable to contain full pathname or '-' (for stdin) + * allocated in system memory. The function updates * the value of \c cfg_file global variable to contain full absolute pathname - * to the main configuration file of SER. The function uses CFG_FILE macro to + * to the main configuration file. The function uses CFG_FILE macro to * determine the default path to the configuration file if the user did not * specify one using the command line option. If \c cfg_file contains an - * absolute pathname then it is used unmodified, if it contains a relative + * absolute pathname then it is cloned unmodified, if it contains a relative * pathanme than the value returned by \c getcwd function will be added at the - * beginning. This function must be run before SER changes its current working + * beginning. This function must be run before changing its current working * directory to / (in daemon mode). * @return Zero on success, negative number * on error. @@ -1276,34 +1277,55 @@ int fix_cfg_file(void) { char* res = NULL; size_t max_len, cwd_len, cfg_len; - + if (cfg_file == NULL) cfg_file = CFG_FILE; - if (cfg_file[0] == '/') return 0; - if (cfg_file[0] == '-' && strlen(cfg_file)==1) return 0; - + if (cfg_file[0] == '/') { + cfg_len = strlen(cfg_file); + if(cfg_len < 2) { + /* do not accept only '/' */ + fprintf(stderr, "ERROR: invalid cfg file value\n"); + return -1; + } + if ((res = malloc(cfg_len + 1)) == NULL) goto error; + memcpy(res, cfg_file, cfg_len); + cfg_file[cfg_len] = 0; + cfg_file = res; + return 0; + } + if (cfg_file[0] == '-') { + cfg_len = strlen(cfg_file); + if(cfg_len == 1) { + if ((res = malloc(2)) == NULL) goto error; + res[0] = '-'; + res[1] = '\0'; + cfg_file = res; + return 0; + } + } + /* cfg_file contains a relative pathname, get the current * working directory and add it at the beginning */ cfg_len = strlen(cfg_file); - + max_len = pathmax(); if ((res = malloc(max_len)) == NULL) goto error; - + if (getcwd(res, max_len) == NULL) goto error; cwd_len = strlen(res); - + /* Make sure that the buffer is big enough */ if (cwd_len + 1 + cfg_len >= max_len) goto error; - + res[cwd_len] = '/'; memcpy(res + cwd_len + 1, cfg_file, cfg_len); - + res[cwd_len + 1 + cfg_len] = '\0'; /* Add terminating zero */ cfg_file = res; return 0; - + error: - fprintf(stderr, "ERROR: Unable to fix cfg_file to contain full pathname\n"); + fprintf(stderr, "ERROR: Unable to fix cfg file to contain full pathname\n"); if (res) free(res); return -1; }

3 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021