sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:2115943f: pkg/kamailio/deb: fix build rule for modules

by Victor Seva

Module: kamailio Branch: master Commit: 2115943fb5beb11a4b461c14f16dc42df8f32ab3 URL: https://github.com/kamailio/kamailio/commit/2115943fb5beb11a4b461c14f16dc42… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-03T11:14:53+02:00 pkg/kamailio/deb: fix build rule for modules --- Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/squeeze/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules --- Diff: https://github.com/kamailio/kamailio/commit/2115943fb5beb11a4b461c14f16dc42… Patch: https://github.com/kamailio/kamailio/commit/2115943fb5beb11a4b461c14f16dc42…

8 years, 6 months

git:master:fcdef437: http_client Rename the API in .h file

by Olle E. Johansson

Module: kamailio Branch: master Commit: fcdef4371951cfa2b1703f39cbcabab5e184747f URL: https://github.com/kamailio/kamailio/commit/fcdef4371951cfa2b1703f39cbcabab… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-03T10:35:17+02:00 http_client Rename the API in .h file --- Modified: modules/http_client/curl_api.h --- Diff: https://github.com/kamailio/kamailio/commit/fcdef4371951cfa2b1703f39cbcabab… Patch: https://github.com/kamailio/kamailio/commit/fcdef4371951cfa2b1703f39cbcabab… --- diff --git a/modules/http_client/curl_api.h b/modules/http_client/curl_api.h index ef51edd..fd42e2b 100644 --- a/modules/http_client/curl_api.h +++ b/modules/http_client/curl_api.h @@ -49,7 +49,7 @@ typedef int (*bind_httpc_api_f)(httpc_api_t *api); int bind_httpc_api(httpc_api_t *api); /** - * @brief Load the CURL API + * @brief Load the http_client API */ static inline int httpc_load_api(httpc_api_t *api) {

8 years, 6 months

git:master:e3cfe2ad: kamctl remove svn ID's and history

by Olle E. Johansson

Module: kamailio Branch: master Commit: e3cfe2adf3af1cb7b909c5f4d3c7a481d1cfa224 URL: https://github.com/kamailio/kamailio/commit/e3cfe2adf3af1cb7b909c5f4d3c7a48… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-03T10:35:17+02:00 kamctl remove svn ID's and history --- Modified: utils/kamctl/Makefile Modified: utils/kamctl/kamctl.base Modified: utils/kamctl/kamctl.ctlbase Modified: utils/kamctl/kamctl.db_berkeley Modified: utils/kamctl/kamctl.dbtext Modified: utils/kamctl/kamctl.fifo Modified: utils/kamctl/kamctl.mysql Modified: utils/kamctl/kamctl.oracle Modified: utils/kamctl/kamctl.pgsql Modified: utils/kamctl/kamctl.ser Modified: utils/kamctl/kamctl.ser_mi Modified: utils/kamctl/kamctl.sqlbase Modified: utils/kamctl/kamctl.sqlite Modified: utils/kamctl/kamctl.unixsock Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.db_berkeley Modified: utils/kamctl/kamdbctl.dbtext Modified: utils/kamctl/kamdbctl.mysql Modified: utils/kamctl/kamdbctl.oracle Modified: utils/kamctl/kamdbctl.pgsql Modified: utils/kamctl/kamdbctl.sqlite Modified: utils/kamctl/kamdbfunc.oracle --- Diff: https://github.com/kamailio/kamailio/commit/e3cfe2adf3af1cb7b909c5f4d3c7a48… Patch: https://github.com/kamailio/kamailio/commit/e3cfe2adf3af1cb7b909c5f4d3c7a48…

8 years, 6 months

git:master:c49d6cb4: Merge pull request #637 from mslehto/ims-warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c49d6cb41ace240a8e83fd116d3259f75163692a URL: https://github.com/kamailio/kamailio/commit/c49d6cb41ace240a8e83fd116d3259f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-03T09:25:43+02:00 Merge pull request #637 from mslehto/ims-warning Fix or silence warnings given by Clang --- Modified: lib/ims/ims_getters.c Modified: modules/ims_auth/utils.c Modified: modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/c49d6cb41ace240a8e83fd116d3259f… Patch: https://github.com/kamailio/kamailio/commit/c49d6cb41ace240a8e83fd116d3259f… --- diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index 5765ba9..74e8180 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -132,9 +132,9 @@ str cscf_get_private_identity(struct sip_msg *msg, str realm) { } if (realm.len && realm.s) { - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { - ret = find_credentials(msg, &realm, HDR_PROXYAUTH_F, &h); + ret = find_credentials(msg, &realm, HDR_PROXYAUTH_T, &h); if (ret < 0) { goto fallback; } else { @@ -202,7 +202,7 @@ str cscf_get_private_identity_from(struct sip_msg *msg, str realm) } if (realm.len && realm.s) { - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { goto fallback; } else diff --git a/modules/ims_auth/utils.c b/modules/ims_auth/utils.c index fbc8ee7..aca0ca4 100644 --- a/modules/ims_auth/utils.c +++ b/modules/ims_auth/utils.c @@ -239,7 +239,7 @@ str ims_get_auts(struct sip_msg *msg, str realm, int is_proxy_auth) return auts; } - ret = find_credentials(msg, &realm, is_proxy_auth ? HDR_PROXYAUTH_F : HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, is_proxy_auth ? HDR_PROXYAUTH_T : HDR_AUTHORIZATION_T, &h); if (ret < 0) { LM_ERR("Error while looking for credentials.\n"); return auts; @@ -283,7 +283,7 @@ str ims_get_nonce(struct sip_msg *msg, str realm) return nonce; } - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { LM_ERR("Error while looking for credentials.\n"); return nonce; diff --git a/modules/ims_dialog/dlg_hash.c b/modules/ims_dialog/dlg_hash.c index 26817ac..cc6db50 100644 --- a/modules/ims_dialog/dlg_hash.c +++ b/modules/ims_dialog/dlg_hash.c @@ -671,7 +671,7 @@ void dlg_remove_dlg_out(struct dlg_cell_out *dlg_out_do_not_remove, struct dlg_c LM_DBG("This is the dlg_out not to be removed!\n"); } else { //check if this the last entry in the entry_table - if ((d_entry_out->first == d_entry_out->last)) { + if (d_entry_out->first == d_entry_out->last) { //we shouldnt ever get here LM_DBG("This is the last dlg_out_entry in the dlg_entries_out\n"); //this is the last then set entry_out-> first and entry_out->last to zero

8 years, 6 months

git:master:5395bbe6: modules/ims_dialog: fix clang warning -Wparentheses-equality

by Mikko Lehto

Module: kamailio Branch: master Commit: 5395bbe6522ab9b9874162874935119cff8aa764 URL: https://github.com/kamailio/kamailio/commit/5395bbe6522ab9b9874162874935119… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-05-25T13:49:39+03:00 modules/ims_dialog: fix clang warning -Wparentheses-equality --- Modified: modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/5395bbe6522ab9b9874162874935119… Patch: https://github.com/kamailio/kamailio/commit/5395bbe6522ab9b9874162874935119… --- diff --git a/modules/ims_dialog/dlg_hash.c b/modules/ims_dialog/dlg_hash.c index 26817ac..cc6db50 100644 --- a/modules/ims_dialog/dlg_hash.c +++ b/modules/ims_dialog/dlg_hash.c @@ -671,7 +671,7 @@ void dlg_remove_dlg_out(struct dlg_cell_out *dlg_out_do_not_remove, struct dlg_c LM_DBG("This is the dlg_out not to be removed!\n"); } else { //check if this the last entry in the entry_table - if ((d_entry_out->first == d_entry_out->last)) { + if (d_entry_out->first == d_entry_out->last) { //we shouldnt ever get here LM_DBG("This is the last dlg_out_entry in the dlg_entries_out\n"); //this is the last then set entry_out-> first and entry_out->last to zero

8 years, 6 months

git:master:63952aca: modules/ims_auth lib/ims: use header type instead of header flag

by Mikko Lehto

Module: kamailio Branch: master Commit: 63952acae078004807732206029791f8b0f271c8 URL: https://github.com/kamailio/kamailio/commit/63952acae078004807732206029791f… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-05-25T13:49:00+03:00 modules/ims_auth lib/ims: use header type instead of header flag --- Modified: lib/ims/ims_getters.c Modified: modules/ims_auth/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/63952acae078004807732206029791f… Patch: https://github.com/kamailio/kamailio/commit/63952acae078004807732206029791f… --- diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index 5765ba9..74e8180 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -132,9 +132,9 @@ str cscf_get_private_identity(struct sip_msg *msg, str realm) { } if (realm.len && realm.s) { - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { - ret = find_credentials(msg, &realm, HDR_PROXYAUTH_F, &h); + ret = find_credentials(msg, &realm, HDR_PROXYAUTH_T, &h); if (ret < 0) { goto fallback; } else { @@ -202,7 +202,7 @@ str cscf_get_private_identity_from(struct sip_msg *msg, str realm) } if (realm.len && realm.s) { - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { goto fallback; } else diff --git a/modules/ims_auth/utils.c b/modules/ims_auth/utils.c index fbc8ee7..aca0ca4 100644 --- a/modules/ims_auth/utils.c +++ b/modules/ims_auth/utils.c @@ -239,7 +239,7 @@ str ims_get_auts(struct sip_msg *msg, str realm, int is_proxy_auth) return auts; } - ret = find_credentials(msg, &realm, is_proxy_auth ? HDR_PROXYAUTH_F : HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, is_proxy_auth ? HDR_PROXYAUTH_T : HDR_AUTHORIZATION_T, &h); if (ret < 0) { LM_ERR("Error while looking for credentials.\n"); return auts; @@ -283,7 +283,7 @@ str ims_get_nonce(struct sip_msg *msg, str realm) return nonce; } - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_T, &h); if (ret < 0) { LM_ERR("Error while looking for credentials.\n"); return nonce;

8 years, 6 months

[kamailio/kamailio] Fix or slience warnings given by Clang (#637)

by Mikko Lehto

``` CC (clang38) [M ims_dialog.so] dlg_hash.o dlg_hash.c:674:37: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] if ((d_entry_out->first == d_entry_out->last)) { ~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ dlg_hash.c:674:37: note: remove extraneous parentheses around the comparison to silence this warning if ((d_entry_out->first == d_entry_out->last)) { ~ ^ ~ dlg_hash.c:674:37: note: use '=' to turn this equality comparison into an assignment if ((d_entry_out->first == d_entry_out->last)) { ^~ = CC (clang38) [M ims_qos.so] rx_avp.o rx_avp.c:492:16: warning: comparison of unsigned expression >= 0 is always true [-Wtautological-compare] if (bandwidth >= 0) { ~~~~~~~~~ ^ ~ rx_avp.c:504:16: warning: comparison of unsigned expression >= 0 is always true [-Wtautological-compare] if (bandwidth >= 0) { ~~~~~~~~~ ^ ~ CC (clang38) [M ims_registrar_scscf.so] save.o save.c:114:21: warning: comparison of unsigned expression >= 0 is always true [-Wtautological-compare] if (expires_hdr >= 0) ~~~~~~~~~~~ ^ ~ ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/637 -- Commit Summary -- * modules/ims_auth lib/ims: use header type instead of header flag * modules/ims_qos modules/ims_registrar_scscf: fix comparison of unsigned expression * modules/ims_dialog: fix clang warning -Wparentheses-equality -- File Changes -- M lib/ims/ims_getters.c (6) M modules/ims_auth/utils.c (4) M modules/ims_dialog/dlg_hash.c (2) M modules/ims_qos/rx_avp.c (4) M modules/ims_registrar_scscf/save.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/637.patch https://github.com/kamailio/kamailio/pull/637.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/637

8 years, 6 months

git:master:3e92a47f: rtpengine: cookie is now $server_id_$mypid_$myseqn

by Lucian Balaceanu

Module: kamailio Branch: master Commit: 3e92a47fb3c3f4fc97f7e3cdeb33f8b111c6b1f8 URL: https://github.com/kamailio/kamailio/commit/3e92a47fb3c3f4fc97f7e3cdeb33f8b… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2016-06-02T17:34:39+02:00 rtpengine: cookie is now $server_id_$mypid_$myseqn --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/3e92a47fb3c3f4fc97f7e3cdeb33f8b… Patch: https://github.com/kamailio/kamailio/commit/3e92a47fb3c3f4fc97f7e3cdeb33f8b… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index a37ab6f..5fe83b0 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -2020,13 +2020,9 @@ static void mod_destroy(void) static char * gencookie(void) { - static char cook[COOKIE_SIZE]; - char hostname[HOSTNAME_SIZE]; - - if (gethostname(hostname, HOSTNAME_SIZE - 1) < 0) - strcpy(hostname, "host"); - snprintf(cook, COOKIE_SIZE, "%s_%d_%u ", hostname, (int)mypid, myseqn); + static char cook[34]; + snprintf(cook, 34, "%d_%d_%u ", server_id, (int)mypid, myseqn); myseqn++; return cook; }

8 years, 6 months

git:master:691e088f: JANSSON: Improved support for JSON-Type "Integer", which can in fact be long (or even long long)

by Carsten Bock

Module: kamailio Branch: master Commit: 691e088fe5b23faa39c2f32df19690ce4b7a7c7d URL: https://github.com/kamailio/kamailio/commit/691e088fe5b23faa39c2f32df19690c… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2016-06-02T18:01:03+03:00 JANSSON: Improved support for JSON-Type "Integer", which can in fact be long (or even long long) --- Modified: modules/jansson/README Modified: modules/jansson/doc/jansson.xml Modified: modules/jansson/doc/jansson_admin.xml Modified: modules/jansson/jansson_funcs.c Modified: modules/jansson/jansson_utils.c --- Diff: https://github.com/kamailio/kamailio/commit/691e088fe5b23faa39c2f32df19690c… Patch: https://github.com/kamailio/kamailio/commit/691e088fe5b23faa39c2f32df19690c…

8 years, 6 months

git:master:06df7d59: modules/ims_usrloc_scscf: do not use DB functions if db_mode not enabled.

by jaybeepee

Module: kamailio Branch: master Commit: 06df7d591e56d48ddbc100e5be4dc917731fc1a4 URL: https://github.com/kamailio/kamailio/commit/06df7d591e56d48ddbc100e5be4dc91… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-06-02T16:30:21+02:00 modules/ims_usrloc_scscf: do not use DB functions if db_mode not enabled. --- Modified: modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/06df7d591e56d48ddbc100e5be4dc91… Patch: https://github.com/kamailio/kamailio/commit/06df7d591e56d48ddbc100e5be4dc91… --- diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index 9dd82ed..ceee7e5 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -332,6 +332,10 @@ static str rollback = str_init("ROLLBACK"); static str autocommit_on = str_init("SET AUTOCOMMIT=1"); static inline void start_dbtransaction() { + + if (db_mode == NO_DB) + return; + if (ul_dbf.raw_query(ul_dbh, &autocommit_off, NULL) < 0) { LM_ERR("could not " "set autocommit off!\n");

8 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016