sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:96203c3a: ims_dialog: fix warning: âdlg_terminated_confirmedâ defined but not used [-Wunused-function]

by Ovidiu Sas

Module: kamailio Branch: master Commit: 96203c3a6ae56987c2020c8d1c4d95f5f7959a43 URL: https://github.com/kamailio/kamailio/commit/96203c3a6ae56987c2020c8d1c4d95f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-01-30T15:18:59-05:00 ims_dialog: fix warning: âdlg_terminated_confirmedâ defined but not used [-Wunused-function] --- Modified: src/modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/96203c3a6ae56987c2020c8d1c4d95f… Patch: https://github.com/kamailio/kamailio/commit/96203c3a6ae56987c2020c8d1c4d95f… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index 52b0934..27b13c8 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -286,34 +286,34 @@ void dlg_iuid_sfree(void *iuid) { } } -/*! - * \brief Function that executes BYE reply callbacks - * \param t transaction, unused - * \param type type of the callback, should be TMCB_RESPONSE_FWDED - * \param param saved dialog structure inside the callback - */ -static void dlg_terminated_confirmed(struct cell* t, - int type, - struct tmcb_params* params) { - if (!params || !params->req || !params->param) { - LM_ERR("invalid parameters!\n"); - return; - } - - struct dlg_cell* dlg = (struct dlg_cell*) *params->param; - - if (!dlg) { - LM_ERR("failed to get dialog from params!\n"); - return; - } - /* dialog termination confirmed (BYE reply) */ - run_dlg_callbacks(DLGCB_TERMINATED_CONFIRMED, - dlg, - params->req, - params->rpl, - DLG_DIR_UPSTREAM, - 0); -} +///*! +// * \brief Function that executes BYE reply callbacks +// * \param t transaction, unused +// * \param type type of the callback, should be TMCB_RESPONSE_FWDED +// * \param param saved dialog structure inside the callback +// */ +//static void dlg_terminated_confirmed(struct cell* t, +// int type, +// struct tmcb_params* params) { +// if (!params || !params->req || !params->param) { +// LM_ERR("invalid parameters!\n"); +// return; +// } +// +// struct dlg_cell* dlg = (struct dlg_cell*) *params->param; +// +// if (!dlg) { +// LM_ERR("failed to get dialog from params!\n"); +// return; +// } +// /* dialog termination confirmed (BYE reply) */ +// run_dlg_callbacks(DLGCB_TERMINATED_CONFIRMED, +// dlg, +// params->req, +// params->rpl, +// DLG_DIR_UPSTREAM, +// 0); +//} static void dlg_cancel_confirmed(struct cell* t, int type,

7 years, 9 months

[kamailio/kamailio] openssl-1.1.0c: build errors on sid/stretch (#958)

by Victor Seva

``` apt-cache policy openssl openssl: Installed: 1.1.0c-2 Candidate: 1.1.0c-2 Version table: *** 1.1.0c-2 100 100 /var/lib/dpkg/status ``` ``` make every-module group_include="ktls" make[1]: Entering directory '/code' make -C src/ every-module make[2]: Entering directory '/code/src' CC (gcc) [M crypto.so] crypto_uuid.o crypto_uuid.c:36:26: fatal error: openssl/rand.h: No such file or directory #include <openssl/rand.h> ^ compilation terminated. make[3]: *** [crypto_uuid.o] Error 1 ../../Makefile.rules:100: recipe for target 'crypto_uuid.o' failed ``` -- 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/issues/958

7 years, 9 months

git:master:c293df83: pkg/kamailio/deb: fix missing new dependency for stretch/sid

by Victor Seva

Module: kamailio Branch: master Commit: c293df8335f43780c6bb0dd22750a038f8daa4f8 URL: https://github.com/kamailio/kamailio/commit/c293df8335f43780c6bb0dd22750a03… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-01-30T18:53:31+01:00 pkg/kamailio/deb: fix missing new dependency for stretch/sid --- Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/squeeze Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control --- Diff: https://github.com/kamailio/kamailio/commit/c293df8335f43780c6bb0dd22750a03… Patch: https://github.com/kamailio/kamailio/commit/c293df8335f43780c6bb0dd22750a03…

7 years, 9 months

git:master:d41fa549: ims_dialog: init vars to avoid compile warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d41fa549f56efb0674f4b35719a3c33d255a992c URL: https://github.com/kamailio/kamailio/commit/d41fa549f56efb0674f4b35719a3c33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-30T18:30:26+01:00 ims_dialog: init vars to avoid compile warnings --- Modified: src/modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/d41fa549f56efb0674f4b35719a3c33… Patch: https://github.com/kamailio/kamailio/commit/d41fa549f56efb0674f4b35719a3c33… --- diff --git a/src/modules/ims_dialog/dlg_handlers.c b/src/modules/ims_dialog/dlg_handlers.c index ea356aa..52b0934 100644 --- a/src/modules/ims_dialog/dlg_handlers.c +++ b/src/modules/ims_dialog/dlg_handlers.c @@ -1153,10 +1153,10 @@ void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { dlg_cell_t *dlg = NULL; dlg_iuid_t *iuid = NULL; struct dlg_cell_out *dlg_out = 0; - char *event_s; + char *event_s = 0; int new_state, old_state, unref, event; - str to_tag={0,0}, to_uri, branch={0,0}; + str to_tag={0,0}, to_uri={0,0}, branch={0,0}; struct sip_msg *req = param->req; struct sip_msg *rpl = param->rpl; struct dlg_entry_out* dlg_entry_out = 0; @@ -1164,13 +1164,16 @@ void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { char* cb_type_s = tm_type_to_string(type); if (t && t->fwded_totags) - LM_DBG("ONREPLY CALL_BACK from TM received and type is [%i] = [%s] and TO is [%.*s]\n", type, cb_type_s, t->fwded_totags->tag.len, t->fwded_totags->tag.s); + LM_DBG("ONREPLY CALL_BACK from TM received and type is [%i] = [%s]" + " and TO is [%.*s]\n", type, cb_type_s, t->fwded_totags->tag.len, + t->fwded_totags->tag.s); else - LM_DBG("ONREPLY CALL_BACK from TM received and type is [%i] = [%s]\n", type, cb_type_s); + LM_DBG("ONREPLY CALL_BACK from TM received and type is [%i] = [%s]\n", + type, cb_type_s); if (shutdown_done) return; - + iuid = (dlg_iuid_t*) (*param->param); dlg = dlg_get_by_iuid(iuid); if (dlg == 0)

7 years, 9 months

git:master:cdf2976b: db_text: close file stream in case of error reading table file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cdf2976b856d63b07ed80d64d37626e1c7031b30 URL: https://github.com/kamailio/kamailio/commit/cdf2976b856d63b07ed80d64d37626e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-30T18:23:39+01:00 db_text: close file stream in case of error reading table file --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/cdf2976b856d63b07ed80d64d37626e… Patch: https://github.com/kamailio/kamailio/commit/cdf2976b856d63b07ed80d64d37626e… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index 21693fd..4dfa9f5 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -489,6 +489,8 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) LM_DBG("error at row=%d col=%d c=%c\n", crow+1, ccol+1, c); if(dtp) dbt_table_free(dtp); + if(fin) + fclose(fin); if(buf) pkg_free(buf); return NULL;

7 years, 9 months

git:master:5591d9c9: pipelimit: close file stream in case of error in get cpu

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5591d9c908d3f55898d4cc810663654f1f289806 URL: https://github.com/kamailio/kamailio/commit/5591d9c908d3f55898d4cc810663654… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-30T18:18:39+01:00 pipelimit: close file stream in case of error in get cpu --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/5591d9c908d3f55898d4cc810663654… Patch: https://github.com/kamailio/kamailio/commit/5591d9c908d3f55898d4cc810663654… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 5045055..32dec4a 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -222,6 +222,7 @@ static int get_cpuload(double * load) if (fscanf(f, "cpu %lld%lld%lld%lld%lld%lld%lld%lld", &n_user, &n_nice, &n_sys, &n_idle, &n_iow, &n_irq, &n_sirq, &n_stl) < 0) { LM_ERR("could not parse load information\n"); + fclose(f); return -1; } fclose(f);

7 years, 9 months

git:master:83b0afa5: speeddial: incremed nr_keys after strip operation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 83b0afa5d43bf7c6e4f0c22adbb211bef8593062 URL: https://github.com/kamailio/kamailio/commit/83b0afa5d43bf7c6e4f0c22adbb211b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-30T18:11:05+01:00 speeddial: incremed nr_keys after strip operation - avoid out of bounds index --- Modified: src/modules/speeddial/sdlookup.c --- Diff: https://github.com/kamailio/kamailio/commit/83b0afa5d43bf7c6e4f0c22adbb211b… Patch: https://github.com/kamailio/kamailio/commit/83b0afa5d43bf7c6e4f0c22adbb211b… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index 5c0a7bc..f561d77 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * */ @@ -137,14 +136,14 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) LM_ERR("failed to parsing Request-URI\n"); goto err_server; } - + db_keys[nr_keys]=&sd_user_column; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = _msg->parsed_uri.user.s; db_vals[nr_keys].val.str_val.len = _msg->parsed_uri.user.len; nr_keys++; - + if(use_domain>=2) { db_keys[nr_keys]=&sd_domain_column; @@ -152,8 +151,7 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = _msg->parsed_uri.host.s; db_vals[nr_keys].val.str_val.len = _msg->parsed_uri.host.len; - nr_keys++; - + if (dstrip_s.s!=NULL && dstrip_s.len>0 && dstrip_s.len<_msg->parsed_uri.host.len && strncasecmp(_msg->parsed_uri.host.s,dstrip_s.s,dstrip_s.len)==0) @@ -161,8 +159,9 @@ int sd_lookup(struct sip_msg* _msg, char* _table, char* _owner) db_vals[nr_keys].val.str_val.s += dstrip_s.len; db_vals[nr_keys].val.str_val.len -= dstrip_s.len; } + nr_keys++; } - + db_funcs.use_table(db_handle, &table_s); if(db_funcs.query(db_handle, db_keys, NULL, db_vals, db_cols, nr_keys /*no keys*/, 1 /*no cols*/, NULL, &db_res)!=0)

7 years, 9 months

git:master:c881ab1a: drouting: check return of get_node_index() to avoid negative index

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c881ab1aaa51b2040b7479da57eba33d0ee7d8e3 URL: https://github.com/kamailio/kamailio/commit/c881ab1aaa51b2040b7479da57eba33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-30T17:46:39+01:00 drouting: check return of get_node_index() to avoid negative index --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/c881ab1aaa51b2040b7479da57eba33… Patch: https://github.com/kamailio/kamailio/commit/c881ab1aaa51b2040b7479da57eba33… --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index cb6c64a..7eddab6 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -154,7 +154,7 @@ get_prefix( goto err_exit; /* is it a real node or an intermediate one */ idx = get_node_index(*tmp); - if(NULL != ptree->ptnode[idx].rg) { + if(idx!=-1 && NULL != ptree->ptnode[idx].rg) { /* real node; check the constraints on the routing info*/ if( NULL != (rt = internal_check_rt( &(ptree->ptnode[idx]), rgid))) break; @@ -169,7 +169,7 @@ get_prefix( } -pgw_t* +pgw_t* get_pgw( pgw_t* pgw_l, long id

7 years, 9 months

git:master:35037a00: jsonrpcs: close file for nice cleanup if fifo server fails to be initialized

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 35037a00457c80d61b136510a362b36c7a5f90c0 URL: https://github.com/kamailio/kamailio/commit/35037a00457c80d61b136510a362b36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-30T17:40:38+01:00 jsonrpcs: close file for nice cleanup if fifo server fails to be initialized --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/35037a00457c80d61b136510a362b36… Patch: https://github.com/kamailio/kamailio/commit/35037a00457c80d61b136510a362b36… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index e399328..c44a55c 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -181,21 +181,25 @@ FILE *jsonrpc_init_fifo_server(char *fifo_name, int fifo_mode, jsonrpc_fifo_write=open(fifo_name, O_WRONLY|O_NONBLOCK, 0); if (jsonrpc_fifo_write<0) { LM_ERR("fifo_write did not open: %s\n", strerror(errno)); + fclose(fifo_stream); return 0; } /* set read fifo blocking mode */ if ((opt=fcntl(jsonrpc_fifo_read, F_GETFL))==-1){ LM_ERR("fcntl(F_GETFL) failed: %s [%d]\n", strerror(errno), errno); + fclose(fifo_stream); return 0; } if (fcntl(jsonrpc_fifo_read, F_SETFL, opt & (~O_NONBLOCK))==-1){ LM_ERR("cntl(F_SETFL) failed: %s [%d]\n", strerror(errno), errno); + fclose(fifo_stream); return 0; } jsonrpc_reply_fifo_s = pkg_malloc(JSONRPC_MAX_FILENAME); if (jsonrpc_reply_fifo_s==NULL) { LM_ERR("no more private memory\n"); + fclose(fifo_stream); return 0; }

7 years, 9 months

git:master:a473811c: ipops: avoid out of range index when sorting srv pv

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a473811c163071fbce5b0eb4b25ee77248234ad1 URL: https://github.com/kamailio/kamailio/commit/a473811c163071fbce5b0eb4b25ee77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-30T17:28:59+01:00 ipops: avoid out of range index when sorting srv pv --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a473811c163071fbce5b0eb4b25ee77… Patch: https://github.com/kamailio/kamailio/commit/a473811c163071fbce5b0eb4b25ee77… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index b522bb2..a0f4d24 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -829,7 +829,7 @@ void sort_srv (struct srv_rdata **plist, int rcount) idx2 = 0; pswap = plist [0]; - for (idx1 = 1; idx1 <= rcount; idx1++) { + for (idx1 = 1; idx1 < rcount; idx1++) { if ((idx1 == rcount) || (pswap->priority != plist [idx1]->priority)) { /********** * o range has more than one element?

7 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017