- sr-dev - kamailio.org

git:master:356fba18: lost: new features, attributes and a new function to dereference location
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: 356fba18ac5eef25e67a2357b4cdcd9255810094 URL: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-15T14:18:57+01:00 lost: new features, attributes and a new function to dereference location - features: LoST redirect, dynamic HELD url resolving (#2574), LoST NAPTR, POST request to dereference loation - attributes: reponse_time (-1:emergencyDispatch, 0:emergencyRouting, >0[ms]); post_request (POST method to dereference location #2641); recursion (yes/no); location_profile (PIDF/LO profile selection: first/last/geo/civic); verbose (detailed LoST response as log INFO); geoheader_type (filter schema: any/cid/http/https); geoheader_order (first/last) - function: lost_held_dereference (specific function to dereference location using POST method); attributes are url (r), resp.-time (r), resp.-type (r), pidf (r/w) and error (r/w) - general: The extension of the module allows dynamic querying of LIS/HELD and LOST services via NAPTR lookup. In the case of LOST, a redirect response is evaluated. In case a lost_held_request (used to connect to a LIS via POST or GET) is passed with an empty string ("") for the connection parameter, then P-A-I or From header value hostnames are used for NAPTR lookup to get a corresponding service. --- Added: src/modules/lost/naptr.c Added: src/modules/lost/naptr.h Added: src/modules/lost/response.c Added: src/modules/lost/response.h Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9… Patch: https://github.com/kamailio/kamailio/commit/356fba18ac5eef25e67a2357b4cdcd9…

1 0

git:master:ffb0a862: lost: bug-fix due to a code formatting error
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

Module: kamailio Branch: master Commit: ffb0a8624af952e619ddc5f6fa29c6655f17d4c9 URL: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-03-16T10:29:04+01:00 lost: bug-fix due to a code formatting error --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… Patch: https://github.com/kamailio/kamailio/commit/ffb0a8624af952e619ddc5f6fa29c66… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index 8f56a61816..7aef5ea9d3 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -442,7 +442,10 @@ p_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) && (hf->name.len == LOST_GEOLOC_HEADER_SIZE - 2)) { /* possible hit */ if(strncasecmp(hf->name.s, LOST_GEOLOC_HEADER, - LOST_GEOLOC_HEADER_SIZE) == 0) { + LOST_GEOLOC_HEADER_SIZE) == 0) { + + hdr.s = hf->body.s; + hdr.len = hf->body.len; LM_DBG("found geolocation header [%.*s]\n", hdr.len, hdr.s);

1 0

xflag losing state on serial forking
by David Escartin 09 Apr '21

09 Apr '21

Dear all i think i have noticed a wrong behaviour with xflags. When they are set in a failure_route and a t_relay is done after that to a destination, its state is lost in the next on_reply route. This doesn't happen with regular transaction flags, and it doesn't happen with xflags either when xflag is set inside an onreply_route. We have seen it on versions 5.3 and 5.4 Could you please confirm this? thanks a lot regards david escartin -- [image: Logo] David Escartín Almudévar VoIP/Switch Engineer descartin(a)sonoc.io *SONOC* C/ Josefa Amar y Borbón, 10, 4ª · 50001 Zaragoza, España Tlf: +34 917019888 · www.sonoc.io

1 2

git:master:abf9f244: core: main - checking of optarg for covering all unixes
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

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;

1 0

New Module Hash Table
by Dave Greeko 09 Apr '21

09 Apr '21

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

1 0

[CRON] Still Failing: dbank888/kamailio#131 (master - 491e19e)
by Travis CI 08 Apr '21

08 Apr '21

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.

1 0

git:master:42d90d36: rr: conditions adjustmets for append from tag in record route preset
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

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;

1 0

git:master:f33abd5e: nat_traversal: check parameter for send_keepalive()
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

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,

1 0

git:master:c200d2e9: rtpengine: reworked condition around locking for easier pairing
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

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) &&

1 0

git:master:7ea3b97c: core: dns cache - safety checks for rdata field
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

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.

1 0

git:master:1737e944: core: parse headers - check if anything was parsed
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

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;

1 0

git:master:9c7a509f: tm: t_fifo.c - free app in case of error
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

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);

1 0

git:master:74fa6c55: core: main - coherent behaviour for fix_cfg_file()
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

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; }

1 0

git:master:563c6f69: core: cfg.lex - free after log message
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 563c6f69aef22a90fc7870398fcfbd4242e33779 URL: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:36:02+02:00 core: cfg.lex - free after log message --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… Patch: https://github.com/kamailio/kamailio/commit/563c6f69aef22a90fc7870398fcfbd4… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d36fc72b54..2b90fbb66a 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1802,13 +1802,14 @@ static int sr_push_yy_state(char *fin, int mode) fp = fopen(newf, "r" ); if ( fp==NULL ) { - pkg_free(newf); if(mode==0) { LM_CRIT("cannot open included file: %s (%s)\n", fbuf, newf); + pkg_free(newf); return -1; } else { LM_DBG("importing file ignored: %s (%s)\n", fbuf, newf); + pkg_free(newf); return 0; } }

1 0

git:master:7dd643a8: dlgs: safety check for accessing next field
by Daniel-Constantin Mierla 08 Apr '21

08 Apr '21

Module: kamailio Branch: master Commit: 7dd643a88fd7944ee86b795298c76e6d5fd58b8f URL: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-08T09:36:49+02:00 dlgs: safety check for accessing next field --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… Patch: https://github.com/kamailio/kamailio/commit/7dd643a88fd7944ee86b795298c76e6… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 1f6af22ba3..d3084084d5 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -970,7 +970,9 @@ void dlgs_ht_timer(unsigned int ticks, void *param) it->prev = NULL; } } else { - ite->prev->next = it; + if(ite->prev) { + ite->prev->next = it; + } if(it!=NULL) { it->prev = ite->prev; }

1 0

git:master:7ef0a272: core: check for non empty receive address and port in msg translator
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 7ef0a272dc9c81afa05ef8b1591e9f05c2810e9a URL: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T11:33:24+02:00 core: check for non empty receive address and port in msg translator --- Modified: src/core/msg_translator.c Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… Patch: https://github.com/kamailio/kamailio/commit/7ef0a272dc9c81afa05ef8b1591e9f0… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4622b264d5..a2f6505e83 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -597,7 +597,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, #define SUBST_LUMP_LEN(subst_l) \ switch((subst_l)->u.subst){ \ case SUBST_RCV_IP: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ new_len+=recv_address_str->len; \ if (msg->rcv.bind_address->address.af!=AF_INET) \ new_len+=2; \ @@ -607,7 +607,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, }; \ break; \ case SUBST_RCV_PORT: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_port_str)){ \ new_len+=recv_port_str->len; \ }else{ \ /* FIXME */ \ @@ -646,14 +646,14 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, break; \ case SUBST_RCV_ALL: \ case SUBST_RCV_ALL_EX: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ new_len+=recv_address_str->len; \ if ((msg->rcv.bind_address->address.af==AF_INET6)\ && (recv_address_str->s[0]!='[')\ && (memchr(recv_address_str->s, ':',\ recv_address_str->len)!=NULL))\ new_len+=2; \ - if (recv_port_no!=SIP_PORT){ \ + if (recv_port_no!=SIP_PORT && STR_WITHVAL(recv_port_str)){ \ /* add :port_no */ \ new_len+=1+recv_port_str->len; \ }\ @@ -990,7 +990,7 @@ void process_lumps( struct sip_msg* msg, #define SUBST_LUMP(subst_l) \ switch((subst_l)->u.subst){ \ case SUBST_RCV_IP: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ if (msg->rcv.bind_address->address.af!=AF_INET){\ new_buf[offset]='['; offset++; \ }\ @@ -1006,7 +1006,7 @@ void process_lumps( struct sip_msg* msg, }; \ break; \ case SUBST_RCV_PORT: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_port_str)){ \ memcpy(new_buf+offset, recv_port_str->s, \ recv_port_str->len); \ offset+=recv_port_str->len; \ @@ -1017,7 +1017,7 @@ void process_lumps( struct sip_msg* msg, break; \ case SUBST_RCV_ALL: \ case SUBST_RCV_ALL_EX: \ - if (msg->rcv.bind_address){ \ + if (msg->rcv.bind_address && STR_WITHVAL(recv_address_str)){ \ /* address */ \ if ((msg->rcv.bind_address->address.af==AF_INET6)\ && (recv_address_str->s[0]!='[')\ @@ -1035,7 +1035,7 @@ void process_lumps( struct sip_msg* msg, new_buf[offset]=']'; offset++; \ }\ /* :port */ \ - if (recv_port_no!=SIP_PORT){ \ + if (recv_port_no!=SIP_PORT && STR_WITHVAL(recv_port_str)){ \ new_buf[offset]=':'; offset++; \ memcpy(new_buf+offset, \ recv_port_str->s, \ diff --git a/src/core/str.h b/src/core/str.h index 58d7d627f6..d7977652d9 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -142,6 +142,11 @@ typedef struct _str str; } \ } while(0) +/** + * str with value: not null and not emptu + */ +#define STR_WITHVAL(_sp) ((_sp) && ((_sp)->s) && ((_sp)->len)) + /** @} */ /** Appends a sufffix

1 0

[kamailio/kamailio] volte：401 Unauthorized (#2703)
by King-Osmond 07 Apr '21

07 Apr '21

Hello! I have a problem about volte. > 4(4467) INFO: rr [rr_mod.c:515]: pv_get_route_uri_f(): No route header present. > 4(4467) NOTICE: <script>: PCSCF REGISTER: > Destination URI: <null> > Request URI: sip:ims.mnc007.mcc460.3gppnetwork.org > 4(4467) INFO: rr [rr_mod.c:515]: pv_get_route_uri_f(): No route header present. > 4(4467) NOTICE: <script>: Source IP and Port: (10.45.0.6:5060) > Route-URI: > 4(4467) NOTICE: <script>: Received IP and Port: (192.168.107.6:5060) > 4(4467) NOTICE: <script>: Contact header: <sip:460070000000001@10.45.0.6:5060>;+sip.instance="<urn:gsma:imei:86772304-493882-0>";+g.3gpp.accesstype="cellular2";audio;video;+g.3gpp.smsip;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel" > 4(4467) INFO: ims_registrar_pcscf [sec_agree.c:296]: cscf_get_security_verify(): No sec ![1617780139(1)](https://user-images.githubusercontent.com/65008453/113834050-f41b2e80-97bc-11eb-8ebb-c669f2fee210.png) ![1617780742(1)](https://user-images.githubusercontent.com/65008453/113834075-fa110f80-97bc-11eb-951c-9a75283ff69a.png) urity-verify parameters found ![1617781355(1)](https://user-images.githubusercontent.com/65008453/113834098-04330e00-97bd-11eb-8dd3-3ff310df2e7c.png) [open5gs.tar.gz](https://github.com/kamailio/kamailio/files/6270079/open5gs.… Can you help me see where the problem is？ Thanks! Tips：About SQN, the SQN is the same at the beginning of the test (Open5GS, FOHSS), but when it is found that the sip registration fails, the SQN is inconsistent. If this situation is normal? If it is not normal, how to solve it? open5gs：v2.2.3 kamailio：5.3 -- 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/issues/2703

2 2

git:master:7457b3ce: app_python3: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 7457b3cefd08595c054291398de0f9a4e62691b7 URL: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_python3: init timeval structures --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… Patch: https://github.com/kamailio/kamailio/commit/7457b3cefd08595c054291398de0f9a… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 7af949de6e..f3463a781f 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1791,7 +1791,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:50f92131: app_ruby: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 50f92131ac0a9f5dd1e19fb6e3636657ad996e37 URL: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_ruby: init timeval structures --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… Patch: https://github.com/kamailio/kamailio/commit/50f92131ac0a9f5dd1e19fb6e363665… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 41e6a3ec9e..116c4358ea 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -1421,7 +1421,7 @@ VALUE sr_kemi_ruby_exec_func(ksr_ruby_context_t *R, int eidx, int argc, { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:e8583372: app_sqlang: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: e8583372cb1078a29bb6526c11f838e30811b94a URL: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:25+02:00 app_sqlang: init timeval structures --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… Patch: https://github.com/kamailio/kamailio/commit/e8583372cb1078a29bb6526c11f838e… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 192e059e2e..7bff2a87d3 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1548,7 +1548,7 @@ int sr_kemi_sqlang_exec_func(HSQUIRRELVM J, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:e1369a4c: app_lua: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: e1369a4cf0c668a0ee40d3b84b9c6382c2168e49 URL: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_lua: init timeval structures --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… Patch: https://github.com/kamailio/kamailio/commit/e1369a4cf0c668a0ee40d3b84b9c638… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 3fa131ca3a..f736bea98b 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -1605,7 +1605,7 @@ int sr_kemi_lua_exec_func(lua_State* L, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff; lua_Debug dinfo;

1 0

git:master:97991c9c: app_python: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 97991c9cf56ca034df914ae499053e597582ef80 URL: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_python: init timeval structures --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… Patch: https://github.com/kamailio/kamailio/commit/97991c9cf56ca034df914ae499053e5… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 43a47d28ad..586926428a 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -1783,7 +1783,7 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) PyObject *ret = NULL; PyThreadState *pstate = NULL; PyFrameObject *pframe = NULL; - struct timeval tvb, tve; + struct timeval tvb = {0}, tve = {0}; struct timezone tz; unsigned int tdiff;

1 0

git:master:cad5cc37: app_jsdt: init timeval structures
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: cad5cc37c63477fbcf429af34e516b523c74132e URL: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:29:24+02:00 app_jsdt: init timeval structures --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… Patch: https://github.com/kamailio/kamailio/commit/cad5cc37c63477fbcf429af34e516b5… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ff4e629075..c41d1d2217 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1339,7 +1339,7 @@ int sr_kemi_jsdt_exec_func(duk_context *J, int eidx) { sr_kemi_t *ket; int ret; - struct timeval tvb, tve; + struct timeval tvb ={0}, tve = {0}; struct timezone tz; unsigned int tdiff; int sline = 0;

1 0

git:master:3bb1a30d: ctl: free send_buf in case of error
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 3bb1a30dda3b40ba2f188a4baab94ebda41f4a74 URL: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T10:08:56+02:00 ctl: free send_buf in case of error - disabled unused function --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… Patch: https://github.com/kamailio/kamailio/commit/3bb1a30dda3b40ba2f188a4baab94eb… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 8c786a680a..5aed95c40f 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -223,7 +223,7 @@ static struct rpc_struct_l* grow_rpc_struct(struct rpc_struct_l *rs) #endif - +#if 0 /* appends buf to an already init. binrpc_pkt */ inline static int append_pkt_body(struct binrpc_pkt* p, unsigned char* buf, int len) @@ -247,7 +247,7 @@ inline static int append_pkt_body(struct binrpc_pkt* p, unsigned char* buf, error: return -1; /* buff. overflow */ } - +#endif inline static int append_iovec(struct iovec_array* a, unsigned char* buf, @@ -379,6 +379,9 @@ inline static int init_binrpc_ctx( struct binrpc_ctx* ctx, } /* we'll keep only the body */ err=binrpc_init_pkt(&ctx->out.pkt, send_buf, send_buf_len); + if(err!=0) { + ctl_free(send_buf); + } end: return err; }

1 0

git:master:62e822ce: core: use same condition for extra_params in create_via_hf()
by Daniel-Constantin Mierla 07 Apr '21

07 Apr '21

Module: kamailio Branch: master Commit: 62e822ce25e93a8183dd9e5e1fee517143849a6a URL: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-07T09:53:39+02:00 core: use same condition for extra_params in create_via_hf() --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… Patch: https://github.com/kamailio/kamailio/commit/62e822ce25e93a8183dd9e5e1fee517… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index c3587d2e88..4622b264d5 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2992,12 +2992,14 @@ char* create_via_hf(unsigned int *len, /* params so far + ';rport' + '\0' */ via = (char*)pkg_malloc(extra_params.len+RPORT_LEN); if(via==0) { - PKG_MEM_ERROR; + PKG_MEM_ERROR; if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len!=0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } memcpy(via + extra_params.len, RPORT, RPORT_LEN-1); @@ -3018,8 +3020,10 @@ char* create_via_hf(unsigned int *len, if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len != 0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } memcpy(via + extra_params.len, sbuf, slen); @@ -3038,12 +3042,14 @@ char* create_via_hf(unsigned int *len, if(xparams.len>0) { via = (char*)pkg_malloc(extra_params.len+xparams.len+2); if(via==0) { - PKG_MEM_ERROR; + PKG_MEM_ERROR; if (extra_params.s) pkg_free(extra_params.s); return 0; } - if(extra_params.len != 0) { + if(extra_params.s!=NULL && extra_params.len>0) { memcpy(via, extra_params.s, extra_params.len); + } + if(extra_params.s!=NULL) { pkg_free(extra_params.s); } /* add ';' between via parameters */

1 0

git:master:02c5f298: crypto: use same condition to free ttext.s on success or error
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 02c5f298d3355b7bb4c85bd290bc8265591f0ab8 URL: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T17:54:46+02:00 crypto: use same condition to free ttext.s on success or error --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… Patch: https://github.com/kamailio/kamailio/commit/02c5f298d3355b7bb4c85bd290bc826… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 955bf264bf..2099b25148 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -284,16 +284,18 @@ static int ki_crypto_aes_encrypt_helper(sip_msg_t* msg, str *ins, str *keys, val.flags = PV_VAL_STR; dst->setf(msg, &dst->pvp, (int)EQ_T, &val); - free(etext.s); - if (! _crypto_key_derivation) + if (ttext.s != etext.s) { pkg_free(ttext.s); + } + free(etext.s); EVP_CIPHER_CTX_cleanup(en); EVP_CIPHER_CTX_free(en); return 1; error: - if (ttext.s != etext.s) + if (ttext.s != etext.s) { pkg_free(ttext.s); + } error1: free(etext.s); EVP_CIPHER_CTX_cleanup(en);

1 0

git:master:7652f796: core: rvalue - link to free at end of rve_opt_01() instead on replace
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 7652f79640b3e792baa77531e697fd74a1ab4584 URL: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T17:23:16+02:00 core: rvalue - link to free at end of rve_opt_01() instead on replace - debug mode messages print fields --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… Patch: https://github.com/kamailio/kamailio/commit/7652f79640b3e792baa77531e697fd7… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index f96f8ea536..902f3c2c66 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -3185,6 +3185,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) struct rvalue* rv; struct rval_expr* ct_rve; struct rval_expr* v_rve; + struct rval_expr* r_rve = NULL; int i; int ret; enum rval_expr_op op; @@ -3208,7 +3209,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) pos=(e)->fpos; \ *(e)=*(v); /* replace e with v (in-place) */ \ (e)->fpos=pos; \ - pkg_free((v)); /* rve_destroy(v_rve) would free everything*/ \ + r_rve = v; /* link to free it */ \ }else{\ /* unknown type or str => (int) $v */ \ (e)->op=RVE_##ctype##_OP; \ @@ -3564,9 +3565,11 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) } } if (rv) rval_destroy(rv); + if (r_rve) pkg_free(r_rve); /* rve_destroy(v_rve) would free everything*/ return ret; error: if (rv) rval_destroy(rv); + if (r_rve) pkg_free(r_rve); /* rve_destroy(v_rve) would free everything*/ return -1; }

1 0

git:master:4f7b5537: core: main - several optarg safety checks
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 4f7b5537688293d196669dd5a7d0124f7656cf2d URL: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T14:48:34+02:00 core: main - several optarg safety checks --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… Patch: https://github.com/kamailio/kamailio/commit/4f7b5537688293d196669dd5a7d0124… --- diff --git a/src/main.c b/src/main.c index 6d363ba375..4dac30179c 100644 --- a/src/main.c +++ b/src/main.c @@ -2140,6 +2140,10 @@ int main(int argc, char** argv) /* ignore, they were parsed immediately after startup */ break; case 'f': + if (optarg == NULL) { + fprintf(stderr, "bad -f parameter\n"); + goto error; + } cfg_file=optarg; break; case 'c': @@ -2147,10 +2151,18 @@ int main(int argc, char** argv) log_stderr=1; /* force stderr logging */ break; case 'L': + if (optarg == NULL) { + fprintf(stderr, "bad -L parameter\n"); + goto error; + } mods_dir = optarg; mods_dir_cmd = 1; break; case 'm': + if (optarg == NULL) { + fprintf(stderr, "bad shared mem size\n"); + goto error; + } shm_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad shmem size number: -m %s\n", @@ -2188,6 +2200,10 @@ int main(int argc, char** argv) /* ignore it, was parsed immediately after startup */ break; case 'O': + if (optarg == NULL) { + fprintf(stderr, "bad -O parameter\n"); + goto error; + } scr_opt_lev=strtol(optarg, &tmp, 10); if (tmp &&(*tmp)){ fprintf(stderr, "bad optimization level: -O %s\n", @@ -2200,6 +2216,10 @@ int main(int argc, char** argv) user=optarg; break; case 'A': + if (optarg == NULL) { + fprintf(stderr, "bad -A parameter\n"); + goto error; + } p = strchr(optarg, '='); if(p) { tmp_len = p - optarg; @@ -2451,6 +2471,10 @@ int main(int argc, char** argv) takes priority over config */ break; case 'b': + if (optarg == NULL) { + fprintf(stderr, "bad -b parameter\n"); + goto error; + } maxbuffer=strtol(optarg, &tmp, 10); if (tmp &&(*tmp)){ fprintf(stderr, "bad max buffer size number: -b %s\n", @@ -2473,6 +2497,10 @@ int main(int argc, char** argv) #endif break; case 'l': + if (optarg == NULL) { + fprintf(stderr, "bad -l parameter\n"); + goto error; + } p = strrchr(optarg, '/'); if(p==NULL) { p = optarg; @@ -2522,6 +2550,10 @@ int main(int argc, char** argv) free_name_lst(n_lst); break; case 'n': + if (optarg == NULL) { + fprintf(stderr, "bad -n parameter\n"); + goto error; + } children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -n %s\n", @@ -2548,6 +2580,10 @@ int main(int argc, char** argv) "TCP support disabled\n", optarg); goto error; } + if (optarg == NULL) { + fprintf(stderr, "bad -N parameter\n"); + goto error; + } tcp_cfg_children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -N %s\n", @@ -2560,6 +2596,10 @@ int main(int argc, char** argv) break; case 'W': #ifdef USE_TCP + if (optarg == NULL) { + fprintf(stderr, "bad -W parameter\n"); + goto error; + } tcp_poll_method=get_poll_type(optarg); if (tcp_poll_method==POLL_NONE){ fprintf(stderr, "bad poll method name: -W %s\ntry " @@ -2577,6 +2617,10 @@ int main(int argc, char** argv) "SCTP support disabled\n", optarg); goto error; } + if (optarg == NULL) { + fprintf(stderr, "bad -Q parameter\n"); + goto error; + } sctp_children_no=strtol(optarg, &tmp, 10); if ((tmp==0) ||(*tmp)){ fprintf(stderr, "bad process number: -O %s\n",

1 0

git:master:e770e0aa: core: rvalue - function to destroy content of rval without freeing it
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: e770e0aa6889f001a3f7f2644202bf106f6559da URL: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T15:23:21+02:00 core: rvalue - function to destroy content of rval without freeing it - needed in case of rval reuse in rve_replace_with_val() --- Modified: src/core/rvalue.c --- Diff: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… Patch: https://github.com/kamailio/kamailio/commit/e770e0aa6889f001a3f7f2644202bf1… --- diff --git a/src/core/rvalue.c b/src/core/rvalue.c index 22393057fb..f96f8ea536 100644 --- a/src/core/rvalue.c +++ b/src/core/rvalue.c @@ -112,10 +112,7 @@ inline static void rval_force_clean(struct rvalue* rv) -/** frees a rval returned by rval_new(), rval_convert() or rval_expr_eval(). - * Note: it will be freed only when refcnt reaches 0 - */ -void rval_destroy(struct rvalue* rv) +static inline void rval_destroy_helper(struct rvalue* rv, int allocated) { if (rv && rv_unref(rv)){ rval_force_clean(rv); @@ -126,13 +123,38 @@ void rval_destroy(struct rvalue* rv) regfree(rv->v.re.regex); } if (rv->flags & RV_RV_ALLOCED_F){ - pkg_free(rv); + if(likely(allocated)) { + pkg_free(rv); + } else { + /* not expected to be allocated */ + abort(); /* abort, otherwise is lost - find bugs quicker */ + } } } } +/** frees a rval returned by rval_new(), rval_convert() or rval_expr_eval(). + * Note: it will be freed only when refcnt reaches 0 + */ +void rval_destroy(struct rvalue* rv) +{ + rval_destroy_helper(rv, 1); +} + + + +/** frees content of rval which is not allocated, otherwise aborts. + * Note: it will be freed only when refcnt reaches 0 + */ +void rval_destroy_content(struct rvalue* rv) +{ + rval_destroy_helper(rv, 0); +} + + + void rval_clean(struct rvalue* rv) { if (rv_unref(rv)) @@ -1523,7 +1545,7 @@ inline static int int_strop1(int* res, enum rval_expr_op op, str* s1) } - +#if 0 /** integer operation: ret= op v (returns a rvalue). * @return rvalue on success, 0 on error */ @@ -1619,7 +1641,7 @@ inline static struct rvalue* rval_intop2(struct run_act_ctx* h, rval_destroy(rv2); return 0; } - +#endif /* #if 0 */ /** string add operation: ret= l . r (returns a rvalue). @@ -3024,7 +3046,7 @@ static int rve_replace_with_val(struct rval_expr* rve, enum rval_type type, refcnt=rve->left.rval.refcnt; abort(); /* find bugs quicker -- andrei */ } - rval_destroy(&rve->left.rval); + rval_destroy_content(&rve->left.rval); } rval_init(&rve->left.rval, type, v, flags); rve->left.rval.refcnt=refcnt; @@ -3096,7 +3118,7 @@ static int fix_match_rve(struct rval_expr* rve) /* fixup the right side (RE) */ if (rve_is_constant(rve->right.rve)){ if ((rve_guess_type(rve->right.rve)!=RV_STR)){ - LM_ERR("fixup failure(%d,%d-%d,%d): left side of =~ is not string" + LM_ERR("fixup failure(%d,%d-%d,%d): right side of =~ is not string" " (%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col, rve->right.rve->fpos.s_line, @@ -3104,7 +3126,7 @@ static int fix_match_rve(struct rval_expr* rve) goto error; } if ((rv=rval_expr_eval(0, 0, rve->right.rve))==0){ - LM_ERR("fixup failure(%d,%d-%d,%d): bad RE expression\n", + LM_ERR("fixup failure(%d,%d-%d,%d): bad RE expression\n", rve->right.rve->fpos.s_line, rve->right.rve->fpos.s_col, rve->right.rve->fpos.e_line, rve->right.rve->fpos.e_col); goto error;

1 0

git:master:26ab0fcc: uac: do not free chunks already inserted as lumps
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 26ab0fcc97cbf0d6602454e60187a914f13424a2 URL: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T12:17:35+02:00 uac: do not free chunks already inserted as lumps - in case of errors happening later, the pointers are linked in sip_msg_t and will be freed there, otherwise will result in a double free --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… Patch: https://github.com/kamailio/kamailio/commit/26ab0fcc97cbf0d6602454e60187a91… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 3a476a3d82..6e77eafe94 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -875,7 +875,7 @@ static void replace_callback(struct dlg_cell *dlg, int type, str old_uri; str* new_uri; str* new_display; - str buf; + str buf = STR_NULL; char *p; unsigned int uac_flag; int dlgvar_index = 0; @@ -968,11 +968,13 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free1; + pkg_free(buf.s); + return; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free1; + pkg_free(buf.s); + return; } } @@ -980,20 +982,22 @@ static void replace_callback(struct dlg_cell *dlg, int type, p = pkg_malloc( new_uri->len); if (!p) { PKG_MEM_ERROR; - goto free1; + return; } - memcpy( p, new_uri->s, new_uri->len); + memcpy(p, new_uri->s, new_uri->len); /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + l = del_lump(msg, old_uri.s-msg->buf, old_uri.len, 0); if (l==0) { LM_ERR("del lump failed\n"); - goto free2; + pkg_free(p); + return; } if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { LM_ERR("insert new lump failed\n"); - goto free2; + pkg_free(p); + return; } /* register tm callback to change replies, @@ -1007,12 +1011,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, msg->msg_flags |= uac_flag; return; - -free2: - pkg_free(p); - -free1: - pkg_free(buf.s); }

1 0

git:master:ddafeebf: core/mem: tlsf malloc - sync'ed with v3.1
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: ddafeebfaf1537c684eee22be228867563dd02ac URL: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T08:34:48+02:00 core/mem: tlsf malloc - sync'ed with v3.1 - tlsf malloc project: https://github.com/mattconte/tlsf - last commit when sync'ed: - https://github.com/mattconte/tlsf/commit/deff9ab509341f264addbd3c8ada533678… --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867… Patch: https://github.com/kamailio/kamailio/commit/ddafeebfaf1537c684eee22be228867…

1 0

git:master:2d7aee50: core/mem: removed tlsf_malloc_bits.h
by Daniel-Constantin Mierla 06 Apr '21

06 Apr '21

Module: kamailio Branch: master Commit: 2d7aee506c617f2d258719562f8debf2b4ba087e URL: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-06T08:38:16+02:00 core/mem: removed tlsf_malloc_bits.h - no longer needed after sync with v3.1 --- Removed: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… Patch: https://github.com/kamailio/kamailio/commit/2d7aee506c617f2d258719562f8debf… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h deleted file mode 100644 index 29c783d4a4..0000000000 --- a/src/core/mem/tlsf_malloc_bits.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef INCLUDED_tlsfbits -#define INCLUDED_tlsfbits - -#if defined(__cplusplus) -#define tlsf_decl inline -#else -#define tlsf_decl static -#endif - -/* -** Architecture-specific bit manipulation routines. -** -** TLSF achieves O(1) cost for malloc and free operations by limiting -** the search for a free block to a free list of guaranteed size -** adequate to fulfill the request, combined with efficient free list -** queries using bitmasks and architecture-specific bit-manipulation -** routines. -** -** Most modern processors provide instructions to count leading zeroes -** in a word, find the lowest and highest set bit, etc. These -** specific implementations will be used when available, falling back -** to a reasonably efficient generic implementation. -** -** NOTE: TLSF spec relies on ffs/fls returning value 0..31. -** ffs/fls return 1-32 by default, returning 0 for error. -*/ - -/* -** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) -** architecture. There is no reliable portable method at compile-time. -*/ -#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ - || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) -#define TLSF_64BIT -#endif - -/* -** gcc 3.4 and above have builtin support, specialized for architecture. -** Some compilers masquerade as gcc; patchlevel test filters them out. -** -** Note: clang is compatible with GCC builtins and will also define those macros -*/ -#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ - && defined (__GNUC_PATCHLEVEL__) - -tlsf_decl int tlsf_ffs(unsigned int word) -{ - return __builtin_ffs(word) - 1; -} - -tlsf_decl int tlsf_fls(unsigned int word) -{ - const int bit = word ? 32 - __builtin_clz(word) : 0; - return bit - 1; -} - -#if defined (TLSF_64BIT) -tlsf_decl int tlsf_fls_sizet(size_t size) -{ - const int bit = size ? 64 - __builtin_clzl(size) : 0; - return bit - 1; -} -#endif -#else -/* Fall back to generic implementation. */ - -tlsf_decl int tlsf_fls_generic(unsigned int word) -{ - int bit = 32; - - if (!word) bit -= 1; - if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } - if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } - if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } - if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } - if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } - - return bit; -} - -/* Implement ffs in terms of fls. */ -tlsf_decl int tlsf_ffs(unsigned int word) -{ - return tlsf_fls_generic(word & (~word + 1)) - 1; -} - -tlsf_decl int tlsf_fls(unsigned int word) -{ - return tlsf_fls_generic(word) - 1; -} - -#if defined (TLSF_64BIT) -tlsf_decl int tlsf_fls_sizet(size_t size) -{ - int high = (int)(size >> 32); - int bits = 0; - if (high) - { - bits = 32 + tlsf_fls(high); - } - else - { - bits = tlsf_fls((int)size & 0xffffffff); - - } - return bits; -} -#endif /* defined (TLSF_64BIT) */ - -#endif /* GNUC */ - - -#if !defined (TLSF_64BIT) -#define tlsf_fls_sizet tlsf_fls -#endif - -#undef tlsf_decl - -#endif

1 0

[kamailio/kamailio] Add display name support to "pua_dialoginfo" (#2615)
by Jake Greene 05 Apr '21

05 Apr '21

### Description It doesn't look like the "pua_dialoginfo" module has support for the "display" attribute in the identity tag. This tag is used by some phones to update the phone display with caller/callee information for the respective key. I'm wondering how difficult it would be to add this feature. Thanks in advance for anyone who reads this! ### Expected behavior Kamailio includes display attribute in identity tags in generated publish messages. <pre> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="1" state="full"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" remote-tag="456887766" direction="initiator"> <state>early</state> <local> <identity <b><i>display="Alice"</i></b>>sip:alice@example.com</identity> <target uri="sip:alice@phone11.example.com"/> </local> <remote> <identity <b><i>display="Bob"</i></b>>sip:bob@example.org</identity> <target uri="sip:bobster@phone21.example.org"/> </remote> </dialog> </dialog-info> </pre> #### Actual observed behavior Kamailio generates a publish request for dialog events similar to the one below. The display attribute is not included in the "identity" tags. This means that when a notify message is sent to a watcher for this publish, the name is not rendered on the phone display. <pre> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="1" state="full"> <dialog id="as7d900as8" call-id="a84b4c76e66710" local-tag="1928301774" remote-tag="456887766" direction="initiator"> <state>early</state> <local> <b><identity>sip:alice@example.com</identity></b> <target uri="sip:alice@phone11.example.com"/> </local> <remote> <b><identity>sip:bob@example.org</identity></b> <target uri="sip:bobster@phone21.example.org"/> </remote> </dialog> </dialog-info> </pre> ### Possible Solutions I added a small modification to the module as a POC and it works as expected. With the following modification, the phone display is updated with the string in the “display” attribute. I added line 191-193 below, between lines 190 & 191 on the current master branch. The example below shows the “remote” tag, I also did the same thing for the local tag a few more lines down. <pre> 184 tag_node = xmlNewChild(remote_node, NULL, BAD_CAST "identity", 185 BAD_CAST buf) ; 186 if( tag_node ==NULL) 187 { 188 LM_ERR("while adding childn"); 189 goto error; 190 } 191 /* Testing - adding display attribute to the identity tag */ 192 xmlNewProp(tag_node, BAD_CAST "display", BAD_CAST "RemoteCallerName"); 193 /* */ 195 196 tag_node = xmlNewChild(remote_node, NULL, BAD_CAST "target", NULL); 197 if( tag_node ==NULL) </pre> Here is a link to the file in the module I’m referring to: https://github.com/kamailio/kamailio/blob/master/src/modules/pua_dialoginfo… I don’t really have any professional experience writing C code, and I was unable to identify a way to grab this string from the “From” header. Unfortunately, because I would have really loved to give this feature back to the community! ### Additional Information Thank you so much for this amazing software. I absolutely adore Kamailio! If someone is interested in this, please let me know if there is anything I can do to help. -- 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/issues/2615

2 6

git:master:9c239dc3: core: checks for trying to define empty or null ids
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: 9c239dc385716255b977d8d879946e707e6f51c3 URL: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:50:31+02:00 core: checks for trying to define empty or null ids - use found pointer to compute the lenght of ID for -A parameter to save a strlen() --- Modified: src/core/cfg.lex Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… Patch: https://github.com/kamailio/kamailio/commit/9c239dc385716255b977d8d879946e7… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index b8e4f9aa70..d36fc72b54 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1927,11 +1927,16 @@ ksr_ppdefine_t* pp_get_define(int idx) return &pp_defines[idx]; } -static int pp_lookup(int len, const char * text) +static int pp_lookup(int len, const char *text) { str var = {(char *)text, len}; int i; + if(len<=0 || text==NULL) { + LM_ERR("invalid parameters"); + return -1; + } + for (i=0; i<pp_num_defines; i++) if (STR_EQ(pp_defines[i].name, var)) return i; @@ -1945,10 +1950,15 @@ int pp_define_set_type(int type) return 0; } -int pp_define(int len, const char * text) +int pp_define(int len, const char *text) { int ppos; + if(len<=0 || text==NULL) { + LM_ERR("invalid parameters"); + return -1; + } + LM_DBG("defining id: %.*s\n", len, text); if (pp_num_defines == MAX_DEFINES) { @@ -2010,7 +2020,7 @@ int pp_define_set(int len, char *text) LM_BUG("BUG: the index in define table not set yet\n"); return -1; } - if(len<=0) { + if(len<=0 || text==NULL) { LM_DBG("no define value - ignoring\n"); return 0; } @@ -2046,7 +2056,7 @@ int pp_define_set(int len, char *text) return 0; } -int pp_define_env(const char * text, int len) +int pp_define_env(const char *text, int len) { char *r; str defname; @@ -2087,7 +2097,7 @@ int pp_define_env(const char * text, int len) return 0; } -str *pp_define_get(int len, const char * text) +str *pp_define_get(int len, const char *text) { str var = {(char *)text, len}; int i; @@ -2129,7 +2139,7 @@ static int pp_ifdef_type(int type) * ifndef defined -> 0 * ifndef undefined -> 1 */ -static void pp_ifdef_var(int len, const char * text) +static void pp_ifdef_var(int len, const char *text) { pp_ifdef_stack[pp_sptr] ^= (pp_lookup(len, text) < 0); } diff --git a/src/main.c b/src/main.c index ee558db13f..6d363ba375 100644 --- a/src/main.c +++ b/src/main.c @@ -2202,16 +2202,17 @@ int main(int argc, char** argv) case 'A': p = strchr(optarg, '='); if(p) { - *p = '\0'; + tmp_len = p - optarg; + } else { + tmp_len = strlen(optarg); } pp_define_set_type(0); - if(pp_define(strlen(optarg), optarg)<0) { + if(pp_define(tmp_len, optarg)<0) { fprintf(stderr, "error at define param: -A %s\n", optarg); goto error; } if(p) { - *p = '='; p++; if(pp_define_set(strlen(p), p)<0) { fprintf(stderr, "error at define value: -A %s\n",

1 0

git:master:a749cc53: tm: init timeval structs
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: a749cc53ac4aa4825ba8d720825db856d897efb2 URL: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T18:06:01+02:00 tm: init timeval structs --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… Patch: https://github.com/kamailio/kamailio/commit/a749cc53ac4aa4825ba8d720825db85… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index c8dd0c91ce..a46921cbfd 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1005,8 +1005,8 @@ int run_failure_handlers(tm_cell_t *t, struct sip_msg *rpl, struct sip_msg *shmem_msg = t->uas.request; int on_failure; sr_kemi_eng_t *keng = NULL; - struct timeval tvb; - struct timeval tve; + struct timeval tvb = {0}; + struct timeval tve = {0}; unsigned long tvd = 0; unsigned int t_hash_index = 0; unsigned int t_label = 0;

1 0

git:master:ef31c82a: core: cfg.len - sanitizer safety check of target buffer
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: ef31c82ac3bd7972c2d02c893f8041af4664b717 URL: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:31:48+02:00 core: cfg.len - sanitizer safety check of target buffer --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… Patch: https://github.com/kamailio/kamailio/commit/ef31c82ac3bd7972c2d02c893f8041a… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index afab5b68a5..b8e4f9aa70 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1593,7 +1593,7 @@ static char* addchar(struct str_buf* dst, char c) static char* addstr(struct str_buf* dst_b, char* src, int len) { - char *tmp; + char *tmp = NULL; unsigned size; unsigned used; @@ -1612,6 +1612,10 @@ static char* addstr(struct str_buf* dst_b, char* src, int len) dst_b->crt=dst_b->s+used; dst_b->left=size-used; } + if(dst_b->crt==NULL) { + LM_CRIT("unexpected null dst buffer\n"); + ksr_exit(-1); + } memcpy(dst_b->crt, src, len); dst_b->crt+=len; *(dst_b->crt)=0;

1 0

git:master:c08620f6: imc: expect the second param only if first is set
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: c08620f6427d59749396fe2762e340328ce69c41 URL: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:35:12+02:00 imc: expect the second param only if first is set - bits of formatting for imc_handle_create() --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… Patch: https://github.com/kamailio/kamailio/commit/c08620f6427d59749396fe2762e3403… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 9dbc403e3e..94ddc38884 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -349,8 +349,12 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, memset(&room, '\0', sizeof(room)); - if (cmd->param[0].s) params++; - if (cmd->param[1].s) params++; + if (cmd->param[0].s) { + params++; + if (cmd->param[1].s) { + params++; + } + } switch(params) { case 0: @@ -361,7 +365,9 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, /* With one parameter, if the value is "private", it indicates * a private room, otherwise it is the URI of the room and we * create a public room. */ - if (cmd->param[0].len == IMC_ROOM_PRIVATE_LEN && !strncasecmp(cmd->param[0].s, IMC_ROOM_PRIVATE, cmd->param[0].len)) { + if (cmd->param[0].len == IMC_ROOM_PRIVATE_LEN + && !strncasecmp(cmd->param[0].s, IMC_ROOM_PRIVATE, + cmd->param[0].len)) { ps = cmd->param[0]; } else { rs = cmd->param[0]; @@ -384,7 +390,8 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, goto error; if (ps.s) { - if (ps.len == IMC_ROOM_PRIVATE_LEN && !strncasecmp(ps.s, IMC_ROOM_PRIVATE, ps.len)) { + if (ps.len == IMC_ROOM_PRIVATE_LEN + && !strncasecmp(ps.s, IMC_ROOM_PRIVATE, ps.len)) { flag_room |= IMC_ROOM_PRIV; LM_DBG("Room with private flag on\n"); } else { @@ -443,10 +450,12 @@ int imc_handle_create(struct sip_msg* msg, imc_cmd_t *cmd, LM_ERR("Failed to add member [%.*s]\n", STR_FMT(&src->uri)); goto error; } - LM_DBG("Added [%.*s] as member to room [%.*s]\n", STR_FMT(&member->uri), STR_FMT(&rm->uri)); + LM_DBG("Added [%.*s] as member to room [%.*s]\n", STR_FMT(&member->uri), + STR_FMT(&rm->uri)); body.s = imc_body_buf; - body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, STR_FMT(format_uri(member->uri))); + body.len = snprintf(body.s, sizeof(imc_body_buf), msg_user_joined.s, + STR_FMT(format_uri(member->uri))); if (body.len < 0) { LM_ERR("Error while building response\n");

1 0

git:master:ca182183: core: fixed condition for 0 ID or NULL NAME AVP
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: ca1821837dfe7dd6630f628d968ed4d1178c7040 URL: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:23:59+02:00 core: fixed condition for 0 ID or NULL NAME AVP - avoid null in memcpy for AVP_NAME_STR --- Modified: src/core/usr_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… Patch: https://github.com/kamailio/kamailio/commit/ca1821837dfe7dd6630f628d968ed4d… --- diff --git a/src/core/usr_avp.c b/src/core/usr_avp.c index 82183e3b28..e80e52d79d 100644 --- a/src/core/usr_avp.c +++ b/src/core/usr_avp.c @@ -148,7 +148,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) struct str_str_data *ssd; int len; - if (name.s.s == 0 && name.s.len == 0) { + if (name.s.s == NULL || name.s.len == 0) { LM_ERR("0 ID or NULL NAME AVP!"); goto error; }

1 0

git:master:36abe25e: crypto: fix use of uninitialized values introduced by b08fd55ddd598115a3b69afc630403a582d239f2
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: 36abe25e35d1862468999bedcaf8bba29ec5f48a URL: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T17:10:24+02:00 crypto: fix use of uninitialized values introduced by b08fd55ddd598115a3b69afc630403a582d239f2 --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… Patch: https://github.com/kamailio/kamailio/commit/36abe25e35d1862468999bedcaf8bba… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index 5ec753d602..955bf264bf 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -192,7 +192,8 @@ static int ki_crypto_aes_encrypt_helper(sip_msg_t* msg, str *ins, str *keys, { pv_value_t val; EVP_CIPHER_CTX *en = NULL; - str etext, lkey, iv, ttext; + str etext, lkey, ttext; + str iv = STR_NULL; unsigned char decoded_key[64]; unsigned char decoded_iv[16], tmpiv[16]; @@ -476,7 +477,7 @@ static int ki_crypto_aes_decrypt_helper(sip_msg_t* msg, str *ins, str *keys, EVP_CIPHER_CTX *de=NULL; str etext, lkey; unsigned char decoded_key[64]; - char *iv; + char *iv = NULL; de = EVP_CIPHER_CTX_new(); if(de==NULL) {

1 0

git:master:47b1b56e: dmq: fixes for changes in the 678f9c6ad8a8118741a921fcc01f9b23b5702c6e
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: 47b1b56e6cf86b2b6d74fdf4f292e8f2bf87f9fd URL: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T11:37:06+02:00 dmq: fixes for changes in the 678f9c6ad8a8118741a921fcc01f9b23b5702c6e - init the next field to first notification address str_list_t item - init local variables to avoid compile warnings on using garbage value - while condition on server_list instead of address of its ->s field (which always not null) - do not iterate using global dmq_notification_address_list variable, it shifts it till becomes NULL --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… Patch: https://github.com/kamailio/kamailio/commit/47b1b56e6cf86b2b6d74fdf4f292e8f… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 79cc8ccbc9..27e950e472 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -387,6 +387,7 @@ static int dmq_add_notification_address(modparam_t type, void * val) } dmq_tmp_list = dmq_notification_address_list; dmq_tmp_list->s = tmp_str; + dmq_tmp_list->next = NULL; } else { dmq_tmp_list = append_str_list(tmp_str.s, tmp_str.len, &dmq_tmp_list, &total_list); if (dmq_tmp_list == NULL) { diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index ff8886d0ab..d40fd2cac2 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -284,7 +284,7 @@ dmq_node_t *add_server_and_notify(str_list_t *server_list) { char puri_data[MAXDMQHOSTS * (MAXDMQURILEN + 1)]; char *puri_list[MAXDMQHOSTS]; - dmq_node_t *pfirst, *pnode; + dmq_node_t *pfirst = NULL, *pnode = NULL; int host_cnt, index; sip_uri_t puri[1]; str pstr[1]; @@ -296,7 +296,7 @@ dmq_node_t *add_server_and_notify(str_list_t *server_list) **********/ if(!dmq_multi_notify) { - while (&server_list->s != NULL) { + while (server_list != NULL) { LM_DBG("adding notification node %.*s\n", server_list->s.len, server_list->s.s); pfirst = add_dmq_node(dmq_node_list, &server_list->s); @@ -592,6 +592,7 @@ int notification_resp_callback_f( { int ret; int nodes_recv; + str_list_t *slp; LM_DBG("notification_callback_f triggered [%p %d %p]\n", msg, code, param); if(code == 200) { @@ -605,15 +606,16 @@ int notification_resp_callback_f( } } else if(code == 408) { /* TODO this probably do not work for dmq_multi_notify */ - while (&dmq_notification_address_list->s != NULL) { - if(STR_EQ(node->orig_uri, dmq_notification_address_list->s)) { + slp = dmq_notification_address_list; + while (slp != NULL) { + if(STR_EQ(node->orig_uri, slp->s)) { LM_ERR("not deleting notification peer [%.*s]\n", - STR_FMT(&dmq_notification_address_list->s)); + STR_FMT(&slp->s)); update_dmq_node_status(dmq_node_list, node, DMQ_NODE_PENDING); return 0; } - dmq_notification_address_list = dmq_notification_address_list->next; - } + slp = slp->next; + } if (node->status == DMQ_NODE_DISABLED) { /* deleting node - the server did not respond */ LM_ERR("deleting server node %.*s because of failed request\n",

1 0

git:master:ba9f2b5a: core: init allocated memory in str_hash_alloc()
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: ba9f2b5af9cabd61f67ceedb8feab6bd7bc6526d URL: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T12:02:20+02:00 core: init allocated memory in str_hash_alloc() - removed unused pointer shifting in dset.c - small reworking of lval_assign() --- Modified: src/core/dset.c Modified: src/core/lvalue.c Modified: src/core/str_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… Patch: https://github.com/kamailio/kamailio/commit/ba9f2b5af9cabd61f67ceedb8feab6b… --- diff --git a/src/core/dset.c b/src/core/dset.c index adabe7bba0..b6999f32b5 100644 --- a/src/core/dset.c +++ b/src/core/dset.c @@ -860,7 +860,6 @@ int msg_get_src_addr(sip_msg_t *msg, str *uri, int mode) p += TRANSPORT_PARAM_LEN; memcpy(p, proto.s, proto.len); - p += proto.len; } uri->s = buf; diff --git a/src/core/lvalue.c b/src/core/lvalue.c index ab600c04bb..5d779cfbce 100644 --- a/src/core/lvalue.c +++ b/src/core/lvalue.c @@ -380,7 +380,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, struct rvalue* rv; int ret; - ret=0; + ret=-1; rv=rval_expr_eval(h, msg, rve); if (unlikely(rv==0)){ LM_ERR("rval expression evaluation failed (%d,%d-%d,%d)\n", @@ -404,9 +404,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, LM_ERR("assignment failed at pos: (%d,%d-%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col); - } - else - { + } else { if(unlikely(_log_assign_action!=NULL)) _log_assign_action(msg, lv); } @@ -414,5 +412,5 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, return ret; error: if (rv) rval_destroy(rv); - return -1; + return ret; } diff --git a/src/core/str_hash.h b/src/core/str_hash.h index 263bb3cd3d..63a041fd29 100644 --- a/src/core/str_hash.h +++ b/src/core/str_hash.h @@ -56,7 +56,7 @@ struct str_hash_table{ /* returns 0 on success, <0 on failure */ inline static int str_hash_alloc(struct str_hash_table* ht, int size) { - ht->table=(struct str_hash_head*)pkg_malloc(sizeof(struct str_hash_head)*size); + ht->table=(struct str_hash_head*)pkg_mallocxz(sizeof(struct str_hash_head)*size); if (ht->table==0) { PKG_MEM_ERROR; return -1;

1 0

git:master:1536f4bb: .gitignore: ignore files that can be generated by compiling tools
by Daniel-Constantin Mierla 05 Apr '21

05 Apr '21

Module: kamailio Branch: master Commit: 1536f4bb3d4e654c8169afb6599c47c26df12ef6 URL: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-05T12:05:53+02:00 .gitignore: ignore files that can be generated by compiling tools --- Modified: .gitignore --- Diff: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… Patch: https://github.com/kamailio/kamailio/commit/1536f4bb3d4e654c8169afb6599c47c… --- diff --git a/.gitignore b/.gitignore index e8eb381ff5..3ba24902bf 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ libiname.lst *.7 # vscode tmp files .vscode +# compiling tools files +.clangd +compile_commands.json

1 0

[kamailio/kamailio] not properly compassion (#2701)
by sergey-safarov 03 Apr '21

03 Apr '21

### Description I think something wrong with integer comparison when tested this config file ``` listen=udp:[::1]:5060 listen=udp:127.0.0.1:5060 loadmodule "xlog.so" loadmodule "sdpops.so" request_route { if (sdp_get_address_family() ieq 6 ) { xlog("L_WARN", "sdp_get_address_family == 6\n"); } else if (sdp_get_address_family() ieq 4) { xlog("L_WARN", "sdp_get_address_family == 4\n"); } else if (sdp_get_address_family() ieq 1) { xlog("L_WARN", "cannot detect sdp family\n"); } } ``` The expected output of IP address type used in SDP. But really I always get "cannot detect sdp family" message. -- 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/issues/2701

2 4

git:master:b7f753dd: core: parse uri - check for invalid port values
by Daniel-Constantin Mierla 03 Apr '21

03 Apr '21

Module: kamailio Branch: master Commit: b7f753ddc727e1d7ab42e7abe607059e03976f8d URL: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-03T07:55:11+02:00 core: parse uri - check for invalid port values --- Modified: src/core/config.h Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… Patch: https://github.com/kamailio/kamailio/commit/b7f753ddc727e1d7ab42e7abe607059… --- diff --git a/src/core/config.h b/src/core/config.h index e54413b5bc..e012e98edf 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -96,6 +96,7 @@ #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1) +#define MAX_PORT_VAL 65535 #define MAX_PORT_LEN 7 /* ':' + max 5 letters + \0 */ #define CRLF "\r\n" diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 2c24054d2c..19f6f2e02a 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -143,6 +143,9 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) #define case_port( ch, var) \ case ch: \ (var)=(var)*10+ch-'0'; \ + if((var) > MAX_PORT_VAL) { \ + goto error_bad_port; \ + }\ break #define still_at_user \

1 0

git:master:1b47452c: pua_dialoginfo: skip requests that do not control call state
by Daniel-Constantin Mierla 03 Apr '21

03 Apr '21

Module: kamailio Branch: master Commit: 1b47452cebb1b7866cbbabd5068a9ff4a39c86d2 URL: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-03T07:56:40+02:00 pua_dialoginfo: skip requests that do not control call state - GH #2700 --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… Patch: https://github.com/kamailio/kamailio/commit/1b47452cebb1b7866cbbabd5068a9ff… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index cb5969a23e..a146b52d19 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -270,6 +270,11 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para type, dlg, dlginfo); return; } + + /* skip requests that do not control call state */ + if((request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { + return; + } if(include_req_uri) { uri = dlginfo->req_uri; } else {

1 0

[kamailio/kamailio] siptrace: duplicate_uri with multiple values (#2693)
by sergey-safarov 02 Apr '21

02 Apr '21

### Description As admin, I want check TLS encrypted call signaling on local Kamailio. To do this I can use [this instruction](https://voipembedded.wordpress.com/2021/03/22/troubleshooting-…. Here used `siptrace` module. But at the same time, I need to send the same call signaling to the company `Homer` server. So I need to send a copy of the call signaling in two directions. Could you add the ability to allow specify multiple values in `duplicate_uri` param like. ``` modparam("siptrace", "duplicate_uri", "<sip:127.0.0.1:9060>,<sip:homer.example.com:9060>") ``` -- 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/issues/2693

3 7

git:master:9413fc63: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: 9413fc6399d7e9b791ed0cb53172ab5fd887f0f6 URL: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-02T10:16:13+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… Patch: https://github.com/kamailio/kamailio/commit/9413fc6399d7e9b791ed0cb53172ab5… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 656a9315f2..783b57ba57 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -46,8 +46,8 @@ Frederic Gaisnon 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 4. Functions @@ -75,11 +75,11 @@ Frederic Gaisnon 1.10. Set contact_host parameter 1.11. Set contact_mode parameter 1.12. Set cparam_name parameter - 1.13. Set xavu_filed_a_contact parameter + 1.13. Set xavu_cfg parameter 1.14. Set xavu_filed_a_contact parameter 1.15. Set xavu_filed_b_contact parameter - 1.16. Set rr_update parameter - 1.17. Set xavu_field_contact_host parameter + 1.16. Set xavu_field_contact_host parameter + 1.17. Set rr_update parameter 1.18. Set context parameter 1.19. tps_set_context usage 1.20. Usage of event_route[topos:msg-outgoing] @@ -114,8 +114,8 @@ Chapter 1. Admin Guide 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 4. Functions @@ -184,8 +184,8 @@ Chapter 1. Admin Guide 3.13. xavu_cfg (str) 3.14. xavu_filed_a_contact (str) 3.15. xavu_filed_b_contact (str) - 3.16. rr_update (int) - 3.17. xavu_field_contact_host (str) + 3.16. xavu_field_contact_host (str) + 3.17. rr_update (int) 3.18. context (str) 3.1. storage (str) @@ -385,7 +385,7 @@ modparam("topos", "cparam_name", "xyz") Default value is “NULL” (disabled). - Example 1.13. Set xavu_filed_a_contact parameter + Example 1.13. Set xavu_cfg parameter ... modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_filed_a_contact", "a_contact") @@ -426,19 +426,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") ... -3.16. rr_update (int) - - If set to 1, topos module will track and update record route changes on - re-invite. - - Default value is 0 (do not update record route changes within dialog). - - Example 1.16. Set rr_update parameter -... -modparam("topos", "rr_update", 1) -... - -3.17. xavu_field_contact_host (str) +3.16. xavu_field_contact_host (str) Control from where to take the host part of the Contact header added by topos. This parameter allows to take the value from an XAVU during @@ -450,7 +438,7 @@ modparam("topos", "rr_update", 1) Default value is empty, not set. - Example 1.17. Set xavu_field_contact_host parameter + Example 1.16. Set xavu_field_contact_host parameter ... modparam("topos", "xavu_cfg", "_tps_") modparam("topos", "xavu_contact_host", "contact_host") @@ -458,6 +446,18 @@ modparam("topos", "xavu_contact_host", "contact_host") $xavu(_tps_=>contact_host) = "kamailio.org"; ... +3.17. rr_update (int) + + If set to 1, topos module will track and update record route changes on + re-invite. + + Default value is 0 (do not update record route changes within dialog). + + Example 1.17. Set rr_update parameter +... +modparam("topos", "rr_update", 1) +... + 3.18. context (str) Set the global context for topos instance.

1 0

git:master:a877e707: topos: docs - fixed title for xavu_cfg example [skip ci]
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: a877e707c7768307886c67a8c64a5c524eac06f4 URL: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T10:11:01+02:00 topos: docs - fixed title for xavu_cfg example [skip ci] - groupped xavu parameters --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… Patch: https://github.com/kamailio/kamailio/commit/a877e707c7768307886c67a8c64a5c5… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index ba622f13a6..b13902929f 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -393,7 +393,7 @@ modparam("topos", "cparam_name", "xyz") </emphasis> </para> <example> - <title>Set <varname>xavu_filed_a_contact</varname> parameter</title> + <title>Set <varname>xavu_cfg</varname> parameter</title> <programlisting format="linespecific"> ... modparam("topos", "xavu_cfg", "_tps_") @@ -449,26 +449,6 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") ... $xavu(_tps_=>b_contact) = "..."; -... -</programlisting> - </example> - </section> - <section id="topos.p.rr_update"> - <title><varname>rr_update</varname> (int)</title> - <para> - If set to 1, topos module will track and update record - route changes on re-invite. - </para> - <para> - <emphasis> - Default value is 0 (do not update record route changes within dialog). - </emphasis> - </para> - <example> - <title>Set <varname>rr_update</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("topos", "rr_update", 1) ... </programlisting> </example> @@ -500,6 +480,26 @@ modparam("topos", "xavu_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ... +</programlisting> + </example> + </section> + <section id="topos.p.rr_update"> + <title><varname>rr_update</varname> (int)</title> + <para> + If set to 1, topos module will track and update record + route changes on re-invite. + </para> + <para> + <emphasis> + Default value is 0 (do not update record route changes within dialog). + </emphasis> + </para> + <example> + <title>Set <varname>rr_update</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "rr_update", 1) +... </programlisting> </example> </section>

1 0

git:master:f95ede23: dmq: access val after being tested for null
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: f95ede239474f8c3b901f83e7eb34cbfa8f0e0fd URL: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T10:04:10+02:00 dmq: access val after being tested for null --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… Patch: https://github.com/kamailio/kamailio/commit/f95ede239474f8c3b901f83e7eb34cb… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 7d343b193b..79cc8ccbc9 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -365,14 +365,14 @@ static void destroy(void) static int dmq_add_notification_address(modparam_t type, void * val) { str tmp_str; - tmp_str.s = ((str*) val)->s; - tmp_str.len = ((str*) val)->len; int total_list = 0; /* not used */ if(val==NULL) { LM_ERR("invalid notification address parameter value\n"); return -1; } + tmp_str.s = ((str*) val)->s; + tmp_str.len = ((str*) val)->len; if(parse_uri(tmp_str.s, tmp_str.len, &dmq_notification_uri) < 0) { LM_ERR("could not parse notification address\n"); return -1;

1 0

git:master:d4e31e6a: core: parse uri - cast to unsigned for left shifting
by Daniel-Constantin Mierla 02 Apr '21

02 Apr '21

Module: kamailio Branch: master Commit: d4e31e6ae494836c49e50f463517a576b18c5611 URL: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-02T09:38:55+02:00 core: parse uri - cast to unsigned for left shifting --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… Patch: https://github.com/kamailio/kamailio/commit/d4e31e6ae494836c49e50f463517a57… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index ec39ea7cf2..2c24054d2c 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -26,6 +26,8 @@ */ +#include <stdint.h> + #include "../globals.h" #include "parse_uri.h" #include <string.h> @@ -124,7 +126,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) char* pass; int found_user; int error_headers; - unsigned int scheme; + uint32_t scheme; uri_type backup_urit; uri_flags backup_urif; @@ -386,9 +388,10 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) port_no=0; state=URI_INIT; memset(uri, 0, sizeof(struct sip_uri)); /* zero it all, just to be sure*/ - /*look for sip:, sips: ,tel: or urn:*/ + /*look for sip:, sips:, tel: or urn:*/ if (len<5) goto error_too_short; - scheme=buf[0]+(buf[1]<<8)+(buf[2]<<16)+(buf[3]<<24); + scheme=((uint32_t)buf[0]) + (((uint32_t)buf[1])<<8) + + (((uint32_t)buf[2])<<16) + (((uint32_t)buf[3])<<24); scheme|=0x20202020; if (scheme==SIP_SCH){ uri->type=SIP_URI_T;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev