sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:fd98d373: erlang: Fix parameter capabilities check
by Seudin Kasumovic 24 May '15

24 May '15

Module: kamailio Branch: master Commit: fd98d373882f5e48070db2a58a50a92b9a688c78 URL: https://github.com/kamailio/kamailio/commit/fd98d373882f5e48070db2a58a50a92… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-24T20:02:11+02:00 erlang: Fix parameter capabilities check Fix check getters of erl_send parameters. --- Modified: modules/erlang/mod_erlang.c Modified: modules/erlang/pv_atom.c Modified: modules/erlang/pv_atom.h --- Diff: https://github.com/kamailio/kamailio/commit/fd98d373882f5e48070db2a58a50a92… Patch: https://github.com/kamailio/kamailio/commit/fd98d373882f5e48070db2a58a50a92… --- diff --git a/modules/erlang/mod_erlang.c b/modules/erlang/mod_erlang.c index 9f5d768..bd811a0 100644 --- a/modules/erlang/mod_erlang.c +++ b/modules/erlang/mod_erlang.c @@ -1124,7 +1124,7 @@ static int erl_send_k(struct sip_msg *msg, char *_pid, char *_emsg) if (sp.getf == pv_pid_get ) { xmsg = pv_pid_get_pid(&pvn->u.isname.name.s); - } else if (sp.setf == pv_xbuff_set) { + } else if (sp.getf == pv_xbuff_get) { xmsg = pv_xbuff_get_xbuff(&pvn->u.isname.name.s); } else { LM_ERR("BUG: unexpected type for pid parameter\n"); @@ -1208,12 +1208,16 @@ static int erl_send_k(struct sip_msg *msg, char *_pid, char *_emsg) pvn = &pvp.pvn; } - if (sp.setf == pv_list_set ) { + if (sp.getf == pv_list_get ) { xmsg = pv_list_get_list(&pvn->u.isname.name.s); - } else if (sp.setf == pv_xbuff_set) { + } else if (sp.getf == pv_xbuff_get) { xmsg = pv_xbuff_get_xbuff(&pvn->u.isname.name.s); - } else if (sp.setf == pv_tuple_set) { + } else if (sp.getf == pv_tuple_get) { xmsg = pv_tuple_get_tuple(&pvn->u.isname.name.s); + } else if (sp.getf == pv_atom_get) { + xmsg = pv_atom_get_atom(&pvn->u.isname.name.s); + } else if (sp.getf == pv_pid_get) { + xmsg = pv_pid_get_pid(&pvn->u.isname.name.s); } /* fix index */ @@ -1364,10 +1368,11 @@ static int fixup_send(void** param, int param_no) return E_UNSPEC; } - if (erl_param->value.sp.setf == pv_list_set - || erl_param->value.sp.setf == pv_xbuff_set - || erl_param->value.sp.setf == pv_tuple_set - || erl_param->value.sp.setf == pv_atom_set) { + if (erl_param->value.sp.getf == pv_list_get + || erl_param->value.sp.getf == pv_xbuff_get + || erl_param->value.sp.getf == pv_tuple_get + || erl_param->value.sp.getf == pv_atom_get + || erl_param->value.sp.getf == pv_pid_get) { erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { diff --git a/modules/erlang/pv_atom.c b/modules/erlang/pv_atom.c index b0d38d4..15c31a1 100644 --- a/modules/erlang/pv_atom.c +++ b/modules/erlang/pv_atom.c @@ -146,6 +146,11 @@ sr_xavp_t *xavp_get_atoms() return list; } +sr_xavp_t *pv_atom_get_atom(str *name) +{ + return xavp_get_child(&atom_list, name); +} + int pv_atom_set(struct sip_msg* msg, pv_param_t* param, int op, pv_value_t* val) { str name; diff --git a/modules/erlang/pv_atom.h b/modules/erlang/pv_atom.h index 99f5edb..fdd30cf 100644 --- a/modules/erlang/pv_atom.h +++ b/modules/erlang/pv_atom.h @@ -32,4 +32,6 @@ int pv_atom_get(struct sip_msg*, pv_param_t*, pv_value_t*); void free_atom_fmt_buff(); +sr_xavp_t *pv_atom_get_atom(str *name); + #endif /* PV_ATOM_H_ */

1 0

git:master:70e177fe: erlang: Fix memory leak
by Seudin Kasumovic 24 May '15

24 May '15

Module: kamailio Branch: master Commit: 70e177fe1ba1792e8842efa9d5746bda75380b65 URL: https://github.com/kamailio/kamailio/commit/70e177fe1ba1792e8842efa9d5746bd… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-24T20:02:07+02:00 erlang: Fix memory leak Free memory used for format/print Erlang process id PV. --- Modified: modules/erlang/mod_erlang.c --- Diff: https://github.com/kamailio/kamailio/commit/70e177fe1ba1792e8842efa9d5746bd… Patch: https://github.com/kamailio/kamailio/commit/70e177fe1ba1792e8842efa9d5746bd… --- diff --git a/modules/erlang/mod_erlang.c b/modules/erlang/mod_erlang.c index 5fc3615..9f5d768 100644 --- a/modules/erlang/mod_erlang.c +++ b/modules/erlang/mod_erlang.c @@ -392,6 +392,7 @@ static void mod_destroy(void) free_atom_fmt_buff(); free_list_fmt_buff(); free_xbuff_fmt_buff(); + free_pid_fmt_buff(); } static int postprocess_request(struct sip_msg *msg, unsigned int flags, void *_param) @@ -400,6 +401,7 @@ static int postprocess_request(struct sip_msg *msg, unsigned int flags, void *_p free_atom_fmt_buff(); free_list_fmt_buff(); free_xbuff_fmt_buff(); + free_pid_fmt_buff(); return 0; }

1 0

git:master:5469dcda: modules/ims_registrar_scscf: send full notify information when contact changes instead of partial
by Richard Good 23 May '15

23 May '15

Module: kamailio Branch: master Commit: 5469dcda0d4ad7b29fa1ede5ffdd62e45af3315a URL: https://github.com/kamailio/kamailio/commit/5469dcda0d4ad7b29fa1ede5ffdd62e… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-05-23T14:16:39+02:00 modules/ims_registrar_scscf: send full notify information when contact changes instead of partial --- Modified: modules/ims_registrar_scscf/cxdx_callbacks.c Modified: modules/ims_registrar_scscf/reg_mod.c Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/5469dcda0d4ad7b29fa1ede5ffdd62e… Patch: https://github.com/kamailio/kamailio/commit/5469dcda0d4ad7b29fa1ede5ffdd62e…

1 0

git:master:fe7351d5: modules/usrloc: added note about handle_lost_tcp in DB-Only scheme
by Juha Heinanen 23 May '15

23 May '15

Module: kamailio Branch: master Commit: fe7351d586b56237669a29f15dcdf83b78136cb4 URL: https://github.com/kamailio/kamailio/commit/fe7351d586b56237669a29f15dcdf83… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-05-23T09:20:05+03:00 modules/usrloc: added note about handle_lost_tcp in DB-Only scheme --- Modified: modules/usrloc/README Modified: modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fe7351d586b56237669a29f15dcdf83… Patch: https://github.com/kamailio/kamailio/commit/fe7351d586b56237669a29f15dcdf83…

1 0

git:master:e15e6d8c: Merge branch 'seudin/erl_send'
by Seudin Kasumovic 22 May '15

22 May '15

Module: kamailio Branch: master Commit: e15e6d8cfd70b0abbeb499fb1483cc468624c0f9 URL: https://github.com/kamailio/kamailio/commit/e15e6d8cfd70b0abbeb499fb1483cc4… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-22T22:50:02+02:00 Merge branch 'seudin/erl_send' --- Modified: modules/erlang/README Modified: modules/erlang/cnode.c Modified: modules/erlang/cnode.h Modified: modules/erlang/doc/erlang_admin.xml Modified: modules/erlang/doc/erlang_devel.xml Modified: modules/erlang/erl_api.c Modified: modules/erlang/erl_api.h Modified: modules/erlang/erl_helpers.h Modified: modules/erlang/handle_emsg.c Modified: modules/erlang/mod_erlang.c Modified: modules/erlang/pv_pid.c Modified: modules/erlang/pv_pid.h Modified: modules/erlang/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/e15e6d8cfd70b0abbeb499fb1483cc4… Patch: https://github.com/kamailio/kamailio/commit/e15e6d8cfd70b0abbeb499fb1483cc4…

1 0

git:master:98636573: erlang: erl_send function
by Seudin Kasumovic 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 98636573959ac17901e8640c116b2fcac2694440 URL: https://github.com/kamailio/kamailio/commit/98636573959ac17901e8640c116b2fc… Author: Seudin Kasumovic <seudin(a)bicomsystems.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-22T22:44:52+02:00 erlang: erl_send function - erl_send function sends Erlang message to process - appropriate API function send - documentation for erl_send and API - examples according to el_send usage - regenerate README --- Modified: modules/erlang/README Modified: modules/erlang/cnode.c Modified: modules/erlang/cnode.h Modified: modules/erlang/doc/erlang_admin.xml Modified: modules/erlang/doc/erlang_devel.xml Modified: modules/erlang/erl_api.c Modified: modules/erlang/erl_api.h Modified: modules/erlang/erl_helpers.h Modified: modules/erlang/handle_emsg.c Modified: modules/erlang/mod_erlang.c Modified: modules/erlang/pv_pid.c Modified: modules/erlang/pv_pid.h Modified: modules/erlang/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/98636573959ac17901e8640c116b2fc… Patch: https://github.com/kamailio/kamailio/commit/98636573959ac17901e8640c116b2fc…

1 0

git:master:75ba3ef0: erlang: Fix detecting event route
by Seudin Kasumovic 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 75ba3ef01c08027e5694419e9c923fef02262daa URL: https://github.com/kamailio/kamailio/commit/75ba3ef01c08027e5694419e9c923fe… Author: Seudin Kasumovic <seudin(a)bicomsystems.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-05-22T22:03:40+02:00 erlang: Fix detecting event route Ensure proper detect event route and lost connection in erl_reply. --- Modified: modules/erlang/cnode.c Modified: modules/erlang/erl_api.c --- Diff: https://github.com/kamailio/kamailio/commit/75ba3ef01c08027e5694419e9c923fe… Patch: https://github.com/kamailio/kamailio/commit/75ba3ef01c08027e5694419e9c923fe… --- diff --git a/modules/erlang/cnode.c b/modules/erlang/cnode.c index 6cc2786..d18f043 100644 --- a/modules/erlang/cnode.c +++ b/modules/erlang/cnode.c @@ -514,6 +514,7 @@ int csockfd_init(csockfd_handler_t *phandler, const ei_cnode *ec) csocket_handler = phandler; + csockfd = 0; return 0; } diff --git a/modules/erlang/erl_api.c b/modules/erlang/erl_api.c index 36cd1ed..0c5d15b 100644 --- a/modules/erlang/erl_api.c +++ b/modules/erlang/erl_api.c @@ -236,9 +236,12 @@ int _impl_reply(const ei_x_buff *msg) /* must be in call back / event route */ - if (!enode) { + if (csockfd) { LM_ERR("not in callback\n"); return -1; + } else if (!enode) { + LM_ERR("not connected\n"); + return -1; } /* copy into reply */ if (enode->response.buffsz < msg->buffsz) {

1 0

[kamailio] IMC module doesn't know what to do with websocket based endpoints (#148)
by Don Fanning 22 May '15

22 May '15

Got IMC working, able to create rooms/destroy rooms. No output is fed back to the chat window. When two people are in the same room, I can see it find the recipient list of the room, but then it calls TM for the next_hop which calls _dns_hash_find which then calls get_out_socket and that's where it all goes to pot... IMC should just create a new SIP MESSAGE packet from the room or imc_manager and drop it into request route{} for it to route back to the destination. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/148

2 3

[kamailio] distclean doesn't clean at all (#167)
by Victor Seva 22 May '15

22 May '15

seems like "pure" is the rule that actually cleans the sources. We should make distclean like pure --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/167

1 1

git:master:2143d1eb: Merge pull request #170 from kamailio/vseva/distclean
by Victor Seva 22 May '15

22 May '15

Module: kamailio Branch: master Commit: 2143d1eb56bd3a9a775494afaa0e71d6f584d5bb URL: https://github.com/kamailio/kamailio/commit/2143d1eb56bd3a9a775494afaa0e71d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-05-22T15:03:27+02:00 Merge pull request #170 from kamailio/vseva/distclean Makefile: use distclean as shortcut of maintainer-clean --- Modified: Makefile Modified: Makefile.targets --- Diff: https://github.com/kamailio/kamailio/commit/2143d1eb56bd3a9a775494afaa0e71d… Patch: https://github.com/kamailio/kamailio/commit/2143d1eb56bd3a9a775494afaa0e71d… --- diff --git a/Makefile b/Makefile index 31fe195..efd58cc 100644 --- a/Makefile +++ b/Makefile @@ -920,10 +920,10 @@ clean: clean-libs clean-extra-names: @rm -f $(filter-out $(MAIN_NAME), sip-router ser kamailio) -# proper/distclean a.s.o modules, utils and libs too +# proper/distclean-old a.s.o modules, utils and libs too proper: clean-extra-names proper-modules proper-utils proper-libs -distclean: distclean-modules distclean-utils distclean-libs +distclean-old: distclean-modules distclean-utils distclean-libs realclean: realclean-modules realclean-utils realclean-libs maintainer-clean: maintainer-clean-modules maintainer-clean-utils \ maintainer-clean-libs @@ -936,7 +936,7 @@ clean-all: clean maintainer-clean: modules=$(modules_all) # on make proper clean also the build config (w/o module list) -proper realclean distclean maintainer-clean: clean_cfg +proper realclean distclean-old maintainer-clean: clean_cfg # on maintainer clean, remove also the configured module list maintainer-clean: clean_modules_cfg clean_makefile_vars @@ -959,7 +959,7 @@ clean_modules_cfg clean-modules-cfg: # clean everything generated - shortcut on maintainer-clean .PHONY: pure -pure: maintainer-clean +pure distclean: maintainer-clean .PHONY: install_initd_debian install-initd-debian install_initd_debian install-initd-debian: diff --git a/Makefile.targets b/Makefile.targets index 93399c8..9f9bf66 100644 --- a/Makefile.targets +++ b/Makefile.targets @@ -10,7 +10,7 @@ ifeq (,$(strip $(modules_dirs))) include $(COREPATH)/Makefile.dirs endif -clean_targets:= clean proper distclean realclean maintainer-clean local-clean \ +clean_targets:= clean proper distclean-old realclean maintainer-clean local-clean \ clean-all proper-all distclean-all realclean-all \ clean_cfg clean-cfg clean_modules_cfg clean-modules-cfg \ clean-modules proper-modules realclean-modules \ @@ -19,7 +19,8 @@ clean_targets:= clean proper distclean realclean maintainer-clean local-clean \ maintaner-clean-utils \ clean-libs proper-libs realclean-libs distclean-libs \ maintainer-clean-libs \ - clean-tmp clean_doxygen clean-extra-names + clean-tmp clean_doxygen clean-extra-names \ + pure distclean doc_targets:= README man install-doc install-man install-ser-man \ install-every-module-doc install-every-module-man \ $(foreach m,$(modules_dirs),$(m)-doc $(m)-readme $(m)-man) \

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2015