sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 2af7504fe4be356b59a53f7cb65311f433d107f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2af7504… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jul 9 21:47:26 2009 +0200 makefile: fix group_include fix recently introduced group_include bug --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1dcdb85..581a907 100644 --- a/Makefile +++ b/Makefile @@ -222,8 +222,8 @@ override exclude_modules+= CVS $(skip_modules) # Test for the groups and add to include_modules ifneq (,$(group_include)) -override include_modules+=$(foreach grp, $(group_include), \ - $(module_group_$(grp)) ) +$(eval override include_modules+= $(foreach grp, $(group_include), \ + $(module_group_$(grp)) )) endif # first 2 lines are excluded because of the experimental or incomplete

15 years, 6 months

git:master: debian: various fixes and cleanups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 53413e1f7ba0388fcaf7b2ed24e25067785f16ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53413e1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jul 9 21:51:03 2009 +0200 debian: various fixes and cleanups - fixed duplicate libraries - fixed wrong config install path - added a ser-db-modules package containing db dependent modules - debian rules major cleanup --- pkg/debian/changelog | 10 ++++ pkg/debian/control | 29 +++++++---- pkg/debian/rules | 131 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 114 insertions(+), 56 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=534…

15 years, 6 months

git:master: siptrace(k): some updates to work with sip-router core

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: de9ef971f95fbc086eb68be63864934ae8d608b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de9ef97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 9 19:05:16 2009 +0200 siptrace(k): some updates to work with sip-router core - module not completely ready - prepared to enable sip_trace() in onsend route to be able to store stateless forwarded messages --- modules_k/siptrace/siptrace.c | 191 +++++++++++++++++++---------------------- 1 files changed, 89 insertions(+), 102 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=de9…

15 years, 6 months

git:master: core: temporary sip_msg flags reserved for K moved to end of bitmask

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8d26ed40d5646b410928ce44d85201a6b57a5ebb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d26ed4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 9 16:47:49 2009 +0200 core: temporary sip_msg flags reserved for K moved to end of bitmask - respective modules updated --- modules/mediaproxy/mediaproxy.c | 2 +- modules_k/acc/acc.h | 2 +- modules_k/nat_traversal/nat_traversal.c | 3 +++ parser/msg_parser.h | 7 +++++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 37e0353..acedf5b 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -60,7 +60,7 @@ MODULE_VERSION #endif /* WARNING: Keep this aligned with parser/msg_parser.h! */ -#define FL_USE_MEDIA_PROXY (1<<12) +#define FL_USE_MEDIA_PROXY (1<<30) #define SIGNALING_IP_AVP_SPEC "$avp(s:signaling_ip)" #define MEDIA_RELAY_AVP_SPEC "$avp(s:media_relay)" diff --git a/modules_k/acc/acc.h b/modules_k/acc/acc.h index 576de17..e03dad4 100644 --- a/modules_k/acc/acc.h +++ b/modules_k/acc/acc.h @@ -79,7 +79,7 @@ * projects. The value of the flag must be kept synchronized with other flags * defined in parser/msg_parser.h! */ -#define FL_REQ_UPSTREAM (1<<11) +#define FL_REQ_UPSTREAM (1<<29) void acc_log_init(void); int acc_log_request( struct sip_msg *req); diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index d2b3d05..26aa93c 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -63,6 +63,9 @@ MODULE_VERSION #endif +/* WARNING: Keep this aligned with parser/msg_parser.h! */ +#define FL_DO_KEEPALIVE (1<<31) + #define HASH_SIZE 512 diff --git a/parser/msg_parser.h b/parser/msg_parser.h index ece6b18..a811b61 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -110,12 +110,15 @@ enum request_method { #define FL_MTU_TLS_FB (1 << 9) #define FL_MTU_SCTP_FB (1 << 10) -/* WARNING: Value (1 << 11) is temporarily reserved for use in kamailio acc +/* WARNING: Value (1 << 29) is temporarily reserved for use in kamailio acc * module (flag FL_REQ_UPSTREAM)! */ -/* WARNING: Value (1 << 12) is temporarily reserved for use in kamailio +/* WARNING: Value (1 << 30) is temporarily reserved for use in kamailio * media proxy module (flag FL_USE_MEDIA_PROXY)! */ +/* WARNING: Value (1 << 31) is temporarily reserved for use in kamailio + * nat_traversal module (flag FL_DO_KEEPALIVE)! */ + #define FL_MTU_FB_MASK (FL_MTU_TCP_FB|FL_MTU_TLS_FB|FL_MTU_SCTP_FB)

15 years, 6 months

git:master: nat_traversal(k): module compiles with sip-router core

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d908ca84a6a6d0216ae53486f71221a21cfd53ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d908ca8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 9 17:18:13 2009 +0200 nat_traversal(k): module compiles with sip-router core --- modules_k/nat_traversal/nat_traversal.c | 41 ++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 26aa93c..119c592 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -43,6 +43,7 @@ #include "../../data_lump.h" #include "../../mod_fix.h" #include "../../script_cb.h" +#include "../../timer_proc.h" #include "../../parser/msg_parser.h" #include "../../parser/parse_from.h" #include "../../parser/parse_uri.h" @@ -185,6 +186,7 @@ static Bool test_private_via(struct sip_msg *msg); static INLINE char* shm_strdup(char *source); static int mod_init(void); +static int child_init(int rank); static void mod_destroy(void); static int preprocess_request(struct sip_msg *msg, unsigned int flags, void *param); static int reply_filter(struct sip_msg *reply); @@ -275,7 +277,7 @@ struct module_exports exports = { mod_init, // module init function (before fork. kids will inherit) reply_filter, // reply processing function mod_destroy, // destroy function - 0 // child init function + child_init // child init function }; @@ -1496,7 +1498,7 @@ send_keepalive(NAT_Contact *contact) static char *from_ip = from + sizeof(FROM_PREFIX) - 1; static struct socket_info *last_socket = NULL; struct hostent* hostent; - union sockaddr_union to; + struct dest_info dst; int nat_port, len; str nat_ip; @@ -1537,14 +1539,17 @@ send_keepalive(NAT_Contact *contact) return; } + init_dest_info(&dst); //nat_ip.s = strchr(contact->uri, ':') + 1; nat_ip.s = &contact->uri[4]; // skip over "sip:" ptr = strchr(nat_ip.s, ':'); nat_ip.len = ptr - nat_ip.s; nat_port = strtol(ptr+1, NULL, 10); - hostent = sip_resolvehost(&nat_ip, NULL, NULL, False, NULL); - hostent2su(&to, hostent, 0, nat_port); - udp_send(contact->socket, buffer, len, &to); + hostent = sip_resolvehost(&nat_ip, NULL, NULL); + hostent2su(&dst.to, hostent, 0, nat_port); + dst.proto=PROTO_UDP; + dst.send_sock=contact->socket; + udp_send(&dst, buffer, len); } @@ -1665,7 +1670,7 @@ restore_keepalive_state(void) if (now > rtime && now > stime) continue; // expired entry - if (parse_phostport(socket, strlen(socket), &host.s, &host.len, &port, &proto) < 0) + if (parse_phostport(socket, &host.s, &host.len, &port, &proto) < 0) continue; sock = grep_sock_info(&host, (unsigned short)port, (unsigned short)proto); @@ -1698,6 +1703,7 @@ mod_init(void) { register_slcb_t register_sl_callback; int *param; + modparam_t type; if (keepalive_interval <= 0) { LM_NOTICE("keepalive functionality is disabled from the configuration\n"); @@ -1727,14 +1733,16 @@ mod_init(void) have_dlg_api = True; // load dlg_flag and default_timeout parameters from the dialog module - param = find_param_export("dialog", "dlg_flag", INT_PARAM); + param = find_param_export(find_module_by_name("dialog"), + "dlg_flag", INT_PARAM, &type); if (!param) { LM_ERR("cannot find dlg_flag parameter in the dialog module\n"); return -1; } dialog_flag = *param; - param = find_param_export("dialog", "default_timeout", INT_PARAM); + param = find_param_export(find_module_by_name("dialog"), + "default_timeout", INT_PARAM, &type); if (!param) { LM_ERR("cannot find default_timeout parameter in the dialog module\n"); return -1; @@ -1788,14 +1796,23 @@ mod_init(void) LM_NOTICE("using 10 seconds for keepalive_interval\n"); keepalive_interval = 10; } - if (register_timer_process(keepalive_timer, NULL, 1, TIMER_PROC_INIT_FLAG) < 0) { - LM_ERR("failed to register keepalive timer process\n"); - return -1; - } + register_procs(1); return 0; } +static int +child_init(int rank) +{ + if (rank==PROC_MAIN) { + if(fork_dummy_timer(PROC_TIMER, "TIMER NT", 1 /*socks flag*/, + keepalive_timer, NULL, 1 /*sec*/)<0) { + LM_ERR("failed to register keepalive timer process\n"); + return -1; + } + } + return 0; +} static void mod_destroy(void)

15 years, 6 months

Debian problems

by Klaus Darilion

Hi Andrei! Thanks for fixing the debian specs. I found the following problems: What are ser-ai1 and ser-nth packages? Some proprietary modules? sr libraries (kcore, srdb1, srdb2 ...) are included in various other ser-packages (mysql, postgres ...). IMO, all those libraries should be part of the main package. regards klaus

15 years, 6 months

git:master: makefile: dbtext(s) removed from the db group

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 56a54e9431ae76e676f2e8b93da9fefdf75894ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56a54e9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jul 9 13:52:53 2009 +0200 makefile: dbtext(s) removed from the db group dbtext(s) is not yet migrated to the current db interfaces. --- Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index a12d685..1dcdb85 100644 --- a/Makefile +++ b/Makefile @@ -156,8 +156,9 @@ module_group_standard_dep=acc_db acc_radius auth_db auth_radius avp_db \ presence_b2b rls speeddial uri_db xcap xmlrpc # For db use (db modules, excluding drivers) -module_group_db=acc_db auth_db avp_db db_ops db_flatstore dbtext db_text \ +module_group_db=acc_db auth_db avp_db db_ops db_flatstore db_text \ uri_db domain lcr msilo speeddial + #dbtext (s) not migrated yet to the new db interface # For mysql module_group_mysql_driver=db_mysql

15 years, 6 months

git:master: core: backup/restore script flags

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 40a285274bbec1d9d56eae00f8ccd7d1a0751f36 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40a2852… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 9 12:35:13 2009 +0200 core: backup/restore script flags - safe usage of script flags in nested top routes --- action.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index e360730..a793263 100644 --- a/action.c +++ b/action.c @@ -1296,9 +1296,15 @@ int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx *c) { struct run_act_ctx ctx; struct run_act_ctx *p; + int ret; + flag_t sfbk; + p = (c)?c:&ctx; + sfbk = getsflags(); setsflagsval(0); reset_static_buffer(); init_run_actions_ctx(p); - return run_actions(p, a, msg); + ret = run_actions(p, a, msg); + setsflagsval(sfbk); + return ret; }

15 years, 6 months

git:master: table: drop in event_route[htable:mod-init]

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3734194dfe4b3e81c49119508ff9aa3dd4682978 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3734194… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 9 12:30:48 2009 +0200 table: drop in event_route[htable:mod-init] - usage of drop in event_route[htable:mod-init] causes failure of child_init(), stopping the start process --- modules_k/htable/htable.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 648ab09..41a9a2c 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -170,6 +170,7 @@ static int mod_init(void) static int child_init(int rank) { struct sip_msg *fmsg; + struct run_act_ctx ctx; int rtb, rt; LM_DBG("rank is (%d)\n", rank); @@ -184,7 +185,12 @@ static int child_init(int rank) fmsg = faked_msg_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); - run_top_route(event_rt.rlist[rt], fmsg, 0); + run_top_route(event_rt.rlist[rt], fmsg, &ctx); + if(ctx.run_flags&DROP_R_F) + { + LM_ERR("exit due to 'drop' in event route\n"); + return -1; + } set_route_type(rtb); }

15 years, 6 months

git:tmp/build_request: Merge branch 'master' of ssh://daniel@git.sip-router .org/sip-router

by Daniel-Constantin Mierla

Module: sip-router Branch: tmp/build_request Commit: b70792cb874fd6193023838d2d38fa9c7a99420a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b70792c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 9 11:54:35 2009 +0200 Merge branch 'master' of ssh://daniel@git.sip-router.org/sip-router * 'master' of ssh://daniel@git.sip-router.org/sip-router: core: run_top_route() can be give action context core: internal difference between cfg drop and exit kex: several K core stats implemented in callbacks makefile: more modules groups and make modules-all prefix_route(s): fix: the lock should be in shm prefix_route(s): fix mod_destroy/tree_close() debian: updated debian spec for sip-router makefile: fix make cfg when the cfg vars are already exported core: derive default config name from -DNAME ---

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev