sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:kamailio_3.0: uac(k): set type for tm callback

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: f4f9207f77883efa4dab67b3afe7c693585dc32c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4f9207… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 24 19:43:09 2010 +0100 uac(k): set type for tm callback - requires to be TMCB_LOCAL_COMPLETED --- modules_k/uac/uac_send.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules_k/uac/uac_send.c b/modules_k/uac/uac_send.c index bd33795..9a1f2b9 100644 --- a/modules_k/uac/uac_send.c +++ b/modules_k/uac/uac_send.c @@ -383,11 +383,14 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) uac_r.method = &_uac_req.s_method; uac_r.headers = (_uac_req.s_hdrs.len <= 0) ? NULL : &_uac_req.s_hdrs; uac_r.body = (_uac_req.s_body.len <= 0) ? NULL : &_uac_req.s_body; - uac_r.cb_flags =(_uac_req.onreply > 0) ? TMCB_LOCAL_COMPLETED : 0; - uac_r.cb = (_uac_req.onreply > 0) ? uac_send_tm_callback : NULL; - /* Callback function */ - uac_r.cbp = (_uac_req.onreply > 0) ? (void*)(long)_uac_req.onreply : 0; - /* Callback parameter */ + if(_uac_req.onreply > 0) + { + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + /* Callback function */ + uac_r.cb = uac_send_tm_callback; + /* Callback parameter */ + uac_r.cbp = (void*)(long)_uac_req.onreply; + } ret = tmb.t_request(&uac_r, /* UAC Req */ &_uac_req.s_ruri, /* Request-URI */ (_uac_req.s_turi.len<=0)?&_uac_req.s_ruri:&_uac_req.s_turi, /* To */

14 years, 11 months

Fosdem 2010 - reminder

by Daniel-Constantin Mierla

Hello, a reminder for those that already received (also sorry for cross-posting) and invitation for new ones, Fosdem 2010 happens this weekend in Brussels and we will have the traditional SIP routing dinner on Saturday Feb 6, trying to get all of us up-to-date regarding projects such as ser, kamailio (openser), sip-router, sems, asterisk, freeswitch, a.s.o. If you plan to attend, please confirm till Wednesday (send me an email), we need to have a fair estimation of attendees number to make the restaurant reservation. See more at: http://sip-router.org/2010/01/31/fosdem-2010-meeting-in-brussels/ See you at Fosdem, Daniel -- Daniel-Constantin Mierla eLearning Class for Kamailio 3.0.0 Starts Feb 8, 2010 * http://www.asipto.com/

14 years, 11 months

git:master: Merge remote branch 'origin/sr_3.0'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 13ecdcd7ddfd7644bbbe0f95674e4d450f980d4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13ecdcd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 1 12:44:30 2010 +0100 Merge remote branch 'origin/sr_3.0' * origin/sr_3.0: tm: fix setting the pre-T callbacks drouting: register MI commands drouting(k): Makefile updated to link libs registrar(k): preserve old bflags upon lookup pv: fixed author name tm: set request and reply for TMCB_RESPONSE_SENT tm: run release function for tmcb parameters tm: t_on_xyz("0") fixup updates core: usage of drop in onsend_route for Kamailio compatibility core: exit() is now equivalent to exit 1 core: drop reply ser compatibility core: drop reply in K compatible style sanity: fix include file due to previous re-location sanity: moved module from modules_s to modules ---

14 years, 11 months

git:sr_3.0: Merge remote branch 'origin/tmp/k3.0_sr_backports' into sr_3.0

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 33f8af89d77055c1eaf38d8c64eb21d85478f5f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33f8af8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 1 12:36:49 2010 +0100 Merge remote branch 'origin/tmp/k3.0_sr_backports' into sr_3.0 * origin/tmp/k3.0_sr_backports: tm: fix setting the pre-T callbacks drouting: register MI commands drouting(k): Makefile updated to link libs registrar(k): preserve old bflags upon lookup pv: fixed author name tm: set request and reply for TMCB_RESPONSE_SENT tm: run release function for tmcb parameters tm: t_on_xyz("0") fixup updates core: usage of drop in onsend_route for Kamailio compatibility core: exit() is now equivalent to exit 1 core: drop reply ser compatibility core: drop reply in K compatible style sanity: fix include file due to previous re-location sanity: moved module from modules_s to modules ---

14 years, 11 months

git:tmp/k3.0_sr_backports: drouting(k): Makefile updated to link libs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 31c459fad4f94aeb6d0cb5519ff1c48fe4c1e927 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31c459f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jan 25 10:06:41 2010 +0100 drouting(k): Makefile updated to link libs - fixed missing core libs in Makefile - reported by Denis Pulyato (cherry picked from commit f572564e862a56470ccb2bc2aa2b23fcbb5dd318) --- modules_k/drouting/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/drouting/Makefile b/modules_k/drouting/Makefile index acc2c1a..23f6fc4 100644 --- a/modules_k/drouting/Makefile +++ b/modules_k/drouting/Makefile @@ -8,4 +8,9 @@ NAME=drouting.so LIBS= DEFS+=-DOPENSER_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/kcore/kcore +SER_LIBS+=$(SERLIBPATH)/kmi/kmi + include ../../Makefile.modules

14 years, 11 months

git:tmp/k3.0_sr_backports: drouting: register MI commands

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 82cba0db58e53a1b3d162d8d7ea21381942f9ab6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82cba0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jan 27 12:33:26 2010 +0100 drouting: register MI commands - the module didn't register the MI commands in mod init - reported by Denis Putyato (cherry picked from commit f12562923e580644f20ae964264747be849d1ce9) (cherry picked from commit c2f9d800c367d614411159c599f078fbcc0e311e) --- modules_k/drouting/drouting.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 80284dc..e7817f9 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -45,7 +45,7 @@ #include "../../resolve.h" #include "../../parser/parse_from.h" #include "../../parser/parse_uri.h" -#include "../../mi/mi.h" +#include "../../lib/kmi/mi.h" #include "dr_load.h" #include "prefix_tree.h" @@ -268,7 +268,13 @@ static int dr_init(void) { pv_spec_t avp_spec; - LM_INFO("Dynamic-Routing - initializing\n"); + LM_INFO("DRouting - initializing\n"); + + if(register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } /* check the module params */ if (db_url.s==NULL || db_url.s[0]==0) {

14 years, 11 months

git:tmp/k3.0_sr_backports: tm: fix setting the pre-T callbacks

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: a9c4a00bf471e6a006d581ded6bb3cb659f4d025 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9c4a00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 1 11:27:20 2010 +0100 tm: fix setting the pre-T callbacks - introduced in the fix for uac module (affecting only uac) - credits to Andrei Pelinescu-Onciul (cherry picked from commit 32d3e9c98943ad298f09d26db83ecf4ce5c2cc0e) --- modules/tm/t_hooks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index 7698517..3d64bae 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -81,7 +81,7 @@ struct tmcb_head_list* get_early_tmcb_list(struct sip_msg *msg) void set_early_tmcb_list(struct sip_msg *msg, struct cell *t) { - if (msg->id!=tmcb_early_hl.msgid) { + if (msg->id==tmcb_early_hl.msgid) { t->tmcb_hl = tmcb_early_hl.cb_list; memset(&tmcb_early_hl.cb_list, 0, sizeof(struct tmcb_head_list)); tmcb_early_hl.msgid = 0;

14 years, 11 months

git:tmp/k3.0_sr_backports: tm: set request and reply for TMCB_RESPONSE_SENT

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c9860c307016ffbff971ab9eb483c04f8de03dd9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9860c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jan 18 11:59:19 2010 +0100 tm: set request and reply for TMCB_RESPONSE_SENT - for some reason they were NULL - affected was sip_trace - credits to Nguyen Quang Tri fore report and troubleshooting (cherry picked from commit 03ab185bca42e5788eeef5f5c13e02e547c524a1) --- modules/tm/t_reply.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 5b09f33..02b03e5 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -602,7 +602,8 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, trans->uas.request, FAKED_REPLY, code); #ifdef TMCB_ONSEND if (unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_SENT))){ - INIT_TMCB_ONSEND_PARAMS(onsend_params, 0, 0, rb, &rb->dst, + INIT_TMCB_ONSEND_PARAMS(onsend_params, trans->uas.request, + FAKED_REPLY, rb, &rb->dst, buf, len, TMCB_LOCAL_F, rb->branch, code); run_onsend_callbacks2(TMCB_RESPONSE_SENT, trans, &onsend_params);

14 years, 11 months

git:tmp/k3.0_sr_backports: pv: fixed author name

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c768636452d7aec7dca47fb6442fe718a51f9e30 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c768636… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jan 18 12:35:46 2010 +0100 pv: fixed author name - forgotten when creating readme files starting from another module docbook files (cherry picked from commit 45f76f44abca5d049c3d289a1f9d09c6821c92d9) --- modules_k/pv/README | 2 +- modules_k/pv/doc/pv.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pv/README b/modules_k/pv/README index 6b9b892..3740c2f 100644 --- a/modules_k/pv/README +++ b/modules_k/pv/README @@ -1,6 +1,6 @@ Pseudo-Variables Module -Daniel-Constantin Modroiu +Daniel-Constantin Mierla asipto.com <daniel(a)asipto.com> diff --git a/modules_k/pv/doc/pv.xml b/modules_k/pv/doc/pv.xml index 33590ab..c082b99 100644 --- a/modules_k/pv/doc/pv.xml +++ b/modules_k/pv/doc/pv.xml @@ -15,7 +15,7 @@ <authorgroup> <author> <firstname>Daniel-Constantin</firstname> - <surname>Modroiu</surname> + <surname>Mierla</surname> <affiliation><orgname>asipto.com</orgname></affiliation> <email>daniel(a)asipto.com</email> <address>

14 years, 11 months

git:tmp/k3.0_sr_backports: registrar(k): preserve old bflags upon lookup

by Andrei Pelinescu-Onciul

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c3299d26c0f035b9fd4755a6854b9fe97fb4454e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3299d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jan 18 15:43:32 2010 +0100 registrar(k): preserve old bflags upon lookup - lookup was resetting bflags value with what was retrieved from location table - preserve now bflags set in config before - reported by Ricardo Martinez (cherry picked from commit e6eceeb8ccce8b37d09f5f69cafb97e007467d78) --- modules_k/registrar/lookup.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 2db8ee7..67accc7 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -65,6 +65,8 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) int res; int ret; str path_dst; + flag_t old_bflags; + if (_m->new_uri.s) uri = _m->new_uri; else uri = _m->first_line.u.request.uri; @@ -131,7 +133,9 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) set_ruri_q(ptr->q); - setbflagsval( 0, ptr->cflags); + old_bflags = 0; + getbflagsval(0, &old_bflags); + setbflagsval(0, old_bflags|ptr->cflags); if (ptr->sock) set_force_socket(_m, ptr->sock);

14 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010