sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
411 discussions

git:master:97db3ee6: db_mysql: safer conditions inside sb_add() for db api v2
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 97db3ee61079de6cc2466628dae0f5e489819e98 URL: https://github.com/kamailio/kamailio/commit/97db3ee61079de6cc2466628dae0f5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T09:19:06+02:00 db_mysql: safer conditions inside sb_add() for db api v2 --- Modified: src/modules/db_mysql/my_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/97db3ee61079de6cc2466628dae0f5e… Patch: https://github.com/kamailio/kamailio/commit/97db3ee61079de6cc2466628dae0f5e… --- diff --git a/src/modules/db_mysql/my_cmd.c b/src/modules/db_mysql/my_cmd.c index 7872568b29..8502e6d323 100644 --- a/src/modules/db_mysql/my_cmd.c +++ b/src/modules/db_mysql/my_cmd.c @@ -372,8 +372,10 @@ static inline int sb_add(struct string_buffer *sb, str *nstr) int rsize = sb->len + nstr->len; int asize; char *newp; - - if ( rsize > sb->size ) { + + if(nstr->len==0) return 0; + + if ( sb->s==NULL || rsize > sb->size ) { asize = rsize - sb->size; new_size = sb->size + (asize / sb->increment + (asize % sb->increment > 0)) * sb->increment; newp = pkg_malloc(new_size); @@ -423,6 +425,9 @@ static int build_update_cmd(str* sql_cmd, db_cmd_t* cmd) rv = sb_add(&sql_buf, &strings[STR_UPDATE]); /* "UPDATE " */ rv |= sb_add(&sql_buf, &cmd->table); /* table name */ rv |= sb_add(&sql_buf, &strings[STR_SET]); /* " SET " */ + if (rv) { + goto err; + } /* column name-value pairs */ for(i = 0, fld = cmd->vals; !DB_FLD_LAST(fld[i]); i++) {

1 0

git:master:22fc924a: avp: clear code for unsupported parameter format
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 22fc924aa928fe126156290a10c4be8048ba4f8b URL: https://github.com/kamailio/kamailio/commit/22fc924aa928fe126156290a10c4be8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T09:19:06+02:00 avp: clear code for unsupported parameter format --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/22fc924aa928fe126156290a10c4be8… Patch: https://github.com/kamailio/kamailio/commit/22fc924aa928fe126156290a10c4be8… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index d6c8b3323d..1b13dd492b 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1385,39 +1385,9 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(param_no == 1) { c = *param; if(*c == '#') { - c++; - n = strtol(c, &params, 10); - switch(*params) { - case PARAM_DELIM: - break; - case 0: - params = 0; - break; - default: - LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad AVP value\n"); - return E_CFG; - } - switch(n) { - // case HDR_xxx: - // case HDR_xxx: - // break; - default: - LOG(L_ERR, "attr_hdr_body2attrs_fixup: header name is not " - "valid and supported HDR_xxx id '%s' resolved " - "as %d\n", - c, n); - return E_CFG; - } - h = pkg_malloc(sizeof(hdr_name_t)); - if(!h) { - LOG(L_ERR, "attr_hdr_body2attrs_fixup: out of memory\n"); - return E_OUT_OF_MEM; - } - - h->kind = HDR_ID; - h->name.n = n; - pkg_free(*param); - + LOG(L_ERR, "attr_hdr_body2attrs_fixup: header name is not " + "valid '%s'\n", c); + return E_CFG; } else { params = strchr(c, PARAM_DELIM); if(params)

1 0

git:master:afe6d712: app_python: removed condition on classname, it cannot be null
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: afe6d712d5ef52ac6f3fe8e6f69406779e3a740e URL: https://github.com/kamailio/kamailio/commit/afe6d712d5ef52ac6f3fe8e6f694067… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T09:19:06+02:00 app_python: removed condition on classname, it cannot be null --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/afe6d712d5ef52ac6f3fe8e6f694067… Patch: https://github.com/kamailio/kamailio/commit/afe6d712d5ef52ac6f3fe8e6f694067… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 73651ba8cf..64f59fcc07 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -410,7 +410,7 @@ static int child_init(int rank) if (!PyErr_Occurred()) PyErr_Format(PyExc_TypeError, "method '%s' of class '%s' should return 'int' type", - child_init_mname.s, !classname ? "None" : classname); + child_init_mname.s, classname); python_handle_exception("child_init"); Py_DECREF(format_exc_obj); Py_XDECREF(pResult);

1 0

git:master:9219b211: db_postgres: fix typo and whitespace
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 9219b2116fc2887c0c8c2ad39465087e324784fb URL: https://github.com/kamailio/kamailio/commit/9219b2116fc2887c0c8c2ad39465087… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T23:18:20+02:00 db_postgres: fix typo and whitespace --- Modified: src/modules/db_postgres/pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/9219b2116fc2887c0c8c2ad39465087… Patch: https://github.com/kamailio/kamailio/commit/9219b2116fc2887c0c8c2ad39465087… --- diff --git a/src/modules/db_postgres/pg_con.c b/src/modules/db_postgres/pg_con.c index 851685d353..c03ce3bd3c 100644 --- a/src/modules/db_postgres/pg_con.c +++ b/src/modules/db_postgres/pg_con.c @@ -1,4 +1,4 @@ -/* +/* * PostgreSQL Database Driver for Kamailio * * Portions Copyright (C) 2001-2003 FhG FOKUS @@ -23,10 +23,10 @@ */ /** \addtogroup postgres - * @{ + * @{ */ -/** \file +/** \file * Functions related to connections to PostgreSQL servers. */ @@ -46,7 +46,7 @@ #include <time.h> -/* Override the default notice processor to output the messages +/* Override the default notice processor to output the messages * using SER's output subsystem. */ static void notice_processor(void* arg, const char* message) @@ -55,7 +55,7 @@ static void notice_processor(void* arg, const char* message) } -/** Determine the format of timestamps used by the server. +/** Determine the format of timestamps used by the server. * A PostgresSQL server can be configured to store timestamps either as 8-byte * integers or floating point numbers with double precision. This functions * sends a simple SQL query to the server and tries to determine the format of @@ -97,9 +97,9 @@ static int timestamp_format(PGconn* con) } val = PQgetvalue(res, 0, 0); - offset = ((unsigned long long)ntohl(((unsigned int*)val)[0]) << 32) + offset = ((unsigned long long)ntohl(((unsigned int*)val)[0]) << 32) + ntohl(((unsigned int*)val)[1]); - + PQclear(res); /* Server using int8 timestamps would return 1000000, because it stores @@ -117,7 +117,7 @@ static int timestamp_format(PGconn* con) DBG("postgres: Server uses double format for timestamps.\n"); return 0; } - + error: PQclear(res); return -1; @@ -166,12 +166,12 @@ static int get_oids(db_con_t* con) static void pg_con_free(db_con_t* con, struct pg_con* payload) { if (!payload) return; - + /* Delete the structure only if there are no more references * to it in the connection pool */ if (db_pool_remove((db_pool_entry_t*)payload) == 0) return; - + db_pool_entry_free(&payload->gen); pg_destroy_oid_table(payload->oid); if (payload->con) PQfinish(payload->con); @@ -236,10 +236,10 @@ int pg_con_connect(db_con_t* con) int ret, i = 0; const char *keywords[10], *values[10]; char to[16]; - + pcon = DB_GET_PAYLOAD(con); puri = DB_GET_PAYLOAD(con->uri); - + /* Do not reconnect already connected connections */ if (pcon->flags & PG_CONNECTED) return 0; @@ -277,25 +277,25 @@ int pg_con_connect(db_con_t* con) keywords[i] = values[i] = NULL; pcon->con = PQconnectdbParams(keywords, values, 1); - + if (pcon->con == NULL) { ERR("postgres: PQconnectdbParams ran out of memory\n"); goto error; } - + if (PQstatus(pcon->con) != CONNECTION_OK) { ERR("postgres: %s\n", PQerrorMessage(pcon->con)); goto error; } - + /* Override default notice processor */ PQsetNoticeProcessor(pcon->con, notice_processor, 0); - + #ifdef HAVE_PGSERVERVERSION - DBG("postgres: Connected. Protocol version=%d, Server version=%d\n", + DBG("postgres: Connected. Protocol version=%d, Server version=%d\n", PQprotocolVersion(pcon->con), PQserverVersion(pcon->con)); #else - DBG("postgres: Connected. Protocol version=%d, Server version=%d\n", + DBG("postgres: Connected. Protocol version=%d, Server version=%d\n", PQprotocolVersion(pcon->con), 0 ); #endif @@ -308,7 +308,7 @@ int pg_con_connect(db_con_t* con) } if(setsockopt(PQsocket(pcon->con), IPPROTO_TCP, TCP_KEEPIDLE, &pg_keepalive, sizeof(pg_keepalive))<0) { - M_WARN("failed to set socket option keepidle\n"); + LM_WARN("failed to set socket option keepidle\n"); } } #endif

1 0

[kamailio/kamailio] db_postgres: fix typo and whitespace (#1190)
by Emmanuel Schmidbauer 27 Jul '17

27 Jul '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1190 -- Commit Summary -- * db_postgres: fix typo and whitespace -- File Changes -- M src/modules/db_postgres/pg_con.c (38) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1190.patch https://github.com/kamailio/kamailio/pull/1190.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/1190

2 2

git:master:34d0c5df: Merge pull request #1191 from mslehto/sipcapture-byteorder
by GitHub 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 34d0c5df45a6281847dddb9d67e42dac50150fbe URL: https://github.com/kamailio/kamailio/commit/34d0c5df45a6281847dddb9d67e42da… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-27T22:03:16+02:00 Merge pull request #1191 from mslehto/sipcapture-byteorder sipcapture: byteorder fixes --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/34d0c5df45a6281847dddb9d67e42da… Patch: https://github.com/kamailio/kamailio/commit/34d0c5df45a6281847dddb9d67e42da…

1 0

git:master:dac238ac: sipcapture: add missing or invalid byte order conversion
by Mikko Lehto 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: dac238ac3fdf2d0f47d6915508160b8160e9ab11 URL: https://github.com/kamailio/kamailio/commit/dac238ac3fdf2d0f47d6915508160b8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-27T22:43:04+03:00 sipcapture: add missing or invalid byte order conversion --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/dac238ac3fdf2d0f47d6915508160b8… Patch: https://github.com/kamailio/kamailio/commit/dac238ac3fdf2d0f47d6915508160b8… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index c05180ecd8..8040b6680c 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -989,13 +989,14 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch case 12: hg->capt_id = (hep_chunk_uint32_t *) (tmp); - ret = pv_get_uintval(msg, param, res, ntohs(hg->capt_id->data)); + ret = pv_get_uintval(msg, param, res, ntohl(hg->capt_id->data)); goto done; case 13: hg->keep_tm = (hep_chunk_uint16_t *) (tmp); - ret = pv_get_uintval(msg, param, res, hg->keep_tm->data); + ret = pv_get_uintval(msg, param, res, ntohs(hg->keep_tm->data)); goto done; + case 14: tmpstr.s = (char *) tmp + sizeof(hep_chunk_t); tmpstr.len = chunk_length - sizeof(hep_chunk_t);

1 0

git:master:6e43bf84: sipcapture: remove excess byte order conversion
by Mikko Lehto 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 6e43bf84a2afc4e83ce33b7a416d7b81f7dd5658 URL: https://github.com/kamailio/kamailio/commit/6e43bf84a2afc4e83ce33b7a416d7b8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-27T22:41:12+03:00 sipcapture: remove excess byte order conversion - buffer pointer `tmp` in hepv3_get_chunk() was assigned to hg->time_(Âµ)sec - therefore everytime route script calls pseudovariables, part of original `buf` was byte converted --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/6e43bf84a2afc4e83ce33b7a416d7b8… Patch: https://github.com/kamailio/kamailio/commit/6e43bf84a2afc4e83ce33b7a416d7b8…

1 0

git:master:6ddca2e0: ctl: remove useless assignment
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 6ddca2e08bc8159ed00c80f6857df58c81cbd97d URL: https://github.com/kamailio/kamailio/commit/6ddca2e08bc8159ed00c80f6857df58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T18:20:12+02:00 ctl: remove useless assignment --- Modified: src/modules/ctl/ctrl_socks.c --- Diff: https://github.com/kamailio/kamailio/commit/6ddca2e08bc8159ed00c80f6857df58… Patch: https://github.com/kamailio/kamailio/commit/6ddca2e08bc8159ed00c80f6857df58… --- diff --git a/src/modules/ctl/ctrl_socks.c b/src/modules/ctl/ctrl_socks.c index 4449ff7c76..1538346206 100644 --- a/src/modules/ctl/ctrl_socks.c +++ b/src/modules/ctl/ctrl_socks.c @@ -271,7 +271,6 @@ int init_ctrl_sockets(struct ctrl_socket** c_lst, struct id_list* lst, cs->transport=l->proto; cs->p_proto=l->data_proto; cs->fd=s; - s = -1; cs->write_fd=extra_fd; /* needed for fifo write */ cs->name=l->name; cs->port=l->port;

1 0

git:master:59234b8f: core: dns cache - safety check for out of bounds index
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 59234b8fae1295455e347e27519813e63bf8ffb0 URL: https://github.com/kamailio/kamailio/commit/59234b8fae1295455e347e27519813e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T18:20:12+02:00 core: dns cache - safety check for out of bounds index --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/59234b8fae1295455e347e27519813e… Patch: https://github.com/kamailio/kamailio/commit/59234b8fae1295455e347e27519813e… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index e8bfd7f5e6..8c054e0e54 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2333,19 +2333,30 @@ inline static struct dns_rr* dns_srv_get_nxt_rr(struct dns_hash_entry* e, * extra checks */ for (i=0; (i<idx) && (r_sums[i].r_sum<rand_w); i++); found: + if(i<MAX_SRV_GRP_IDX) { #ifdef DNS_CACHE_DEBUG - LM_DBG("(%p, %lx, %d, %u): selected %d/%d in grp. %d" - " (rand_w=%d, rr=%p rd=%p p=%d w=%d rsum=%d)\n", - e, (unsigned long)*tried, *no, now, i, idx, n, rand_w, r_sums[i].rr, - (r_sums[i].rr)?r_sums[i].rr->rdata:0, - (r_sums[i].rr&&r_sums[i].rr->rdata)?((struct srv_rdata*)r_sums[i].rr->rdata)->priority:0, - (r_sums[i].rr&&r_sums[i].rr->rdata)?((struct srv_rdata*)r_sums[i].rr->rdata)->weight:0, - r_sums[i].r_sum); + LM_DBG("(%p, %lx, %d, %u): selected %d/%d in grp. %d" + " (rand_w=%d, rr=%p rd=%p p=%d w=%d rsum=%d)\n", + e, (unsigned long)*tried, *no, now, i, idx, n, rand_w, + r_sums[i].rr, (r_sums[i].rr) ? r_sums[i].rr->rdata : 0, + (r_sums[i].rr && r_sums[i].rr->rdata) + ? ((struct srv_rdata *)r_sums[i].rr->rdata)->priority + : 0, + (r_sums[i].rr && r_sums[i].rr->rdata) + ? ((struct srv_rdata *)r_sums[i].rr->rdata)->weight + : 0, + r_sums[i].r_sum); #endif - /* i is the winner */ - *no=n; /* grp. start */ - if(i<8*sizeof(*tried)) srv_mark_tried(tried, i); /* mark it */ - return r_sums[i].rr; + /* i is the winner */ + *no = n; /* grp. start */ + if(i < 8 * sizeof(*tried)) + srv_mark_tried(tried, i); /* mark it */ + return r_sums[i].rr; + } else { + LM_WARN("index out of bounds\n"); + *no=n; + return 0; + } no_more_rrs: *no=n; return 0;

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017