sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:master:47f1ff4d: core: parser/parse_diversion - allow comma separated bodies

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47f1ff4d31101c8a8d16a08b3c2f1069b85b3d47 URL: https://github.com/kamailio/kamailio/commit/47f1ff4d31101c8a8d16a08b3c2f106… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T09:39:57+01:00 core: parser/parse_diversion - allow comma separated bodies - still only the first body is cacshed in msg->diversion - reported by GH #841 --- Modified: parser/parse_diversion.c --- Diff: https://github.com/kamailio/kamailio/commit/47f1ff4d31101c8a8d16a08b3c2f106… Patch: https://github.com/kamailio/kamailio/commit/47f1ff4d31101c8a8d16a08b3c2f106… --- diff --git a/parser/parse_diversion.c b/parser/parse_diversion.c index cc60600..4578087 100644 --- a/parser/parse_diversion.c +++ b/parser/parse_diversion.c @@ -13,20 +13,21 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! \file * \brief Parser :: Diversion header - * + * * \ingroup parser */ - + #include <stdlib.h> -#include <string.h> +#include <string.h> #include "../dprint.h" #include "../ut.h" #include "../mem/mem.h" @@ -40,41 +41,49 @@ * params: msg : sip msg * returns 0 on success, * -1 on failure. + * + * limitations: it parses only the first occurence */ int parse_diversion_header(struct sip_msg *msg) { - struct to_body* diversion_b; - - if (!msg->diversion && (parse_headers(msg, HDR_DIVERSION_F, 0) == -1 || - !msg->diversion)) { - goto error; - } - - /* maybe the header is already parsed! */ - if (msg->diversion->parsed) - return 0; - - /* bad luck! :-( - we have to parse it */ - /* first, get some memory */ - diversion_b = pkg_malloc(sizeof(struct to_body)); - if (diversion_b == 0) { - LOG(L_ERR, "ERROR:parse_diversion_header: out of pkg_memory\n"); - goto error; - } - - /* now parse it!! */ - memset(diversion_b, 0, sizeof(struct to_body)); - parse_to(msg->diversion->body.s, msg->diversion->body.s + msg->diversion->body.len + 1, diversion_b); - if (diversion_b->error == PARSE_ERROR) { - LOG(L_ERR, "ERROR:parse_diversion_header: bad diversion header\n"); - free_to(diversion_b); - goto error; - } - msg->diversion->parsed = diversion_b; - - return 0; - error: - return -1; + struct to_body* diversion_b; + + if (!msg->diversion && (parse_headers(msg, HDR_DIVERSION_F, 0) == -1)) { + goto error; + } + + if (!msg->diversion) { + /* header not found */ + return -1; + } + + /* maybe the header is already parsed! */ + if (msg->diversion->parsed) + return 0; + + /* bad luck! :-( - we have to parse it */ + /* first, get some memory */ + diversion_b = pkg_malloc(sizeof(struct to_body)); + if (diversion_b == 0) { + LM_ERR("out of pkg_memory\n"); + goto error; + } + + /* now parse it!! */ + memset(diversion_b, 0, sizeof(struct to_body)); + parse_addr_spec(msg->diversion->body.s, + msg->diversion->body.s + msg->diversion->body.len + 1, + diversion_b, 1); + if (diversion_b->error == PARSE_ERROR) { + LM_ERR("bad diversion header\n"); + free_to(diversion_b); + goto error; + } + msg->diversion->parsed = diversion_b; + + return 0; +error: + return -1; } @@ -83,22 +92,22 @@ int parse_diversion_header(struct sip_msg *msg) */ str *get_diversion_param(struct sip_msg *msg, str* name) { - struct to_param *params; + struct to_param *params; - if (parse_diversion_header(msg) < 0) { - ERR("could not get diversion parameter\n"); + if (parse_diversion_header(msg) < 0) { + LM_ERR("could not get diversion parameter\n"); return 0; - } + } - params = ((struct to_body*)(msg->diversion->parsed))->param_lst; + params = ((struct to_body*)(msg->diversion->parsed))->param_lst; - while (params) { + while (params) { if ((params->name.len == name->len) && - (strncmp(params->name.s, name->s, name->len) == 0)) { + (strncmp(params->name.s, name->s, name->len) == 0)) { return &params->value; } params = params->next; - } - - return 0; + } + + return 0; }

8 years

git:master:cfcc10a8: app_python: adjusted the realloc size to char pointers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cfcc10a809feb89c2365c6cacec72ae01ee3888a URL: https://github.com/kamailio/kamailio/commit/cfcc10a809feb89c2365c6cacec72ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T18:11:17+01:00 app_python: adjusted the realloc size to char pointers --- Modified: modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/cfcc10a809feb89c2365c6cacec72ae… Patch: https://github.com/kamailio/kamailio/commit/cfcc10a809feb89c2365c6cacec72ae… --- diff --git a/modules/app_python/python_support.c b/modules/app_python/python_support.c index 28f92da..47b4640 100644 --- a/modules/app_python/python_support.c +++ b/modules/app_python/python_support.c @@ -184,14 +184,14 @@ char *make_message(const char *fmt, ...) va_list ap; size = 100; /* Guess we need no more than 100 bytes. */ - p = (char *)pkg_realloc(NULL, size * sizeof(char *)); + p = (char *)pkg_realloc(NULL, size * sizeof(char)); if (!p) { LM_ERR("Can't allocate memory (%lu bytes), pkg_malloc() has failed:" - " Not enough memory.\n", (unsigned long)(size * sizeof(char *))); + " Not enough memory.\n", (unsigned long)(size * sizeof(char))); return NULL; } - memset(p, 0, size * sizeof(char *)); + memset(p, 0, size * sizeof(char)); while (1) { @@ -207,11 +207,11 @@ char *make_message(const char *fmt, ...) else /* glibc 2.0 */ size *= 2; - np = (char *)pkg_realloc(p, size * sizeof(char *)); + np = (char *)pkg_realloc(p, size * sizeof(char)); if (!np) { LM_ERR("Can't allocate memory (%lu bytes), pkg_realloc() has failed:" - " Not enough memory.\n", (unsigned long)size * sizeof(char *)); + " Not enough memory.\n", (unsigned long)size * sizeof(char)); if (p) pkg_free(p); return NULL;

8 years

git:master:30cdc11f: janssonrpc-c: declare variables at beginning of netstring_read_fd()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 30cdc11f30e10bca5821609d86d31ffc1b5bd3c8 URL: https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:37:08+01:00 janssonrpc-c: declare variables at beginning of netstring_read_fd() --- Modified: modules/janssonrpc-c/netstring.c --- Diff: https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ff… Patch: https://github.com/kamailio/kamailio/commit/30cdc11f30e10bca5821609d86d31ff… --- diff --git a/modules/janssonrpc-c/netstring.c b/modules/janssonrpc-c/netstring.c index a559224..7414f0d 100644 --- a/modules/janssonrpc-c/netstring.c +++ b/modules/janssonrpc-c/netstring.c @@ -141,12 +141,14 @@ int netstring_read_fd(int fd, netstring_t **netstring) int bytes, offset; size_t read_len; char *temp_buffer; + int total; + int i, len; + char peek[10]={0}; temp_buffer = NULL; offset = 0; if (*netstring == NULL) { /* No buffer yet. Peek at first 10 bytes, to get length and colon. */ - char peek[10]={0}; bytes = recv(fd,peek,10,MSG_PEEK); if (bytes < 3) return NETSTRING_INCOMPLETE; @@ -158,7 +160,6 @@ int netstring_read_fd(int fd, netstring_t **netstring) /* The netstring must start with a number */ if (!isdigit(peek[0])) return NETSTRING_ERROR_NO_LENGTH; - int i, len; len = i = 0; /* Read the number of bytes */ @@ -194,7 +195,8 @@ int netstring_read_fd(int fd, netstring_t **netstring) /* Read from the socket */ bytes = recv(fd, temp_buffer, read_len, 0); - int total = (*netstring)->read += bytes; + (*netstring)->read += bytes; + total = (*netstring)->read; /* See if we have the whole netstring yet */ if (read_len > bytes) {

8 years

git:master:6b1d18c3: rr: removed unused assignment

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6b1d18c3ba184b60a7be567f23ba4cda6efee4af URL: https://github.com/kamailio/kamailio/commit/6b1d18c3ba184b60a7be567f23ba4cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:33:16+01:00 rr: removed unused assignment --- Modified: modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/6b1d18c3ba184b60a7be567f23ba4cd… Patch: https://github.com/kamailio/kamailio/commit/6b1d18c3ba184b60a7be567f23ba4cd… --- diff --git a/modules/rr/record.c b/modules/rr/record.c index 6c7cc05..2f93adf 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -686,7 +686,6 @@ static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_d } memcpy(p, _data->s, _data->len); - p += _data->len; p = suffix; if (tag && tag->len) {

8 years

git:master:d7871cd8: core: parser/sdp - init pf variable to avoid compile time warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7871cd82e22bfe8444e2d150b38565265343223 URL: https://github.com/kamailio/kamailio/commit/d7871cd82e22bfe8444e2d150b38565… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:30:18+01:00 core: parser/sdp - init pf variable to avoid compile time warnings --- Modified: parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/d7871cd82e22bfe8444e2d150b38565… Patch: https://github.com/kamailio/kamailio/commit/d7871cd82e22bfe8444e2d150b38565… --- diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 1e53940..e6708d8 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -375,6 +375,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ * - shorcut useful for multi-part bodies and sdp operations */ _sdp->text = *sdp_body; + pf = AF_INET; /* * Parsing of SDP body.

8 years

git:master:64d3d1de: app_python: fixed realloc size for local buf variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64d3d1de13666277e3b1bd707e05880e63fd6ccf URL: https://github.com/kamailio/kamailio/commit/64d3d1de13666277e3b1bd707e05880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:23:00+01:00 app_python: fixed realloc size for local buf variables - removed unreachable code --- Modified: modules/app_python/apy_kemi.c Modified: modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/64d3d1de13666277e3b1bd707e05880… Patch: https://github.com/kamailio/kamailio/commit/64d3d1de13666277e3b1bd707e05880… --- diff --git a/modules/app_python/apy_kemi.c b/modules/app_python/apy_kemi.c index 431b0d9..fd4ed7f 100644 --- a/modules/app_python/apy_kemi.c +++ b/modules/app_python/apy_kemi.c @@ -542,8 +542,6 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) fname.len, fname.s); return sr_kemi_apy_return_false(); } - - return sr_kemi_apy_return_false(); } /** diff --git a/modules/app_python/python_support.c b/modules/app_python/python_support.c index fd5a4a6..28f92da 100644 --- a/modules/app_python/python_support.c +++ b/modules/app_python/python_support.c @@ -114,7 +114,7 @@ void python_handle_exception(const char *fmt, ...) msglen = strlen(msg); buflen += ++msglen; - buf = (char *)pkg_realloc(buf, buflen * sizeof(char *)); + buf = (char *)pkg_realloc(buf, buflen * sizeof(char)); if (!buf) { LM_ERR("Can't allocate memory (%lu bytes), pkg_realloc() has failed."

8 years

git:master:27ba383b: sipcapture: initialize variable to get rid of compile warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 27ba383b5aaabd84c25653a887738d06532fcf9f URL: https://github.com/kamailio/kamailio/commit/27ba383b5aaabd84c25653a887738d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:19:56+01:00 sipcapture: initialize variable to get rid of compile warning --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/27ba383b5aaabd84c25653a887738d0… Patch: https://github.com/kamailio/kamailio/commit/27ba383b5aaabd84c25653a887738d0… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 955e036..19ffbe6 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2496,7 +2496,7 @@ static int report_capture(struct sip_msg *msg, str *_table, str* _corr, str *_d struct timezone tz; char tmp_node[100]; time_t epoch_time_as_time_t; - str corrtmp, tmp; + str corrtmp = STR_NULL, tmp; _capture_mode_data_t *c = NULL;

8 years

git:master:d4f3c96c: mi_datagram: safety check so the length of mi socket doesn't result in overflow

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d4f3c96cdf2efc8db8fa115a35f7ea9545ea4c9f URL: https://github.com/kamailio/kamailio/commit/d4f3c96cdf2efc8db8fa115a35f7ea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:14:41+01:00 mi_datagram: safety check so the length of mi socket doesn't result in overflow --- Modified: modules/mi_datagram/mi_datagram.c --- Diff: https://github.com/kamailio/kamailio/commit/d4f3c96cdf2efc8db8fa115a35f7ea9… Patch: https://github.com/kamailio/kamailio/commit/d4f3c96cdf2efc8db8fa115a35f7ea9… --- diff --git a/modules/mi_datagram/mi_datagram.c b/modules/mi_datagram/mi_datagram.c index 3260420..a06e2f2 100644 --- a/modules/mi_datagram/mi_datagram.c +++ b/modules/mi_datagram/mi_datagram.c @@ -200,7 +200,7 @@ static int mi_mod_init(void) LM_ERR("invalid port number; must be in [1024,%d]\n",MAX_NB_PORT); return -1; } - + if(! (host = resolvehost(host_s)) ) { LM_ERR("failed to resolve %s\n", host_s); return -1; @@ -212,10 +212,10 @@ static int mi_mod_init(void) } mi_socket_domain = host->h_addrtype; goto done; - } + } /* in case of a Unix socket*/ LM_DBG("we have an UNIX socket\n"); - + n=stat(mi_socket, &filestat); if( n==0) { LM_INFO("the socket %s already exists, trying to delete it...\n", mi_socket); @@ -235,14 +235,14 @@ static int mi_mod_init(void) LM_WARN("cannot specify mi_unix_socket_mode = 0, forcing it to rw-------\n"); mi_unix_socket_mode = S_IRUSR| S_IWUSR; } - + if (mi_unix_socket_uid_s) { if (user2uid(&mi_unix_socket_uid, &mi_unix_socket_gid, mi_unix_socket_uid_s)<0) { LM_ERR("bad user name %s\n", mi_unix_socket_uid_s); return -1; } } - + if (mi_unix_socket_gid_s) { if (group2gid(&mi_unix_socket_gid, mi_unix_socket_gid_s)<0) { LM_ERR("bad group name %s\n", mi_unix_socket_gid_s); @@ -252,7 +252,11 @@ static int mi_mod_init(void) /*create the unix socket address*/ mi_dtgram_addr.unix_addr.sun_family = AF_LOCAL; - memcpy( mi_dtgram_addr.unix_addr.sun_path, mi_socket, strlen(mi_socket)); + if(strlen(mi_socket)>=sizeof(mi_dtgram_addr.unix_addr.sun_path)-1) { + LM_ERR("mi socket path is too long\n"); + return -1; + } + memcpy(mi_dtgram_addr.unix_addr.sun_path, mi_socket, strlen(mi_socket)); done: /* add space for extra processes */ @@ -369,7 +373,7 @@ static int mi_destroy(void) if (n==0) { if(config_check==0) { if (unlink(mi_socket)<0){ - LM_ERR("cannot delete the socket (%s): %s\n", + LM_ERR("cannot delete the socket (%s): %s\n", mi_socket, strerror(errno)); goto error; }

8 years

git:master:96fea675: domain: fixed typo in the log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 96fea675022cc923e4f253454b5095fa810ab313 URL: https://github.com/kamailio/kamailio/commit/96fea675022cc923e4f253454b5095f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:07:54+01:00 domain: fixed typo in the log message - fixed warning on allocating hash_table with a different size than the content of the pointer - coherent indentation and whitespacing --- Modified: modules/domain/domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/96fea675022cc923e4f253454b5095f… Patch: https://github.com/kamailio/kamailio/commit/96fea675022cc923e4f253454b5095f…

8 years

git:master:4ad97857: Makefile.defs: version set to 5.0.0-dev7

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4ad97857d346c4dddf02e7164d8bd9c5a2e1af26 URL: https://github.com/kamailio/kamailio/commit/4ad97857d346c4dddf02e7164d8bd9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-01T15:03:30+01:00 Makefile.defs: version set to 5.0.0-dev7 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/4ad97857d346c4dddf02e7164d8bd9c… Patch: https://github.com/kamailio/kamailio/commit/4ad97857d346c4dddf02e7164d8bd9c… --- diff --git a/Makefile.defs b/Makefile.defs index 582fb38..70f5d40 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -102,7 +102,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -dev7 # memory manager switcher # 0 - f_malloc (fast malloc)

8 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016