sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:01f4a230: erlang: fix Makefile problem

by Seudin Kasumovic

Module: kamailio Branch: master Commit: 01f4a230dc15b9564c101d03811eac9189f91210 URL: https://github.com/kamailio/kamailio/commit/01f4a230dc15b9564c101d03811eac9… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-25T11:00:27+02:00 erlang: fix Makefile problem Read from Erlang shell include and library path. --- Modified: modules/erlang/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/01f4a230dc15b9564c101d03811eac9… Patch: https://github.com/kamailio/kamailio/commit/01f4a230dc15b9564c101d03811eac9… --- diff --git a/modules/erlang/Makefile b/modules/erlang/Makefile index e53026f..61e0336 100644 --- a/modules/erlang/Makefile +++ b/modules/erlang/Makefile @@ -5,12 +5,20 @@ include ../../Makefile.defs auto_gen= NAME=erlang.so -LIBS=-L$(LOCALBASE)/lib/erlang/usr/lib -lei -lpthread +ERLANG=$(shell which erl) + +ifneq ($(ERLANG),) +ERLANG_LIBDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1) +ERLANG_INCDIR=$(shell $(ERLANG) -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1) +else +$(error Not found Erlang) +endif +LIBS=-L$(ERLANG_LIBDIR) -lei -lpthread SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore -DEFS+=-I/usr/local/lib/erlang/usr/include +DEFS+=-I$(ERLANG_INCDIR) DEFS+=-DKAMAILIO_MOD_INTERFACE -D_REENTRANT

9 years, 7 months

[kamailio] Merge pull request #1 from kamailio/master (#174)

by Stefan Mititelu

Update You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/174 -- Commit Summary -- * Merge pull request #1 from kamailio/master -- File Changes -- -- Patch Links -- https://github.com/kamailio/kamailio/pull/174.patch https://github.com/kamailio/kamailio/pull/174.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/174

9 years, 7 months

git:master:d46f3f64: acc, dialog: change cdr dialog duration

by lucian balanceanu

Module: kamailio Branch: master Commit: d46f3f642f491968e06faea4eb1aab30ff7582fd URL: https://github.com/kamailio/kamailio/commit/d46f3f642f491968e06faea4eb1aab3… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: 2015-05-25T10:49:36+03:00 acc, dialog: change cdr dialog duration - CDR duration for timed out acknowledged dialogs is no longer left empty --- Modified: modules/acc/acc_cdr.c Modified: modules/dialog/dlg_cb.h Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/d46f3f642f491968e06faea4eb1aab3… Patch: https://github.com/kamailio/kamailio/commit/d46f3f642f491968e06faea4eb1aab3… --- diff --git a/modules/acc/acc_cdr.c b/modules/acc/acc_cdr.c index a7dc54c..d5b16e3 100644 --- a/modules/acc/acc_cdr.c +++ b/modules/acc/acc_cdr.c @@ -692,6 +692,23 @@ static void cdr_on_expired( struct dlg_cell* dialog, } LM_DBG("dialog '%p' expired!\n", dialog); + /* compute duration for timed out acknowledged dialog */ + if ( params && params->dlg_data ) { + if ( (void*)CONFIRMED_DIALOG_STATE == params->dlg_data) { + if( set_end_time( dialog) != 0) + { + LM_ERR( "failed to set end time!\n"); + return; + } + + if( set_duration( dialog) != 0) + { + LM_ERR( "failed to set duration!\n"); + return; + } + + } + } if( cdr_expired_dlg_enable && (write_cdr( dialog, 0) != 0)) { diff --git a/modules/dialog/dlg_cb.h b/modules/dialog/dlg_cb.h index fa27e16..349e24b 100644 --- a/modules/dialog/dlg_cb.h +++ b/modules/dialog/dlg_cb.h @@ -58,6 +58,8 @@ typedef int (*set_dlg_variable_f)( struct dlg_cell* dlg, typedef str* (*get_dlg_variable_f)( struct dlg_cell* dlg, str* key); +#define CONFIRMED_DIALOG_STATE 1 + #define DLGCB_LOADED (1<<0) #define DLGCB_CREATED (1<<1) #define DLGCB_FAILED (1<<2) diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index ae101e0..aae6efb 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1371,6 +1371,7 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg_cell_t *dlg; int new_state, old_state, unref; sip_msg_t *fmsg; + void* timeout_cb = 0; /* get the dialog tl payload */ dlg = ((struct dlg_cell*)((char *)(tl) - @@ -1413,6 +1414,11 @@ void dlg_ontimeout(struct dlg_tl *tl) } next_state_dlg( dlg, DLG_EVENT_REQBYE, &old_state, &new_state, &unref); + /* used for computing duration for timed out acknowledged dialog */ + if (DLG_STATE_CONFIRMED == old_state) { + timeout_cb = (void *)CONFIRMED_DIALOG_STATE; + } + dlg_run_event_route(dlg, NULL, old_state, new_state); if (new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { @@ -1422,7 +1428,7 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); /* dialog timeout */ - run_dlg_callbacks( DLGCB_EXPIRED, dlg, NULL, NULL, DLG_DIR_NONE, 0); + run_dlg_callbacks( DLGCB_EXPIRED, dlg, NULL, NULL, DLG_DIR_NONE, timeout_cb); dlg_unref(dlg, unref+1);

9 years, 7 months

erlang module pvs

by Daniel-Constantin Mierla

Hello, I noticed that erlang module is exporting couple of config variable classes (pseudo-variables) with various names. I would suggest to prefix them with 'erl' or something similar to know they are related and specific to erlang module. Many modules do so already (e.g., tm uses $T...). You used some generic names that could be confusing at some point with other components (e.g., 'tuple' is also used a lot in presence, 'pid' is something common any process and kamailio has also some variable related to it). Another note: documenting PVs in README is ok, but then need to be also documented in the wiki cookbook: - http://www.kamailio.org/wiki/cookbooks/devel/pseudovariables Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

9 years, 7 months

Creating branch 4.3

by Daniel-Constantin Mierla

Hello, I am planning to branch the code for upcoming major release on next Monday, May 25. Testing went fine so far in my side and I don't expect new consistent changes. Any fixes afterwards will be backported as usual to a stable branch. From that moment, master branch will be open again for new features. If someone else has different proposal, let's discuss it on sr-dev mailing list. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

9 years, 7 months

git:master:cc853665: Merge pull request #172 from mslehto/patch-2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cc8536657abe6d98db1634d4672465aae924faf1 URL: https://github.com/kamailio/kamailio/commit/cc8536657abe6d98db1634d4672465a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-25T09:01:34+02:00 Merge pull request #172 from mslehto/patch-2 modules/tmx doc: t_reply_callid() works also for other requests than INVITE --- Modified: modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cc8536657abe6d98db1634d4672465a… Patch: https://github.com/kamailio/kamailio/commit/cc8536657abe6d98db1634d4672465a… --- diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index c2d8044..65de597 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -172,7 +172,7 @@ if (t_cancel_callid("123qaz", "5", "22", "200")) { </function> </title> <para> - Send reply to first INVITE transaction identified by callid and cseq. + Send reply to first transaction identified by callid and cseq. </para> <para> Parameters:.

9 years, 7 months

git:master:e76577a2: modules/tmx doc: t_reply_callid() works also for other requests than INVITE

by Mikko Lehto

Module: kamailio Branch: master Commit: e76577a2c6d8d0628ff9548e5cbfee0302a41e15 URL: https://github.com/kamailio/kamailio/commit/e76577a2c6d8d0628ff9548e5cbfee0… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-05-24T20:11:55+03:00 modules/tmx doc: t_reply_callid() works also for other requests than INVITE --- Modified: modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e76577a2c6d8d0628ff9548e5cbfee0… Patch: https://github.com/kamailio/kamailio/commit/e76577a2c6d8d0628ff9548e5cbfee0… --- diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index c2d8044..65de597 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -172,7 +172,7 @@ if (t_cancel_callid("123qaz", "5", "22", "200")) { </function> </title> <para> - Send reply to first INVITE transaction identified by callid and cseq. + Send reply to first transaction identified by callid and cseq. </para> <para> Parameters:.

9 years, 7 months

[kamailio] modules/tmx doc: t_reply_callid() works also for other requests than INVITE (#172)

by Mikko Lehto

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/172 -- Commit Summary -- * modules/tmx doc: t_reply_callid() works also for other requests than INVITE -- File Changes -- M modules/tmx/doc/tmx_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/172.patch https://github.com/kamailio/kamailio/pull/172.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/172

9 years, 7 months

git:master:b7a07828: erlang: remove annoying logs

by Seudin Kasumovic

Module: kamailio Branch: master Commit: b7a078289d0a2e58a1b10c97e067df956f3527ec URL: https://github.com/kamailio/kamailio/commit/b7a078289d0a2e58a1b10c97e067df9… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-24T20:25:20+02:00 erlang: remove annoying logs Remove unnecessary LM_INFO logs. --- Modified: modules/erlang/mod_erlang.c --- Diff: https://github.com/kamailio/kamailio/commit/b7a078289d0a2e58a1b10c97e067df9… Patch: https://github.com/kamailio/kamailio/commit/b7a078289d0a2e58a1b10c97e067df9… --- diff --git a/modules/erlang/mod_erlang.c b/modules/erlang/mod_erlang.c index 4108809..bcf72b2 100644 --- a/modules/erlang/mod_erlang.c +++ b/modules/erlang/mod_erlang.c @@ -880,7 +880,6 @@ static int fixup_reg(void** param, int param_no) pkg_free((void*)erl_param); return E_UNSPEC; } - LM_INFO("param emsg is PV_NAME_INTSTR\n"); erl_param->type = ERL_PARAM_FPARAM; erl_param->value.fp = *(fparam_t*)*param; } else if(pv_parse_spec( &s, &erl_param->value.sp)==NULL) { @@ -1060,7 +1059,6 @@ static int fixup_reply(void** param, int param_no) pkg_free((void*)erl_param); return E_UNSPEC; } - LM_INFO("param emsg is PV_NAME_INTSTR\n"); erl_param->type = ERL_PARAM_FPARAM; erl_param->value.fp = *(fparam_t*)*param; } else if(pv_parse_spec( &s, &erl_param->value.sp)==NULL) { @@ -1321,7 +1319,6 @@ static int fixup_send(void** param, int param_no) pkg_free((void*)erl_param); return E_UNSPEC; } - LM_INFO("param emsg is PV_NAME_INTSTR\n"); erl_param->type = ERL_PARAM_FPARAM; erl_param->value.fp = *(fparam_t*)*param; } else if(pv_parse_spec( &s, &erl_param->value.sp)==NULL) { @@ -1364,7 +1361,6 @@ static int fixup_send(void** param, int param_no) pkg_free((void*)erl_param); return E_UNSPEC; } - LM_INFO("param emsg is PV_NAME_INTSTR\n"); erl_param->type = ERL_PARAM_FPARAM; erl_param->value.fp = *(fparam_t*)*param; } else if(pv_parse_spec( &s, &erl_param->value.sp)==NULL) {

9 years, 7 months

git:master:922f4b0b: erlang: New pseudo variable for Erlang reference

by Seudin Kasumovic

Module: kamailio Branch: master Commit: 922f4b0b383223b3ba75ec69a5cf5e292950d353 URL: https://github.com/kamailio/kamailio/commit/922f4b0b383223b3ba75ec69a5cf5e2… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-24T20:02:19+02:00 erlang: New pseudo variable for Erlang reference - introduce new pseudo variable for Erlang reference. - document $ref variable --- Added: modules/erlang/pv_ref.c Added: modules/erlang/pv_ref.h Modified: modules/erlang/README Modified: modules/erlang/doc/erlang_admin.xml Modified: modules/erlang/mod_erlang.c Modified: modules/erlang/pv_xbuff.c Modified: modules/erlang/pv_xbuff.h --- Diff: https://github.com/kamailio/kamailio/commit/922f4b0b383223b3ba75ec69a5cf5e2… Patch: https://github.com/kamailio/kamailio/commit/922f4b0b383223b3ba75ec69a5cf5e2…

9 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015