sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

[kamailio/kamailio] db_postgress: insert_update() with DO NOTHING (#1039)

by Julien Chavanton

Why is insert_update doing nothing in Kamailio db insert_update ? As explained in the following article the design of "UPSERT" in PostgreSQL requires to be explicit about the constraint on which we accept to do update modification to Kamailio database framework/API would be required to expose which specific key constraint should be handled as an update http://pgeoghegan.blogspot.com/2015/10/avoid-naming-constraint-directly-whe… In this first step, DO NOTHING is providing the simple feature to ignore error on insert when facing a constraint violation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1039 -- Commit Summary -- * db_postgress: insert_update() with DO NOTHING -- File Changes -- M src/modules/db_postgres/db_postgres.c (1) M src/modules/db_postgres/db_postgres.h (2) M src/modules/db_postgres/km_dbase.c (83) M src/modules/db_postgres/km_dbase.h (5) M src/modules/db_postgres/km_pg_con.c (4) M src/modules/db_postgres/pg_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1039.patch https://github.com/kamailio/kamailio/pull/1039.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1039

7 years, 8 months

git:master:9d5c7509: ims_isc: Allow Regex in RURI-Field

by Carsten Bock

Module: kamailio Branch: master Commit: 9d5c7509cb5aadea98bfcabbd70f17668fc34a58 URL: https://github.com/kamailio/kamailio/commit/9d5c7509cb5aadea98bfcabbd70f176… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-03-22T22:54:30+01:00 ims_isc: Allow Regex in RURI-Field --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/9d5c7509cb5aadea98bfcabbd70f176… Patch: https://github.com/kamailio/kamailio/commit/9d5c7509cb5aadea98bfcabbd70f176… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index dd927c6..4461182 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -182,6 +182,40 @@ static int isc_check_session_desc(ims_spt *spt, struct sip_msg *msg) { } /** + * Check if a Service Point Trigger for RURI matches the RURI of a message + * @param spt - the service point trigger + * @param msg - the message + * @returns - 1 on success, 0 on failure + */ +static int isc_check_ruri(ims_spt *spt, struct sip_msg *msg) { + char buf[256]; + regex_t comp; + + if (spt->request_uri.len >= sizeof(buf)) { + LM_ERR("RURI \"%.*s\" is to long to be processed (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + + /* compile the regex for content */ + memcpy(buf, spt->request_uri.s, spt->request_uri.len); + buf[spt->request_uri.len] = 0; + if(regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + LM_ERR("Error compiling the following regexp for RURI content: %.*s\n", spt->request_uri.len, spt->request_uri.s); + return FALSE; + } + + if (regexec(&(comp), buf, 0, NULL, 0) == 0) //regex match + { + regfree(&(comp)); + return TRUE; + } + regfree(&(comp)); + return FALSE; +} + + + +/** * Check if a Service Point Trigger matches a message * @param spt - the service point trigger * @param msg - the message @@ -198,8 +232,7 @@ static int isc_check_spt(ims_spt *spt, struct sip_msg *msg, char direction, spt->type, spt->request_uri.len, spt->request_uri.s); LM_DBG("ifc_check_spt: Found Request URI %.*s \n", msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s); - r = (strncasecmp(spt->request_uri.s, msg->first_line.u.request.uri.s, - spt->request_uri.len) == 0); + r = isc_check_ruri(spt, msg); break; case IFC_METHOD: LM_DBG("ifc_check_spt: SPT type %d -> Method == %.*s ?\n",

7 years, 8 months

git:master:3525d6ec: ims_registrar_pcscf: Fix check for following Service-Routes (Route Header present, but only pointing locally)

by Carsten Bock

Module: kamailio Branch: master Commit: 3525d6ec7f9fc719651a97e8a9779f13eb14d0fd URL: https://github.com/kamailio/kamailio/commit/3525d6ec7f9fc719651a97e8a9779f1… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-03-22T13:57:14+01:00 ims_registrar_pcscf: Fix check for following Service-Routes (Route Header present, but only pointing locally) --- Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/3525d6ec7f9fc719651a97e8a9779f1… Patch: https://github.com/kamailio/kamailio/commit/3525d6ec7f9fc719651a97e8a9779f1… --- diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c index dfb1627..9c5eba8 100644 --- a/src/modules/ims_registrar_pcscf/service_routes.c +++ b/src/modules/ims_registrar_pcscf/service_routes.c @@ -413,6 +413,10 @@ int check_service_routes(struct sip_msg* _m, udomain_t* _d) { } LM_DBG("num_routes is %d\n", num_routes); + if (num_routes == 0) { + LM_DBG("Request doesn't have any route headers (except those pointing here), to check service-route...ignoring\n"); + goto error; + } for (i=0; i<num_routes; i++) { LM_DBG("route %d for checking is %s\n", i, routes[i]); }

7 years, 8 months

git:4.4:fc4cfe98: siptrace: avoid creating proxy structure twice in trace_send_duplicate()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: fc4cfe984ef160db96e206c45610b05fe32aa455 URL: https://github.com/kamailio/kamailio/commit/fc4cfe984ef160db96e206c45610b05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-21T13:19:30+01:00 siptrace: avoid creating proxy structure twice in trace_send_duplicate() - can happen when dst parameter is given, resulting in mem leak - related to GH #1040 (cherry picked from commit 8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359) (cherry picked from commit 97c6e811814e85b9845993a6b41994f70c57d2c4) --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/fc4cfe984ef160db96e206c45610b05… Patch: https://github.com/kamailio/kamailio/commit/fc4cfe984ef160db96e206c45610b05… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index 4594e25..29bd60d 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1594,19 +1594,9 @@ static int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) return 0; init_dest_info(&dst); - /* create a temporary proxy*/ - dst.proto = PROTO_UDP; - p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, - dst.proto); - if (p==0) - { - LM_ERR("bad host name in uri\n"); - return -1; - } if (!dst2){ - init_dest_info(&dst); - /* create a temporary proxy*/ + /* create a temporary proxy from dst param */ dst.proto = PROTO_UDP; p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, dst.proto); @@ -1622,6 +1612,16 @@ static int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) " listening socket\n", dst.to.s.sa_family, dst.proto); goto error; } + } else { + /* create a temporary proxy to dup uri */ + dst.proto = PROTO_UDP; + p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, + dst.proto); + if (p==0) + { + LM_ERR("bad host name in uri\n"); + return -1; + } } if (msg_send((dst2)?dst2:&dst, buf, len)<0)

7 years, 8 months

git:5.0:97c6e811: siptrace: avoid creating proxy structure twice in trace_send_duplicate()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 97c6e811814e85b9845993a6b41994f70c57d2c4 URL: https://github.com/kamailio/kamailio/commit/97c6e811814e85b9845993a6b41994f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-21T13:16:20+01:00 siptrace: avoid creating proxy structure twice in trace_send_duplicate() - can happen when dst parameter is given, resulting in mem leak - related to GH #1040 (cherry picked from commit 8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/97c6e811814e85b9845993a6b41994f… Patch: https://github.com/kamailio/kamailio/commit/97c6e811814e85b9845993a6b41994f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index cfe281d..dae72d7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1617,19 +1617,9 @@ static int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) return 0; init_dest_info(&dst); - /* create a temporary proxy*/ - dst.proto = PROTO_UDP; - p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, - dst.proto); - if (p==0) - { - LM_ERR("bad host name in uri\n"); - return -1; - } if (!dst2){ - init_dest_info(&dst); - /* create a temporary proxy*/ + /* create a temporary proxy from dst param */ dst.proto = PROTO_UDP; p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, dst.proto); @@ -1645,6 +1635,16 @@ static int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) " listening socket\n", dst.to.s.sa_family, dst.proto); goto error; } + } else { + /* create a temporary proxy to dup uri */ + dst.proto = PROTO_UDP; + p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, + dst.proto); + if (p==0) + { + LM_ERR("bad host name in uri\n"); + return -1; + } } if (msg_send((dst2)?dst2:&dst, buf, len)<0)

7 years, 8 months

git:master:8cd0f0be: siptrace: avoid creating proxy structure twice in trace_send_duplicate()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8cd0f0be8bda6a903eab8c0ef610cb00b8ba8359 URL: https://github.com/kamailio/kamailio/commit/8cd0f0be8bda6a903eab8c0ef610cb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-21T12:28:47+01:00 siptrace: avoid creating proxy structure twice in trace_send_duplicate() - can happen when dst parameter is given, resulting in mem leak - related to GH #1040 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/8cd0f0be8bda6a903eab8c0ef610cb0… Patch: https://github.com/kamailio/kamailio/commit/8cd0f0be8bda6a903eab8c0ef610cb0… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fbddf23..c4b1076 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1619,19 +1619,9 @@ static int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) return 0; init_dest_info(&dst); - /* create a temporary proxy*/ - dst.proto = PROTO_UDP; - p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, - dst.proto); - if (p==0) - { - LM_ERR("bad host name in uri\n"); - return -1; - } if (!dst2){ - init_dest_info(&dst); - /* create a temporary proxy*/ + /* create a temporary proxy from dst param */ dst.proto = PROTO_UDP; p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, dst.proto); @@ -1647,6 +1637,16 @@ static int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) " listening socket\n", dst.to.s.sa_family, dst.proto); goto error; } + } else { + /* create a temporary proxy to dup uri */ + dst.proto = PROTO_UDP; + p=mk_proxy(&dup_uri->host, (dup_uri->port_no)?dup_uri->port_no:SIP_PORT, + dst.proto); + if (p==0) + { + LM_ERR("bad host name in uri\n"); + return -1; + } } if (msg_send((dst2)?dst2:&dst, buf, len)<0)

7 years, 8 months

git:4.4:eb67c0ad: textops: safety check of allocated memory inside append_time_request_f()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: eb67c0ada2934f2d212645e8a7315eec6e368c4f URL: https://github.com/kamailio/kamailio/commit/eb67c0ada2934f2d212645e8a7315ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-21T02:52:58+01:00 textops: safety check of allocated memory inside append_time_request_f() - reported by GH #1040 (cherry picked from commit a51a32633429d761f8bc742386b6f6bcb6b38522) (cherry picked from commit 0ff6b710d0a5729778b3de1a15666e29d73aec56) --- Modified: modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/eb67c0ada2934f2d212645e8a7315ee… Patch: https://github.com/kamailio/kamailio/commit/eb67c0ada2934f2d212645e8a7315ee… --- diff --git a/modules/textops/textops.c b/modules/textops/textops.c index b209e36..2fc341c 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -1214,6 +1214,10 @@ static int append_time_request_f(struct sip_msg* msg, char* p1, char *p2) } time_str.s = pkg_malloc(MAX_TIME); + if(time_str.s==NULL) { + LM_ERR("no more pkg memory\n"); + goto error; + } time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, bd_time); if (time_str.len>MAX_TIME-2 || time_str.len==0) { LM_ERR("unexpected time length\n");

7 years, 8 months

git:5.0:0ff6b710: textops: safety check of allocated memory inside append_time_request_f()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 0ff6b710d0a5729778b3de1a15666e29d73aec56 URL: https://github.com/kamailio/kamailio/commit/0ff6b710d0a5729778b3de1a15666e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-21T02:43:06+01:00 textops: safety check of allocated memory inside append_time_request_f() - reported by GH #1040 (cherry picked from commit a51a32633429d761f8bc742386b6f6bcb6b38522) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/0ff6b710d0a5729778b3de1a15666e2… Patch: https://github.com/kamailio/kamailio/commit/0ff6b710d0a5729778b3de1a15666e2… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 9338fac..1ebc20d 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1214,6 +1214,10 @@ static int append_time_request_f(struct sip_msg* msg, char* p1, char *p2) } time_str.s = pkg_malloc(MAX_TIME); + if(time_str.s==NULL) { + LM_ERR("no more pkg memory\n"); + goto error; + } time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, bd_time); if (time_str.len>MAX_TIME-2 || time_str.len==0) { LM_ERR("unexpected time length\n");

7 years, 8 months

git:master:a51a3263: textops: safety check of allocated memory inside append_time_request_f()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a51a32633429d761f8bc742386b6f6bcb6b38522 URL: https://github.com/kamailio/kamailio/commit/a51a32633429d761f8bc742386b6f6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-21T02:39:00+01:00 textops: safety check of allocated memory inside append_time_request_f() - reported by GH #1040 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/a51a32633429d761f8bc742386b6f6b… Patch: https://github.com/kamailio/kamailio/commit/a51a32633429d761f8bc742386b6f6b… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 9338fac..1ebc20d 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1214,6 +1214,10 @@ static int append_time_request_f(struct sip_msg* msg, char* p1, char *p2) } time_str.s = pkg_malloc(MAX_TIME); + if(time_str.s==NULL) { + LM_ERR("no more pkg memory\n"); + goto error; + } time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, bd_time); if (time_str.len>MAX_TIME-2 || time_str.len==0) { LM_ERR("unexpected time length\n");

7 years, 8 months

[kamailio/kamailio] app_perl.so: undefined symbol: sv2int_str (#1012)

by Alistair Cunningham

When attempting to start Kamailio 5.0.0 with the app_perl module, it fails to start and logs: Mar 1 10:20:04 albatross kamailio: DEBUG: <core> [core/sr_module.c:575]: load_module(): trying to load </lib64/kamailio/m odules/app_perl.so> Mar 1 10:20:04 albatross kamailio: ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </lib64/kam ailio/modules/app_perl.so>: /lib64/kamailio/modules/app_perl.so: undefined symbol: sv2int_str Mar 1 10:20:04 albatross kamailio: CRITICAL: <core> [core/cfg.y:3400]: yyerror_at(): parse error in config file /opt/ensw itch/current/etc/kamailio/kamailio_50.cfg, line 28, column 12-21: failed to load module The machine is Ubuntu 16.10, line 28 of kamailio_50.cfg is: loadmodule "app_perl" and the other options passed to app_perl are: modparam( "app_perl", "filename", "/opt/enswitch/current/perllib/Integrics/Enswitch/Kamailio.pm" ) modparam( "app_perl", "modpath", "/opt/enswitch/current/perllib" ) modparam( "app_perl", "reset_cycles", 100000 ) modparam( "app_perl", "perl_destroy_func", "Integrics::Enswitch::Kamailio::restart" ) This problem does not happen on the same machine with Kamailio 4.2.1 and an identical configuration file. -- 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/1012

7 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2017