sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
342 discussions

git:4.2:df4df4fb: usrloc - fix column types not initialized on update
by Luis Azedo 16 Feb '15

16 Feb '15

Module: kamailio Branch: 4.2 Commit: df4df4fbe8c742d960b0fdecd5a1e9967a96b58b URL: https://github.com/kamailio/kamailio/commit/df4df4fbe8c742d960b0fdecd5a1e99… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-16T13:27:06Z usrloc - fix column types not initialized on update some columns were not initialized on update leading to errors in update ERROR: db_text [dbt_lib.c:464]: dbt_is_neq_type(): invalid datatype -1001432832 ERROR: db_text [dbt_base.c:560]: dbt_update(): incompatible types! ERROR: db_text [dbt_base.c:599]: dbt_update(): failed to update the table! (cherry picked from commit cf521e66825fea4b7498d615d435739628fe4c09) --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/df4df4fbe8c742d960b0fdecd5a1e99… Patch: https://github.com/kamailio/kamailio/commit/df4df4fbe8c742d960b0fdecd5a1e99… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index cc1c2e5..d129472 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -831,9 +831,9 @@ int db_update_ucontact_addr(ucontact_t* _c) nr_cols2++; keys2[nr_cols2] = &ruid_col; + vals2[nr_cols2].type = DB1_STR; if(_c->ruid.len>0) { - vals2[nr_cols2].type = DB1_STR; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.str_val = _c->ruid; } else { @@ -842,9 +842,9 @@ int db_update_ucontact_addr(ucontact_t* _c) nr_cols2++; keys2[nr_cols2] = &instance_col; + vals2[nr_cols2].type = DB1_STR; if(_c->instance.len>0) { - vals2[nr_cols2].type = DB1_STR; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.str_val = _c->instance; } else { @@ -1043,9 +1043,9 @@ int db_update_ucontact_ruid(ucontact_t* _c) n2++; keys2[n2] = &instance_col; + vals2[n2].type = DB1_STR; if(_c->instance.len>0) { - vals2[n2].type = DB1_STR; vals2[n2].nul = 0; vals2[n2].val.str_val = _c->instance; } else {

1 0

git:master:2f4b6375: Merge pull request #86 from kamailio/lazedo/usrloc-patch
by lazedo 16 Feb '15

16 Feb '15

Module: kamailio Branch: master Commit: 2f4b6375429eeb7fa73d85909150bfd9377582d1 URL: https://github.com/kamailio/kamailio/commit/2f4b6375429eeb7fa73d85909150bfd… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-02-16T13:26:28Z Merge pull request #86 from kamailio/lazedo/usrloc-patch usrloc - fix column types not initialized on update --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/2f4b6375429eeb7fa73d85909150bfd… Patch: https://github.com/kamailio/kamailio/commit/2f4b6375429eeb7fa73d85909150bfd… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 26bf567..737da03 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -824,9 +824,9 @@ int db_update_ucontact_addr(ucontact_t* _c) nr_cols2++; keys2[nr_cols2] = &ruid_col; + vals2[nr_cols2].type = DB1_STR; if(_c->ruid.len>0) { - vals2[nr_cols2].type = DB1_STR; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.str_val = _c->ruid; } else { @@ -835,9 +835,9 @@ int db_update_ucontact_addr(ucontact_t* _c) nr_cols2++; keys2[nr_cols2] = &instance_col; + vals2[nr_cols2].type = DB1_STR; if(_c->instance.len>0) { - vals2[nr_cols2].type = DB1_STR; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.str_val = _c->instance; } else { @@ -1036,9 +1036,9 @@ int db_update_ucontact_ruid(ucontact_t* _c) n2++; keys2[n2] = &instance_col; + vals2[n2].type = DB1_STR; if(_c->instance.len>0) { - vals2[n2].type = DB1_STR; vals2[n2].nul = 0; vals2[n2].val.str_val = _c->instance; } else {

1 0

git:master:cf521e66: usrloc - fix column types not initialized on update
by lazedo 16 Feb '15

16 Feb '15

Module: kamailio Branch: master Commit: cf521e66825fea4b7498d615d435739628fe4c09 URL: https://github.com/kamailio/kamailio/commit/cf521e66825fea4b7498d615d435739… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-02-16T13:14:06Z usrloc - fix column types not initialized on update some columns were not initialized on update leading to errors in update ERROR: db_text [dbt_lib.c:464]: dbt_is_neq_type(): invalid datatype -1001432832 ERROR: db_text [dbt_base.c:560]: dbt_update(): incompatible types! ERROR: db_text [dbt_base.c:599]: dbt_update(): failed to update the table! --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/cf521e66825fea4b7498d615d435739… Patch: https://github.com/kamailio/kamailio/commit/cf521e66825fea4b7498d615d435739… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 26bf567..737da03 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -824,9 +824,9 @@ int db_update_ucontact_addr(ucontact_t* _c) nr_cols2++; keys2[nr_cols2] = &ruid_col; + vals2[nr_cols2].type = DB1_STR; if(_c->ruid.len>0) { - vals2[nr_cols2].type = DB1_STR; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.str_val = _c->ruid; } else { @@ -835,9 +835,9 @@ int db_update_ucontact_addr(ucontact_t* _c) nr_cols2++; keys2[nr_cols2] = &instance_col; + vals2[nr_cols2].type = DB1_STR; if(_c->instance.len>0) { - vals2[nr_cols2].type = DB1_STR; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.str_val = _c->instance; } else { @@ -1036,9 +1036,9 @@ int db_update_ucontact_ruid(ucontact_t* _c) n2++; keys2[n2] = &instance_col; + vals2[n2].type = DB1_STR; if(_c->instance.len>0) { - vals2[n2].type = DB1_STR; vals2[n2].nul = 0; vals2[n2].val.str_val = _c->instance; } else {

1 0

Re: [sr-dev] [kamailio] usrloc - fix column types not initialized on update (cf521e6)
by Daniel-Constantin Mierla 16 Feb '15

16 Feb '15

Thanks, you can merge and backport if needed. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/cf521e66825fea4b7498d615d435739…

1 0

Refreshing the Kamailio logo
by Daniel-Constantin Mierla 16 Feb '15

16 Feb '15

Hello, I was considering to discuss the state of Kamailio project logo for a while. The current state is ambiguous, to say at least - various logos in different places. When OpenSER was renamed in Kamailio we were trying to get something new, but due to the 'forks and dark waters' at that time, this process was never completing, meanwhile using an adaptation of old openser logo. However, there are no high resolution or other variants suitable for using in particular conditions (e.g., black and white, big posters). First, a question that we should decide on: shall we aim for a new logo or try to get someone to make proper graphics from the current shape? (for reference, the logo from http://www.kamailio.org/wp-images/kamailio-rock-logo.jpg). I would prefer to go for a new logo, but I admit that this process can become complex, a mater of tastes, not something we can decide on technical aspects. Therefore, if it ends up in something that doesn't seem to have the acceptance of major contributors (with coding, advertising/promoting, ...) to the project, then we stick with current for a while. My preference is based on the fact that Kamailio evolved over the time, has its own identity, so a fresh look of the logo would reflect that better. I am listing here the options, that people can express preference on: A) New logo A1) variant based on Kamailio World logo (used by twitter kamailioproject account and on some materials at various events). It was a backup variant so far as we had high resolution graphics that could be adapted to get a good image for big posters. Can be seen at: - http://www.kamailio.org/pub/kamailio-logos/variants/kamailio-from-world-log… - http://www.fredposner.com/1471/kamailio-at-astricon-2013/ A2) use a professional service for that. Kamailio World logo was made with 99designs.com service, which is quite good considering there will be many submissions to choose between, options can be visible by everyone. There might be other similar services, this is one I have experience with and worked fine in the past -- anyhow, it has to be something that all management and solution can be done online. Asipto can sponsor at least the bronze package if 99designs is going to be used, maybe others want to participate with extra funds to get a better package. A3) leverage on community, in case some companies have internal designers or some of you have such skills or friends. Perhaps this has the highest risk on escalating, given that is going to be some direct involvement in proposals and selection. B) Old logo B1) get someone to produce high resolution graphics from existing logo No matter what variant, who will do the work or financial contribution, will get credits via our web site. However, all the rights of the resulting logo will belong to the Kamailio project. To conclude, the order of my preferences: A2, A1, A3, B1 Looking forward to feedback from many of you! Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

3 4

git:master:bf39780f: pkg/kamailio/deb: use BASEDIR and clean usr/local
by Victor Seva 14 Feb '15

14 Feb '15

Module: kamailio Branch: master Commit: bf39780f476a38da3ffe975b5e5e985568734982 URL: https://github.com/kamailio/kamailio/commit/bf39780f476a38da3ffe975b5e5e985… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-02-14T13:49:43+01:00 pkg/kamailio/deb: use BASEDIR and clean usr/local since 8c2b9ae build process failed --- Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/squeeze/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules --- Diff: https://github.com/kamailio/kamailio/commit/bf39780f476a38da3ffe975b5e5e985… Patch: https://github.com/kamailio/kamailio/commit/bf39780f476a38da3ffe975b5e5e985…

1 0

git:master:d6793d74: app_java: Rename module interface file. fix e0a20eb1e4a0d876cc1cf91f160f2b74ad912a16
by Victor Seva 14 Feb '15

14 Feb '15

Module: kamailio Branch: master Commit: d6793d74628baa77316cfdb7366fd3b580369697 URL: https://github.com/kamailio/kamailio/commit/d6793d74628baa77316cfdb7366fd3b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-02-14T13:40:47+01:00 app_java: Rename module interface file. fix e0a20eb1e4a0d876cc1cf91f160f2b74ad912a16 Issue #82 --- Modified: modules/app_java/app_java_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d6793d74628baa77316cfdb7366fd3b… Patch: https://github.com/kamailio/kamailio/commit/d6793d74628baa77316cfdb7366fd3b… --- diff --git a/modules/app_java/app_java_mod.c b/modules/app_java/app_java_mod.c index 863fdf2..f49d8a5 100644 --- a/modules/app_java/app_java_mod.c +++ b/modules/app_java/app_java_mod.c @@ -29,7 +29,7 @@ #include "global.h" #include "utils.h" -#include "java_mod.h" +#include "app_java_mod.h" #include "java_iface.h" #include "java_support.h"

1 0

[kamailio] cnxcc: fails to send BYE to websocket-connected call-leg (#85)
by Andrey Utkin 13 Feb '15

13 Feb '15

See the end of quoted log. It tries to resolve ```<sip:s7t25aae@r2r3d4o15av3.invalid;transport=ws>``` as traditional SIP URI, and fails. Need support of WS and WSS URIs. ``` Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: cnxcc [cnxcc_check.c:87]: check_calls_by_money(): CID [kqBcNZPwNa], start_timestamp [1423857429], seconds alive [9], consumed credit [10.000000] Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: INFO: cnxcc [cnxcc_check.c:96]: check_calls_by_money(): ec=0.000000, ca=10.000000, ca2=9.000000 Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: cnxcc [cnxcc_check.c:109]: check_calls_by_money(): Client [customer_name] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 10.000000/10.000000 Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: cnxcc [cnxcc_mod.c:894]: terminate_all_calls(): Killing call with CID [kqBcNZPwNa] Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: cnxcc [cnxcc_mod.c:967]: terminate_call(): Got kill signal for call [kqBcNZPwNa] client [customer_name] h_id [4713] h_entry [335]. Dropping it now Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: dialog [dlg_req_within.c:492]: mi_terminate_dlg(): h_entry 335 h_id 4713 Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: dialog [dlg_hash.c:633]: dlg_lookup(): ref dlg 0x7ff48c38bde8 with 1 -> 3 Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: dialog [dlg_hash.c:635]: dlg_lookup(): dialog id=4713 found on entry 335 Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: dialog [dlg_req_within.c:347]: send_bye(): sending BYE to caller Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: tm [uac.c:249]: t_uac_prepare(): DEBUG:tm:t_uac: next_hop=<sip:1000@195.138.73.151:1904> Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: tm [uac.c:150]: dlg2hash(): DEBUG: dlg2hash: 61830 Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: dialog [dlg_req_within.c:380]: send_bye(): BYE sent to caller Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: dialog [dlg_req_within.c:347]: send_bye(): sending BYE to callee Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: tm [uac.c:249]: t_uac_prepare(): DEBUG:tm:t_uac: next_hop=<sip:s7t25aae@r2r3d4o15av3.invalid;transport=ws> Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: ERROR: <core> [resolve.c:1693]: sip_hostport2su(): could not resolve hostname: "r2r3d4o15av3.invalid" Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: ERROR: tm [ut.h:319]: uri2dst2(): failed to resolve "r2r3d4o15av3.invalid" Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: ERROR: tm [uac.c:272]: t_uac_prepare(): t_uac: no socket found Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: ERROR: dialog [dlg_req_within.c:374]: send_bye(): failed to send the BYE request Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: DEBUG: dialog [dlg_hash.c:851]: dlg_unref(): unref dlg 0x7ff48c38bde8 with 1 -> 2 Feb 13 19:57:18 vmwrtc /usr/local/sbin/kamailio[12467]: ERROR: cnxcc [cnxcc_mod.c:1013]: terminate_call(): Error executing dlg_end_dlg command. Return code was [500] ``` I'm trying to fix this in code by myself, but any guidance and help is appreciated, as I'm not experienced in Kamailio internals. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/85

3 13

git:master:2d6d34b2: modules/dialog_ng: corrected PARAM_STRING to PARAM_STR
by Jason Penton 13 Feb '15

13 Feb '15

Module: kamailio Branch: master Commit: 2d6d34b21320b269c6eceb5a44c5c91eb44740fc URL: https://github.com/kamailio/kamailio/commit/2d6d34b21320b269c6eceb5a44c5c91… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: 2015-02-13T09:45:16+02:00 modules/dialog_ng: corrected PARAM_STRING to PARAM_STR --- Modified: modules/dialog_ng/dialog.c Modified: modules/dialog_ng/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/2d6d34b21320b269c6eceb5a44c5c91… Patch: https://github.com/kamailio/kamailio/commit/2d6d34b21320b269c6eceb5a44c5c91… --- diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index f9a5031..1724a60 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -126,7 +126,7 @@ static cmd_export_t cmds[] = { static param_export_t mod_params[] = { { "hash_size", INT_PARAM, &dlg_hash_size}, - { "rr_param", PARAM_STRING, &rr_param}, + { "rr_param", PARAM_STR, &rr_param}, { "dlg_flag", INT_PARAM, &dlg_flag}, { "timeout_avp", PARAM_STR, &timeout_spec}, { "default_timeout", INT_PARAM, &default_timeout}, @@ -134,14 +134,14 @@ static param_export_t mod_params[] = { //In this new dialog module we always match using DID //{ "dlg_match_mode", INT_PARAM, &seq_match_mode}, - { "db_url", PARAM_STRING, &db_url }, + { "db_url", PARAM_STR, &db_url }, { "db_mode", INT_PARAM, &dlg_db_mode_param }, { "db_update_period", INT_PARAM, &db_update_period }, { "db_fetch_rows", INT_PARAM, &db_fetch_rows } , { "detect_spirals", INT_PARAM, &detect_spirals }, - { "profiles_with_value",PARAM_STRING, &profiles_wv_s }, - { "profiles_no_value", PARAM_STRING, &profiles_nv_s }, + { "profiles_with_value",PARAM_STR, &profiles_wv_s }, + { "profiles_no_value", PARAM_STR, &profiles_nv_s }, { "bridge_controller", PARAM_STR, &dlg_bridge_controller }, { "ruri_pvar", PARAM_STR, &ruri_pvar_param }, diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index 01d3cd4..f484830 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -555,8 +555,10 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { } else { ref_dlg(dlg, 1); } - - counter_add(dialog_ng_cnts_h.early, -1); + + if (old_state == DLG_STATE_EARLY) + counter_add(dialog_ng_cnts_h.early, -1); + counter_inc(dialog_ng_cnts_h.active); run_dlg_callbacks(DLGCB_CONFIRMED, dlg, req, rpl, DLG_DIR_UPSTREAM, 0);

1 0

git:master:e88c9602: modules/siptrace: added totag field to sip_trace table
by Juha Heinanen 13 Feb '15

13 Feb '15

Module: kamailio Branch: master Commit: e88c96023f3709232c3a6fdd4eac8d4d0dd25025 URL: https://github.com/kamailio/kamailio/commit/e88c96023f3709232c3a6fdd4eac8d4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-02-13T02:08:00+02:00 modules/siptrace: added totag field to sip_trace table - added sip_trace table version check --- Modified: lib/srdb1/schema/sip_trace.xml Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/e88c96023f3709232c3a6fdd4eac8d4… Patch: https://github.com/kamailio/kamailio/commit/e88c96023f3709232c3a6fdd4eac8d4…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015