sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

[kamailio/kamailio] pkg/kamailio: Fixed systemd unit failure on server boot (#1148)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1148 -- Commit Summary -- * pkg/kamailio: Fixed systemd unit failure on server boot -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (4) M pkg/kamailio/fedora/17/kamailio.service (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1148.patch https://github.com/kamailio/kamailio/pull/1148.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/1148

6 years, 9 months

git:4.4:d447aca2: pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: d447aca24fef404f0ad5449542c3da615498cb2c URL: https://github.com/kamailio/kamailio/commit/d447aca24fef404f0ad5449542c3da6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:56:29+02:00 pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 --- Modified: pkg/kamailio/centos/7/kamailio.service Modified: pkg/kamailio/fedora/17/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/d447aca24fef404f0ad5449542c3da6… Patch: https://github.com/kamailio/kamailio/commit/d447aca24fef404f0ad5449542c3da6… --- diff --git a/pkg/kamailio/centos/7/kamailio.service b/pkg/kamailio/centos/7/kamailio.service index 5e4e67a660..9de06c43b0 100644 --- a/pkg/kamailio/centos/7/kamailio.service +++ b/pkg/kamailio/centos/7/kamailio.service @@ -14,7 +14,7 @@ PIDFile=/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid -Restart=on-abort +Restart=on-failure User=kamailio Group=daemon ; For each TCP or TLS endpoint connection is requred file descriptor diff --git a/pkg/kamailio/fedora/17/kamailio.service b/pkg/kamailio/fedora/17/kamailio.service index a8d59b0c0c..2f4ac95df5 100644 --- a/pkg/kamailio/fedora/17/kamailio.service +++ b/pkg/kamailio/fedora/17/kamailio.service @@ -8,7 +8,7 @@ EnvironmentFile=/etc/sysconfig/kamailio PIDFile=/var/run/kamailio.pid ExecStart=/usr/sbin/kamailio -P /var/run/kamailio.pid $OPTIONS ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid -Restart=on-abort +Restart=on-failure [Install] WantedBy=multi-user.target

6 years, 9 months

[kamailio/kamailio] pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 (#1198)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1198 -- Commit Summary -- * pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (2) M pkg/kamailio/fedora/17/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1198.patch https://github.com/kamailio/kamailio/pull/1198.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/1198

6 years, 9 months

git:master:af30ab2d: pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: af30ab2dcd6d67bc86f9ce86be0abf9014cbfd8d URL: https://github.com/kamailio/kamailio/commit/af30ab2dcd6d67bc86f9ce86be0abf9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:55:25+02:00 pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 --- Modified: pkg/kamailio/centos/7/kamailio.service Modified: pkg/kamailio/fedora/17/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/af30ab2dcd6d67bc86f9ce86be0abf9… Patch: https://github.com/kamailio/kamailio/commit/af30ab2dcd6d67bc86f9ce86be0abf9… --- diff --git a/pkg/kamailio/centos/7/kamailio.service b/pkg/kamailio/centos/7/kamailio.service index bde8608137..1117e41608 100644 --- a/pkg/kamailio/centos/7/kamailio.service +++ b/pkg/kamailio/centos/7/kamailio.service @@ -16,7 +16,7 @@ PIDFile=/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY ExecStopPost=/usr/bin/rm -f /run/kamailio/kamailio.pid -Restart=on-abort +Restart=on-failure User=kamailio Group=daemon ; For each TCP or TLS endpoint connection is requred file descriptor diff --git a/pkg/kamailio/fedora/17/kamailio.service b/pkg/kamailio/fedora/17/kamailio.service index 4b2039b818..61457e5fd6 100644 --- a/pkg/kamailio/fedora/17/kamailio.service +++ b/pkg/kamailio/fedora/17/kamailio.service @@ -10,7 +10,7 @@ EnvironmentFile=/etc/sysconfig/kamailio PIDFile=/var/run/kamailio.pid ExecStart=/usr/sbin/kamailio -P /var/run/kamailio.pid $OPTIONS ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid -Restart=on-abort +Restart=on-failure [Install] WantedBy=multi-user.target

6 years, 9 months

[kamailio/kamailio] pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 (#1197)

by sergey-safarov

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1197 -- Commit Summary -- * pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (2) M pkg/kamailio/fedora/17/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1197.patch https://github.com/kamailio/kamailio/pull/1197.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/1197

6 years, 9 months

git:master:5e098077: carrierroute: avoid ovverruning a fixed sized buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e098077525b2d06834a03f69ea246835af6f11c URL: https://github.com/kamailio/kamailio/commit/5e098077525b2d06834a03f69ea2468… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: avoid ovverruning a fixed sized buffer --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/5e098077525b2d06834a03f69ea2468… Patch: https://github.com/kamailio/kamailio/commit/5e098077525b2d06834a03f69ea2468… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index bab8bab41f..ff183e85f5 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -1074,14 +1074,19 @@ static int cr_rpc_dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, char s[256]; char rbuf[1024]; char *p; - int i; + int i,len; struct route_flags *rf; struct route_rule *rr; struct route_rule_p_list * rl; double prob; + len=strlen(prefix); + if (len > 254) { + LM_ERR("prefix too large"); + return -1; + } strcpy (s, prefix); - p = s + strlen (s); + p = s + len; p[1] = '\0'; for (i = 0; i < cr_match_mode; ++i) { if (node->child[i] != NULL) { @@ -1101,7 +1106,7 @@ static int cr_rpc_dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, } snprintf(rbuf, 1024, "%10s: %0.3f %%, '%.*s': %s, '%i', '%.*s', '%.*s', '%.*s'", - strlen(prefix) > 0 ? prefix : "NULL", prob * 100, + len > 0 ? prefix : "NULL", prob * 100, rr->host.len, rr->host.s, (rr->status ? "ON" : "OFF"), rr->strip, rr->local_prefix.len, rr->local_prefix.s,

6 years, 9 months

git:master:9c793833: carrierroute: avoid truncating value returned by fgetc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9c793833f4b56f02cf692533ad515d87d6341bf4 URL: https://github.com/kamailio/kamailio/commit/9c793833f4b56f02cf692533ad515d8… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: avoid truncating value returned by fgetc --- Modified: src/modules/carrierroute/cr_config.c --- Diff: https://github.com/kamailio/kamailio/commit/9c793833f4b56f02cf692533ad515d8… Patch: https://github.com/kamailio/kamailio/commit/9c793833f4b56f02cf692533ad515d8… --- diff --git a/src/modules/carrierroute/cr_config.c b/src/modules/carrierroute/cr_config.c index 2d1af1ecfe..40523d9544 100644 --- a/src/modules/carrierroute/cr_config.c +++ b/src/modules/carrierroute/cr_config.c @@ -111,7 +111,8 @@ static int init_prefix_opts(){ static int backup_config(void) { FILE * from, * to; - char * backup_file, ch; + char * backup_file; + int ch; LM_INFO("start configuration backup\n"); if((backup_file = pkg_malloc(strlen(config_file) + strlen (".bak") + 1)) == NULL){ PKG_MEM_ERROR;

6 years, 9 months

git:master:f152fc45: carrierroute: check return value for fseek

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f152fc4586b42fb8a26b01d0c40e41e143972b9a URL: https://github.com/kamailio/kamailio/commit/f152fc4586b42fb8a26b01d0c40e41e… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: check return value for fseek --- Modified: src/modules/carrierroute/parser_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/f152fc4586b42fb8a26b01d0c40e41e… Patch: https://github.com/kamailio/kamailio/commit/f152fc4586b42fb8a26b01d0c40e41e… --- diff --git a/src/modules/carrierroute/parser_carrierroute.c b/src/modules/carrierroute/parser_carrierroute.c index 535e1f9f19..c6fbf933f9 100644 --- a/src/modules/carrierroute/parser_carrierroute.c +++ b/src/modules/carrierroute/parser_carrierroute.c @@ -236,7 +236,10 @@ int parse_options(FILE* file, option_description* opts, int no_options, char* en /* parsing stops when end_str is reached: e.g: }, target */ if ( strncmp(data.s, end_str, strlen(end_str)) == 0){ LM_DBG("End of options list received \n"); - fseek(file, -full_line_len, SEEK_CUR); + if (fseek(file, -full_line_len, SEEK_CUR) != 0){ + LM_ERR("fseek failed: %s",strerror(errno)); + break; + } ret = SUCCESSFUL_PARSING; break; } @@ -385,9 +388,11 @@ int parse_struct_header(FILE* file, char* expected_struct_type, str* struct_name memcpy(struct_name->s, name, struct_name->len); struct_name->s[struct_name->len]='\0'; } - else - fseek(file, -full_line_len, SEEK_CUR); - + else{ + if (fseek(file, -full_line_len, SEEK_CUR) != 0){ + LM_ERR("fseek failed: %s",strerror(errno)); + } + } return ret; }

6 years, 9 months

git:master:40615aaa: carrierroute: avoid comparing size_t types with negative values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 40615aaa64a6a2b3affa112502bec58eda47d9a0 URL: https://github.com/kamailio/kamailio/commit/40615aaa64a6a2b3affa112502bec58… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: avoid comparing size_t types with negative values --- Modified: src/modules/carrierroute/cr_db.c --- Diff: https://github.com/kamailio/kamailio/commit/40615aaa64a6a2b3affa112502bec58… Patch: https://github.com/kamailio/kamailio/commit/40615aaa64a6a2b3affa112502bec58… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 1668cdda55..d651db1b49 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -280,15 +280,17 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } - if((rd->carrier_num = load_carrier_map(rd)) <= 0){ + if((ret = load_carrier_map(rd)) <= 0){ LM_ERR("error while retrieving carriers\n"); goto errout; } + rd->carrier_num = (size_t)ret; - if((rd->domain_num = load_domain_map(rd)) <= 0){ + if((ret = load_domain_map(rd)) <= 0){ LM_ERR("error while retrieving domains\n"); goto errout; } + rd->domain_num = (size_t)ret; if ((rd->carriers = shm_malloc(sizeof(struct carrier_data_t *) * rd->carrier_num)) == NULL) { SHM_MEM_ERROR;

6 years, 9 months

git:master:f7f5b95f: carrieroute: remove logically dead code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f7f5b95f402e3bc3a5caa4e096a1ebdb165b20eb URL: https://github.com/kamailio/kamailio/commit/f7f5b95f402e3bc3a5caa4e096a1ebd… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrieroute: remove logically dead code --- Modified: src/modules/carrierroute/cr_func.c --- Diff: https://github.com/kamailio/kamailio/commit/f7f5b95f402e3bc3a5caa4e096a1ebd… Patch: https://github.com/kamailio/kamailio/commit/f7f5b95f402e3bc3a5caa4e096a1ebd… --- diff --git a/src/modules/carrierroute/cr_func.c b/src/modules/carrierroute/cr_func.c index cfa614645c..6b6db1387b 100644 --- a/src/modules/carrierroute/cr_func.c +++ b/src/modules/carrierroute/cr_func.c @@ -673,12 +673,7 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, } carrier_data=NULL; - if (carrier_id < 0) { - if (cfg_get(carrierroute, carrierroute_cfg, fallback_default)) { - LM_NOTICE("invalid tree id %i specified, using default tree\n", carrier_id); - carrier_data = get_carrier_data(rd, rd->default_carrier_id); - } - } else if (carrier_id == 0) { + if (carrier_id == 0) { carrier_data = get_carrier_data(rd, rd->default_carrier_id); } else { carrier_data = get_carrier_data(rd, carrier_id); @@ -889,12 +884,7 @@ int cr_load_next_domain(struct sip_msg * _msg, gparam_t *_carrier, } carrier_data=NULL; - if (carrier_id < 0) { - if (cfg_get(carrierroute, carrierroute_cfg, fallback_default)) { - LM_NOTICE("invalid tree id %i specified, using default tree\n", carrier_id); - carrier_data = get_carrier_data(rd, rd->default_carrier_id); - } - } else if (carrier_id == 0) { + if (carrier_id == 0) { carrier_data = get_carrier_data(rd, rd->default_carrier_id); } else { carrier_data = get_carrier_data(rd, carrier_id);

6 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017