sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:2c425c16: drouting: extra safety checks for str pointers
by Daniel-Constantin Mierla 14 May '15

14 May '15

Module: kamailio Branch: master Commit: 2c425c16efdc70e76d7471156f9f2c6eefa4b001 URL: https://github.com/kamailio/kamailio/commit/2c425c16efdc70e76d7471156f9f2c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T09:59:58+02:00 drouting: extra safety checks for str pointers --- Modified: modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/2c425c16efdc70e76d7471156f9f2c6… Patch: https://github.com/kamailio/kamailio/commit/2c425c16efdc70e76d7471156f9f2c6… --- diff --git a/modules/drouting/drouting.c b/modules/drouting/drouting.c index 1c94fe3..3c79f26 100644 --- a/modules/drouting/drouting.c +++ b/modules/drouting/drouting.c @@ -563,7 +563,7 @@ static inline str* build_ruri(struct sip_uri *uri, int strip, str *pri, } memcpy(p, uri->user.s+strip, uri->user.len-strip); p += uri->user.len-strip; - if (uri->passwd.len) { + if (uri->passwd.s && uri->passwd.len) { *(p++)=':'; memcpy(p, uri->passwd.s, uri->passwd.len); p += uri->passwd.len; @@ -571,12 +571,12 @@ static inline str* build_ruri(struct sip_uri *uri, int strip, str *pri, *(p++)='@'; memcpy(p, hostport->s, hostport->len); p += hostport->len; - if (uri->params.len) { + if (uri->params.s && uri->params.len) { *(p++)=';'; memcpy(p, uri->params.s, uri->params.len); p += uri->params.len; } - if (uri->headers.len) { + if (uri->headers.s && uri->headers.len) { *(p++)='?'; memcpy(p, uri->headers.s, uri->headers.len); p += uri->headers.len;

1 0

git:master:ed132241: tls: avoid compiler warning with extra check on char pointer
by Daniel-Constantin Mierla 14 May '15

14 May '15

Module: kamailio Branch: master Commit: ed1322414eb46c75b9db22e76b6f9e64ce191ad4 URL: https://github.com/kamailio/kamailio/commit/ed1322414eb46c75b9db22e76b6f9e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T09:55:20+02:00 tls: avoid compiler warning with extra check on char pointer --- Modified: modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/ed1322414eb46c75b9db22e76b6f9e6… Patch: https://github.com/kamailio/kamailio/commit/ed1322414eb46c75b9db22e76b6f9e6… --- diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 0d95a62..97b6356 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -1310,7 +1310,7 @@ tls_domain_t* tls_lookup_cfg(tls_domains_cfg_t* cfg, int type, } if ((p->port==0 || p->port == port) && ip_addr_cmp(&p->ip, ip)) { if(sname && sname->len>0) { - if(p->server_name.len==sname->len + if(p->server_name.s && p->server_name.len==sname->len && strncasecmp(p->server_name.s, sname->s, sname->len)==0) { LM_DBG("socket+server_name based TLS server domain found\n"); return p;

1 0

git:master:a318866c: ipops: init variables to avoid compiler warnings
by Daniel-Constantin Mierla 14 May '15

14 May '15

Module: kamailio Branch: master Commit: a318866c1c0efe4fb73d7f6c3cde538a67daa171 URL: https://github.com/kamailio/kamailio/commit/a318866c1c0efe4fb73d7f6c3cde538… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T09:51:07+02:00 ipops: init variables to avoid compiler warnings - use define wrapper for safety printing null strings --- Modified: modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a318866c1c0efe4fb73d7f6c3cde538… Patch: https://github.com/kamailio/kamailio/commit/a318866c1c0efe4fb73d7f6c3cde538… --- diff --git a/modules/ipops/ipops_pv.c b/modules/ipops/ipops_pv.c index 5010fd7..ecd3ced 100644 --- a/modules/ipops/ipops_pv.c +++ b/modules/ipops/ipops_pv.c @@ -861,7 +861,7 @@ int pv_parse_srv_name (pv_spec_t *sp, str *in) char *pstr; int i, pos, sign; srv_pv_t *dpv; - str pvi, pvk, pvn; + str pvi = {0}, pvk = {0}, pvn = {0}; /********** * o alloc/init pvid structure @@ -991,7 +991,7 @@ int pv_parse_srv_name (pv_spec_t *sp, str *in) if (skip_over (in, pos, 1) != in->len) goto error; LM_DBG ("srvquery (%.*s => %.*s [%.*s])\n", - pvn.len, pvn.s, pvk.len, pvk.s, pvi.len, pvi.s); + pvn.len, ZSW(pvn.s), pvk.len, ZSW(pvk.s), pvi.len, ZSW(pvi.s)); dpv->item = sr_srv_add_item (&pvn, 0); if (!dpv->item) goto error;

1 0

git:master:c7a8b95e: userblacklist: initialize vars to avoid compiler warnings
by Daniel-Constantin Mierla 14 May '15

14 May '15

Module: kamailio Branch: master Commit: c7a8b95e02e286335d3b1ff531a0d2245525e629 URL: https://github.com/kamailio/kamailio/commit/c7a8b95e02e286335d3b1ff531a0d22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T09:43:14+02:00 userblacklist: initialize vars to avoid compiler warnings --- Modified: modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/c7a8b95e02e286335d3b1ff531a0d22… Patch: https://github.com/kamailio/kamailio/commit/c7a8b95e02e286335d3b1ff531a0d22… --- diff --git a/modules/userblacklist/userblacklist.c b/modules/userblacklist/userblacklist.c index 1ece76f..17aebc2 100644 --- a/modules/userblacklist/userblacklist.c +++ b/modules/userblacklist/userblacklist.c @@ -695,9 +695,9 @@ static void dump_dtrie_mi(const struct dtrie_node_t *root, const unsigned int branches, char *prefix, int *length, struct mi_root *reply) { struct mi_node *crt_node; - unsigned int i; - char digit, *val; - int val_len; + unsigned int i; + char digit, *val = NULL; + int val_len = 0; /* Sanity check - should not reach here anyway */ if (NULL == root) {

1 0

git:master:8b4a8d6a: rtjson: removed unnecessary variable
by Daniel-Constantin Mierla 14 May '15

14 May '15

Module: kamailio Branch: master Commit: 8b4a8d6a9f06ab66e718f9b0956d17bfc374a1d5 URL: https://github.com/kamailio/kamailio/commit/8b4a8d6a9f06ab66e718f9b0956d17b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-14T09:38:13+02:00 rtjson: removed unnecessary variable - it was mistakenly used in some expressions --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/8b4a8d6a9f06ab66e718f9b0956d17b… Patch: https://github.com/kamailio/kamailio/commit/8b4a8d6a9f06ab66e718f9b0956d17b… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index f8d6fdf..71ac2e6 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -494,7 +494,6 @@ int rtjson_append_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) str path = {0}; struct socket_info* fsocket = NULL; unsigned int bflags = 0; - str val; rj = srjson_GetObjectItem(jdoc, nj, "uri"); if(rj==NULL || rj->type!=srjson_String || rj->valuestring==NULL) { @@ -502,17 +501,17 @@ int rtjson_append_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) } uri.s = rj->valuestring; - uri.len = strlen(val.s); + uri.len = strlen(uri.s); rj = srjson_GetObjectItem(jdoc, nj, "dst_uri"); if(rj!=NULL && rj->type==srjson_String && rj->valuestring!=NULL) { duri.s = rj->valuestring; - duri.len = strlen(val.s); + duri.len = strlen(duri.s); } rj = srjson_GetObjectItem(jdoc, nj, "path"); if(rj!=NULL && rj->type==srjson_String && rj->valuestring!=NULL) { path.s = rj->valuestring; - path.len = strlen(val.s); + path.len = strlen(path.s); } if (append_branch(msg, &uri, &duri, &path, 0, bflags,

1 0

[kamailio] quoted words reserved by mysql (#159)
by Oleksandr Dombrovskyi 13 May '15

13 May '15

Word **partition** is reserved by mysql. During the database creation this error appears: ``` ERROR 1064 (42000) at line 2: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'partition INT(11) DEFAULT 0 NOT NULL, CONSTRAINT ruid_idx UNIQUE (ruid) )' at line 24 ERROR: Creating core tables failed at registrar! ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/159 -- Commit Summary -- * quoted words reserved by mysql -- File Changes -- M utils/kamctl/mysql/registrar-create.sql (2) M utils/kamctl/mysql/usrloc-create.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/159.patch https://github.com/kamailio/kamailio/pull/159.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/159

5 11

git:master:cf1d885a: db_mysql: set back tick as quoting char for table and column names
by Daniel-Constantin Mierla 13 May '15

13 May '15

Module: kamailio Branch: master Commit: cf1d885ae8b7c75e41373a0a649a6eb1c161efc7 URL: https://github.com/kamailio/kamailio/commit/cf1d885ae8b7c75e41373a0a649a6eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-13T23:57:50+02:00 db_mysql: set back tick as quoting char for table and column names --- Modified: modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/cf1d885ae8b7c75e41373a0a649a6eb… Patch: https://github.com/kamailio/kamailio/commit/cf1d885ae8b7c75e41373a0a649a6eb… --- diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index b44ab55..fd576ff 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -183,7 +183,7 @@ int db_mysql_submit_query_async(const db1_con_t* _h, const str* _s) return 0; } - +static char *db_mysql_tquote = "`"; /** * Initialize the database module. * No function should be called before this @@ -192,7 +192,10 @@ int db_mysql_submit_query_async(const db1_con_t* _h, const str* _s) */ db1_con_t* db_mysql_init(const str* _url) { - return db_do_init(_url, (void *)db_mysql_new_connection); + db1_con_t *c; + c = db_do_init(_url, (void *)db_mysql_new_connection); + if(c) CON_TQUOTE(c) = db_mysql_tquote; + return c; } @@ -781,11 +784,12 @@ int db_mysql_abort_transaction(db1_con_t* _h) return -1; } - ret = snprintf(mysql_sql_buf, sql_buffer_size, "insert into %.*s (", CON_TABLE(_h)->len, CON_TABLE(_h)->s); + ret = snprintf(mysql_sql_buf, sql_buffer_size, "insert into %s%.*s%s (", + CON_TQUOTESZ(_h), CON_TABLE(_h)->len, CON_TABLE(_h)->s, CON_TQUOTESZ(_h)); if (ret < 0 || ret >= sql_buffer_size) goto error; off = ret; - ret = db_print_columns(mysql_sql_buf + off, sql_buffer_size - off, _k, _n); + ret = db_print_columns(mysql_sql_buf + off, sql_buffer_size - off, _k, _n, CON_TQUOTESZ(_h)); if (ret < 0) return -1; off += ret;

1 0

git:master:ffbe9c2c: lib/srdb1: mechanism to be able to quote table and column names
by Daniel-Constantin Mierla 13 May '15

13 May '15

Module: kamailio Branch: master Commit: ffbe9c2c0007cea5f6fd78dd14917be11643ac64 URL: https://github.com/kamailio/kamailio/commit/ffbe9c2c0007cea5f6fd78dd14917be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-13T23:55:35+02:00 lib/srdb1: mechanism to be able to quote table and column names - new field in db1_con_t with the char for quoting --- Modified: lib/srdb1/db_con.h Modified: lib/srdb1/db_query.c Modified: lib/srdb1/db_ut.c Modified: lib/srdb1/db_ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ffbe9c2c0007cea5f6fd78dd14917be… Patch: https://github.com/kamailio/kamailio/commit/ffbe9c2c0007cea5f6fd78dd14917be…

1 0

git:master:1da0f06d: modules/tm: removed no longer needed ASYNC mutex
by jaybeepee 13 May '15

13 May '15

Module: kamailio Branch: master Commit: 1da0f06d896ed8a99728846437322a3719241fbc URL: https://github.com/kamailio/kamailio/commit/1da0f06d896ed8a99728846437322a3… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-05-13T09:14:44+02:00 modules/tm: removed no longer needed ASYNC mutex --- Modified: modules/tm/h_table.h Modified: modules/tm/lock.c Modified: modules/tm/t_reply.c Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/1da0f06d896ed8a99728846437322a3… Patch: https://github.com/kamailio/kamailio/commit/1da0f06d896ed8a99728846437322a3…

2 1

git:master:eb889f41: evapi: use internal log functions and free io struct if client failed to connect
by Daniel-Constantin Mierla 13 May '15

13 May '15

Module: kamailio Branch: master Commit: eb889f41f036afb4248303fd6a1c7db393724c58 URL: https://github.com/kamailio/kamailio/commit/eb889f41f036afb4248303fd6a1c7db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-13T16:05:09+02:00 evapi: use internal log functions and free io struct if client failed to connect --- Modified: modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/eb889f41f036afb4248303fd6a1c7db… Patch: https://github.com/kamailio/kamailio/commit/eb889f41f036afb4248303fd6a1c7db… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 1ba1c0b..3029d77 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -332,12 +332,13 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent evapi_client = (struct ev_io*) malloc (sizeof(struct ev_io)); if(evapi_client==NULL) { - perror("no more memory\n"); + LM_ERR("no more memory\n"); return; } if(EV_ERROR & revents) { - perror("received invalid event\n"); + LM_ERR("received invalid event\n"); + free(evapi_client); return; } @@ -346,6 +347,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent if (csock < 0) { LM_ERR("cannot accept the client\n"); + free(evapi_client); return; } for(i=0; i<EVAPI_MAX_CLIENTS; i++) { @@ -357,6 +359,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent EVAPI_IPADDR_SIZE)==NULL) { LM_ERR("cannot convert ipv4 address\n"); close(csock); + free(evapi_client); return; } } else { @@ -366,6 +369,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent EVAPI_IPADDR_SIZE)==NULL) { LM_ERR("cannot convert ipv6 address\n"); close(csock); + free(evapi_client); return; } } @@ -378,6 +382,7 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent if(i==EVAPI_MAX_CLIENTS) { LM_ERR("too many clients\n"); close(csock); + free(evapi_client); return; } @@ -389,8 +394,10 @@ void evapi_accept_client(struct ev_loop *loop, struct ev_io *watcher, int revent evenv.eset = 1; evapi_run_cfg_route(&evenv, _evapi_rts.con_new); - if(_evapi_clients[i].connected == 0) + if(_evapi_clients[i].connected == 0) { + free(evapi_client); return; + } /* start watcher to read messages from whatchers */ ev_io_init(evapi_client, evapi_recv_client, csock, EV_READ);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015