sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:4572a7b1: mangler: pkg free in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4572a7b100f2eaddb2eb4dbe4aa81a4833f8467e URL: https://github.com/kamailio/kamailio/commit/4572a7b100f2eaddb2eb4dbe4aa81a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 mangler: pkg free in case of errors --- Modified: src/modules/mangler/contact_ops.c Modified: src/modules/mangler/ip_helper.c Modified: src/modules/mangler/sdp_mangler.c --- Diff: https://github.com/kamailio/kamailio/commit/4572a7b100f2eaddb2eb4dbe4aa81a4… Patch: https://github.com/kamailio/kamailio/commit/4572a7b100f2eaddb2eb4dbe4aa81a4…

6 years, 11 months

git:master:73a288e1: janssonrpcc: couple of pkg free in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 73a288e14ec8f7a67662842140d5eb02819b7738 URL: https://github.com/kamailio/kamailio/commit/73a288e14ec8f7a67662842140d5eb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 janssonrpcc: couple of pkg free in case of errors --- Modified: src/modules/janssonrpcc/janssonrpc_connect.c Modified: src/modules/janssonrpcc/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/73a288e14ec8f7a67662842140d5eb0… Patch: https://github.com/kamailio/kamailio/commit/73a288e14ec8f7a67662842140d5eb0… --- diff --git a/src/modules/janssonrpcc/janssonrpc_connect.c b/src/modules/janssonrpcc/janssonrpc_connect.c index a65323d30a..83fd4530e8 100644 --- a/src/modules/janssonrpcc/janssonrpc_connect.c +++ b/src/modules/janssonrpcc/janssonrpc_connect.c @@ -111,14 +111,15 @@ typedef struct server_backoff_args { void server_backoff_cb(int fd, short event, void *arg) { + unsigned int timeout; + server_backoff_args_t* a; + if(!arg) return; - server_backoff_args_t* a = (server_backoff_args_t*)arg; - if(!a) - return; + a = (server_backoff_args_t*)arg; - unsigned int timeout = a->timeout; + timeout = a->timeout; /* exponential backoff */ if(timeout < 1) { diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 018f03e977..4708a75a87 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -231,8 +231,10 @@ void fail_request(int code, jsonrpc_request_t* req, char* err_str) end: if(freeme) free(freeme); - free_req_cmd(req->cmd); - free_request(req); + if(req) { + if(req->cmd) free_req_cmd(req->cmd); + free_request(req); + } } void timeout_cb(int fd, short event, void *arg) @@ -354,13 +356,18 @@ void loadbalance_by_weight(jsonrpc_server_t** s, int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) { - char* json = (char*)json_dumps(req->payload, JSON_COMPACT); - - char* ns; + char* json = NULL; + bool sent = false; + char* ns = NULL; size_t bytes; + + json = (char*)json_dumps(req->payload, JSON_COMPACT); + if(json==NULL) { + LM_ERR("failed to do json dump for request payload\n"); + return -1; + } bytes = netstring_encode_new(&ns, json, (size_t)strlen(json)); - bool sent = false; jsonrpc_server_group_t* c_grp = NULL; if(global_server_group != NULL) c_grp = *global_server_group; @@ -426,7 +433,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) free_server_list(tried_servers); if(ns) pkg_free(ns); - if(json) free(json); + free(json); if (sent) { if (notify_only == true) { // free the request if using janssonrpc_notification function @@ -520,6 +527,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) if(freeme) free(freeme); if(error) json_decref(error); free_req_cmd(req_cmd); + if(req) pkg_free(req); goto end; } @@ -740,9 +748,6 @@ void bev_read_cb(struct bufferevent* bev, void* arg) case NETSTRING_ERROR_NO_LENGTH: msg = "missing length field"; break; - case NETSTRING_INCOMPLETE: - msg = "incomplete"; - break; default: ERR("bad netstring: unknown error (%d)\n", retval); goto reconnect;

6 years, 11 months

git:master:9fe84d4a: http_client: use strcpy() instead of strncpy() with sizeof dest buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9fe84d4ad1ec1eae6bcf44b4067b948d9a16e4dc URL: https://github.com/kamailio/kamailio/commit/9fe84d4ad1ec1eae6bcf44b4067b948… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 http_client: use strcpy() instead of strncpy() with sizeof dest buffer - padding the rest of dest buffer with 0 is inneficient --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/9fe84d4ad1ec1eae6bcf44b4067b948… Patch: https://github.com/kamailio/kamailio/commit/9fe84d4ad1ec1eae6bcf44b4067b948… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index c4fc39d6a4..1bdae25df7 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -344,16 +344,14 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, LM_DBG("We received Content-Type: %s\n", ct); if (params->pconn && strlen(ct)<sizeof(params->pconn->result_content_type)-1) { - strncpy(params->pconn->result_content_type, ct, - sizeof(params->pconn->result_content_type)); + strcpy(params->pconn->result_content_type, ct); } } if(url) { LM_DBG("We visited URL: %s\n", url); if (params->pconn && strlen(url)<sizeof(params->pconn->redirecturl)-1) { - strncpy(params->pconn->redirecturl, url , - sizeof(params->pconn->redirecturl)); + strcpy(params->pconn->redirecturl, url); } } }

6 years, 11 months

git:master:b6c6da62: h350: coherent indentation, removed dead code and init lenght for str

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b6c6da62fe9879a43a322ce7f9adac3eef5674e7 URL: https://github.com/kamailio/kamailio/commit/b6c6da62fe9879a43a322ce7f9adac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 h350: coherent indentation, removed dead code and init lenght for str --- Modified: src/modules/h350/h350_exp_fn.c Modified: src/modules/h350/h350_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b6c6da62fe9879a43a322ce7f9adac3… Patch: https://github.com/kamailio/kamailio/commit/b6c6da62fe9879a43a322ce7f9adac3…

6 years, 11 months

git:master:49362355: modules: readme files regenerated - avpops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 49362355065d8f2aa5a58cf0b44aebf485015418 URL: https://github.com/kamailio/kamailio/commit/49362355065d8f2aa5a58cf0b44aebf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-28T10:16:22+02:00 modules: readme files regenerated - avpops ... [skip ci] --- Modified: src/modules/avpops/README Modified: src/modules/kex/README Modified: src/modules/pv/README Modified: src/modules/rtpproxy/README Modified: src/modules/xlog/README --- Diff: https://github.com/kamailio/kamailio/commit/49362355065d8f2aa5a58cf0b44aebf… Patch: https://github.com/kamailio/kamailio/commit/49362355065d8f2aa5a58cf0b44aebf…

6 years, 11 months

git:master:cbe051d7: sctp: remove svn tags and history notes

by Mikko Lehto

Module: kamailio Branch: master Commit: cbe051d7cd02b31c385b93284251d0a8daeeacc7 URL: https://github.com/kamailio/kamailio/commit/cbe051d7cd02b31c385b93284251d0a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-28T10:50:57+03:00 sctp: remove svn tags and history notes --- Modified: src/modules/sctp/sctp_ev.h Modified: src/modules/sctp/sctp_mod.c Modified: src/modules/sctp/sctp_options.c Modified: src/modules/sctp/sctp_options.h Modified: src/modules/sctp/sctp_rpc.c Modified: src/modules/sctp/sctp_rpc.h Modified: src/modules/sctp/sctp_server.c Modified: src/modules/sctp/sctp_server.h Modified: src/modules/sctp/sctp_sockopts.h Modified: src/modules/sctp/sctp_stats.c Modified: src/modules/sctp/sctp_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/cbe051d7cd02b31c385b93284251d0a… Patch: https://github.com/kamailio/kamailio/commit/cbe051d7cd02b31c385b93284251d0a…

6 years, 11 months

git:master:aabba814: modules: use Docbook tag for Kamailio wiki URL

by Mikko Lehto

Module: kamailio Branch: master Commit: aabba8141410a25a19667a3aa750f88081a04bd9 URL: https://github.com/kamailio/kamailio/commit/aabba8141410a25a19667a3aa750f88… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-28T10:50:57+03:00 modules: use Docbook tag for Kamailio wiki URL --- Modified: src/modules/avpops/doc/avpops_admin.xml Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/xlog/doc/xlog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aabba8141410a25a19667a3aa750f88… Patch: https://github.com/kamailio/kamailio/commit/aabba8141410a25a19667a3aa750f88… --- diff --git a/src/modules/avpops/doc/avpops_admin.xml b/src/modules/avpops/doc/avpops_admin.xml index 343ffa6796..f2c0175601 100644 --- a/src/modules/avpops/doc/avpops_admin.xml +++ b/src/modules/avpops/doc/avpops_admin.xml @@ -856,9 +856,7 @@ avp_copy("$avp(old)","$avp(new)/gd"); Prints the formatted string 'format' in the AVP 'dest'. The 'format' parameter can include any pseudo-variable defined in &kamailio;. The list with all pseudo-variables in &kamailio; can - be found at: - <ulink url="http://kamailio.org/dokuwiki/"> - http://kamailio.org/dokuwiki/</ulink>. + be found at: &kamwikilink; </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 08e8ff8794..e370f5eba3 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -17,8 +17,7 @@ <title>Overview</title> <para> This module collects the core pseudo-variables that can be used in - configuration file. They are listed in Dokuwiki: - <ulink url="http://www.kamailio.org/wiki/">http://www.kamailio.org/wiki/</ulink>, + configuration file. They are listed in wiki: &kamwikilink; in Pseudo-Variables section </para> </section> diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index b03b8ecd58..225b5a80c4 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -54,9 +54,7 @@ </itemizedlist> <para> The full list of available pseudo-variables in &kamailio; is - available at: - <ulink url="http://kamailio.org/wiki/"> - http://kamailio.org/wiki/</ulink> + available at: &kamwikilink; </para> </section> <section>

6 years, 11 months

git:master:25b4d2be: (core|modules/kex): improve RPC method listing

by Mikko Lehto

Module: kamailio Branch: master Commit: 25b4d2be8121cfff67013810f3dd0c124713c9de URL: https://github.com/kamailio/kamailio/commit/25b4d2be8121cfff67013810f3dd0c1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-28T10:50:57+03:00 (core|modules/kex): improve RPC method listing --- Modified: src/core/core_cmd.c Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/25b4d2be8121cfff67013810f3dd0c1… Patch: https://github.com/kamailio/kamailio/commit/25b4d2be8121cfff67013810f3dd0c1…

6 years, 11 months

git:master:436899e7: rtpproxy: fix docbook tags

by Mikko Lehto

Module: kamailio Branch: master Commit: 436899e723c01ed5a86d5188fafc7225df690abf URL: https://github.com/kamailio/kamailio/commit/436899e723c01ed5a86d5188fafc722… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-28T10:50:57+03:00 rtpproxy: fix docbook tags --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/436899e723c01ed5a86d5188fafc722… Patch: https://github.com/kamailio/kamailio/commit/436899e723c01ed5a86d5188fafc722… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index e06ae8dab2..7f5d941d2f 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -618,8 +618,8 @@ onreply_route[2] <listitem><para> <emphasis>b</emphasis> - append branch specific variable to Call-ID when sending command to rtpproxy. See rtpproxy_offer() for details. - <listitem><para> </para></listitem> + <listitem><para> <emphasis>t</emphasis> - do not include To tag to <quote>delete</quote> command to rtpproxy thus causing full call to be deleted. Useful for deleting unused rtpproxy call when 200 OK is received on a branch, where rtpproxy is not needed. </para></listitem> </itemizedlist>

6 years, 11 months

git:master:97db3ee6: db_mysql: safer conditions inside sb_add() for db api v2

by Daniel-Constantin Mierla

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++) {

6 years, 11 months

← Newer
1
...
9
10
11
12
13
14
15
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017