sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:ser_core_cvs: tcp: helper internal macros
by Andrei Pelinescu-Onciul 16 Apr '09

16 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: f73a84d57949101a9d0842d049fe7aab71d8613b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f73a84d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Apr 9 19:10:31 2009 +0000 tcp: helper internal macros - helper macros for getting the local address & port, the peer address & port, the protocol and the compression from a tcp connection structure pointer. --- tcp_conn.h | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index 7ae829d..9db6308 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -188,6 +188,31 @@ struct tcp_connection{ }; +/* helper macros */ + +#define TCP_RCV_INFO(c) (&(c)->rcv) + +#define TCP_RCV_LADDR(r) (&((r).dst_ip)) +#define TCP_RCV_LPORT(r) ((r).dst_port) +#define TCP_RCV_PADDR(r) (&((r).src_ip)) +#define TCP_RCV_PPORT(r) ((r).src_port) +#define TCP_RCV_PSU(r) (&(r).src_su) +#define TCP_RCV_SOCK_INFO(r) ((r).bind_address) +#define TCP_RCV_PROTO(r) ((r).proto) +#ifdef USE_COMP +#define TCP_RCV_COMP(r) ((r).comp) +#else +#define TCP_RCV_COMP(r) 0 +#endif /* USE_COMP */ + +#define TCP_LADDR(c) TCP_RCV_LADDR(c->rcv) +#define TCP_LPORT(c) TCP_RCV_LPORT(c->rcv) +#define TCP_PADDR(c) TCP_RCV_PADDR(c->rcv) +#define TCP_PPORT(c) TCP_RCV_PPORT(c->rcv) +#define TCP_PSU(c) TCP_RCV_PSU(c->rcv) +#define TCP_SOCK_INFO(c) TCP_RCV_SOCK_INFO(c->rcv) +#define TCP_PROTO(c) TCP_RCV_PROTO(c->rcv) +#define TCP_COMP(c) TCP_RCV_COMP(c->rcv)

1 0

git:ser_core_cvs: Do not try to backlist and do not try DNS failover for blind UACs as
by Andrei Pelinescu-Onciul 16 Apr '09

16 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: 5525e5ccad77fb277be594a88e09e9ea19daf30e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5525e5c… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Apr 8 11:44:23 2009 +0000 Do not try to backlist and do not try DNS failover for blind UACs as they do not have a destination address. --- modules/tm/timer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/tm/timer.c b/modules/tm/timer.c index a4ff7e5..0c0139a 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -449,7 +449,9 @@ inline static void final_response_handler( struct retr_buf* r_buf, DBG("DEBUG: final_response_handler:stop retr. and send CANCEL (%p)\n", t); #endif if ((r_buf->branch < MAX_BRANCHES) && /* r_buf->branch is always >=0 */ - (t->uac[r_buf->branch].last_received==0)){ + (t->uac[r_buf->branch].last_received==0) && + (t->uac[r_buf->branch].request.buffer!=NULL) /* not a blind UAC */ + ){ /* no reply received */ #ifdef USE_DST_BLACKLIST if (cfg_get(core, core_cfg, use_dst_blacklist)

1 0

git:ser_core_cvs: Safety check added to verify whether the static buffers have
by Andrei Pelinescu-Onciul 16 Apr '09

16 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: d1e2ffe61fb19810e7fc9bf23b21b8580cc6c696 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1e2ffe… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Apr 7 09:07:48 2009 +0000 Safety check added to verify whether the static buffers have been initialized. --- select_buf.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/select_buf.c b/select_buf.c index 1037391..3a6ae24 100644 --- a/select_buf.c +++ b/select_buf.c @@ -105,6 +105,15 @@ static int allocate_buffer(int req_size) { char* get_static_buffer(int req_size) { char *p = NULL; + +#ifdef EXTRA_DEBUG + if ((active_buffer < 0) || (active_buffer > MAX_BUFFERS-1)) { + LOG(L_CRIT, "BUG: buffers have not been initialized yet. " + "Call reset_static_buffer() before executing " + "a route block.\n"); + abort(); + } +#endif if ((buffer[active_buffer].size >= buffer[active_buffer].offset + req_size) || (allocate_buffer(req_size))) { /* enough space in current buffer or allocation successful */

1 0

git:master: port doc changes from kamailio 1.5 branch, r5794
by Henning Westerholt 16 Apr '09

16 Apr '09

Module: sip-router Branch: master Commit: 5bad9d33802f87be1fbce04b0f24b4aedf6c606c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bad9d3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 16 12:51:18 2009 +0200 port doc changes from kamailio 1.5 branch, r5794 --- modules/carrierroute/README | 8 ++++---- modules/carrierroute/doc/carrierroute_admin.xml | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/carrierroute/README b/modules/carrierroute/README index 67fbb2b..475138a 100644 --- a/modules/carrierroute/README +++ b/modules/carrierroute/README @@ -227,10 +227,10 @@ Chapter 1. Admin Guide is better to pass only IDs in AVPs to the routing functions. Basically this module could be used as an replacement for the - lcr and the dispatcher module, if you have certain performance, - flexibility and/or integration requirements that these modules - don't handle properly. But for small installations it probably - make more sense to use the lcr and dispatcher module. + lcr and the dispatcher module, if you have certain flexibility, + integration and/or performance requirements that can't be + satisfied with these modules. But for smaller installations it + probably make more sense to use the lcr and dispatcher module. If you want to use this module in failure routes, then you need to call "append_branch()" after rewriting the request URI in diff --git a/modules/carrierroute/doc/carrierroute_admin.xml b/modules/carrierroute/doc/carrierroute_admin.xml index d115478..317a54e 100644 --- a/modules/carrierroute/doc/carrierroute_admin.xml +++ b/modules/carrierroute/doc/carrierroute_admin.xml @@ -53,11 +53,10 @@ AVPs to the routing functions. </para> <para> - Basically this module could be used as an replacement for the lcr and the - dispatcher module, if you have certain performance, flexibility and/or - integration requirements that these modules don't handle properly. But for - small installations it probably make more sense to use the lcr and dispatcher - module. + Basically this module could be used as an replacement for the lcr and the + dispatcher module, if you have certain flexibility, integration and/or performance + requirements that can't be satisfied with these modules. But for smaller + installations it probably make more sense to use the lcr and dispatcher module. </para> <para> If you want to use this module in failure routes, then you need to call

1 0

git:master: core: path_vec added to sip_msg structure
by Daniel-Constantin Mierla 16 Apr '09

16 Apr '09

Module: sip-router Branch: master Commit: d752afff9924e66da382a9dea48984761ad52b7f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d752aff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 16 12:14:37 2009 +0200 core: path_vec added to sip_msg structure - basic path support in core (not yet for request forwarding functions) --- parser/msg_parser.c | 27 +++++++++++++++++++++++++++ parser/msg_parser.h | 2 ++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 23201c5..5132112 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -698,6 +698,7 @@ void free_sip_msg(struct sip_msg* msg) { if (msg->new_uri.s) { pkg_free(msg->new_uri.s); msg->new_uri.len=0; } if (msg->dst_uri.s) { pkg_free(msg->dst_uri.s); msg->dst_uri.len=0; } + if (msg->path_vec.s) { pkg_free(msg->path_vec.s); msg->path_vec.len=0; } if (msg->headers) free_hdr_field_lst(msg->headers); if (msg->body && msg->body->free) msg->body->free(&msg->body); if (msg->add_rm) free_lump_list(msg->add_rm); @@ -750,6 +751,32 @@ void reset_dst_uri(struct sip_msg* msg) msg->dst_uri.len = 0; } +int set_path_vector(struct sip_msg* msg, str* path) +{ + char* ptr; + + if (!msg || !path) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (msg->path_vec.s && (msg->path_vec.len >= path->len)) { + memcpy(msg->path_vec.s, path->s, path->len); + msg->path_vec.len = path->len; + } else { + ptr = (char*)pkg_malloc(path->len); + if (!ptr) { + LM_ERR("not enough pkg memory\n"); + return -1; + } + + memcpy(ptr, path->s, path->len); + if (msg->path_vec.s) pkg_free(msg->path_vec.s); + msg->path_vec.s = ptr; + msg->path_vec.len = path->len; + } + return 0; +} struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht) { diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 8624035..dd1b327 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -328,6 +328,7 @@ typedef struct sip_msg { str set_global_port; struct socket_info* force_send_socket; /* force sending on this socket, if ser */ + str path_vec; } sip_msg_t; /* pointer to a fakes message which was never received ; @@ -437,4 +438,5 @@ void reset_dst_uri(struct sip_msg* msg); struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht); struct hdr_field* next_sibling_hdr(struct hdr_field *hf); +int set_path_vector(struct sip_msg* msg, str* path); #endif

1 0

kamailio-3.0 git repository is gone
by Jan Janak 16 Apr '09

16 Apr '09

Hello, The temporary kamailio-3.0 git repository is gone. The repository was used to keep patches that made kamailio modules work with the sip-router core. All the patches are now integrated directly into the shared sip-router repository and thus the temporary kamailio-3.0 repository is no longer needed. Jan.

1 0

git:master: makefile: excluded modules that do not compile
by Andrei Pelinescu-Onciul 15 Apr '09

15 Apr '09

Module: sip-router Branch: master Commit: b0f6ec8784712e4c1436fc9a4a3b54296e94ba5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0f6ec8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 22:27:36 2009 +0200 makefile: excluded modules that do not compile - excluded modules that depend on external libs from default compilation - excluded non-essential modules that do not compile yet --- Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 5ed6935..89a5e10 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,12 @@ else auth_radius uri_radius avp_radius \ acc_radius dialog pa rls presence_b2b xcap xmlrpc\ osp tls oracle \ - unixsock dbg print_lib auth_identity ldap + unixsock dbg print_lib auth_identity ldap \ + db_berkeley db_mysql db_postgres db_oracle \ + db_unixodbc memcached mi_xmlrpc \ + nat_traversal perlvdb purple seas siptrace \ + snmpstats uac_redirect xmpp \ + carrierroute # excluded because they do not compile (remove them only after they are # fixed) -- andrei exclude_modules+= avpops bdb dbtext iptrtpproxy pa rls

1 0

git:master: sercmd: include path updated
by Andrei Pelinescu-Onciul 15 Apr '09

15 Apr '09

Module: sip-router Branch: master Commit: 0253726f99ac151f748712a5d39d71f42d9defc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0253726… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 22:38:52 2009 +0200 sercmd: include path updated --- utils/sercmd/sercmd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 1293b63..cd00a2c 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -54,9 +54,9 @@ #include "parse_listen_id.h" #include "license.h" -#include "../../modules/ctl/ctl_defaults.h" /* default socket & port */ -#include "../../modules/ctl/binrpc.h" -#include "../../modules/ctl/binrpc.c" /* ugly hack */ +#include "../../modules_s/ctl/ctl_defaults.h" /* default socket & port */ +#include "../../modules_s/ctl/binrpc.h" +#include "../../modules_s/ctl/binrpc.c" /* ugly hack */ #ifndef NAME

1 0

git:master: makefile: fix install-man
by Andrei Pelinescu-Onciul 15 Apr '09

15 Apr '09

Module: sip-router Branch: master Commit: 89fd860c7b1ac4147e2ff56d3d479d6600fdc848 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89fd860… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 22:37:56 2009 +0200 makefile: fix install-man - fixed source path when installing modules man pages --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 89a5e10..3ad22d9 100644 --- a/Makefile +++ b/Makefile @@ -541,7 +541,7 @@ install-$(1)-man: $(1)-man $(man_prefix)/$(man_dir)/man7 $$(call try_err,\ $(INSTALL_TOUCH) $(man_prefix)/$(man_dir)/man7/"$$$$r".7 );\ $$(call try_err,\ - $(INSTALL_MAN) modules/"$$$$r"/"$$$$r".7 \ + $(INSTALL_MAN) $(1)/"$$$$r"/"$$$$r".7 \ $(man_prefix)/$(man_dir)/man7 ); \ fi ; \ fi ; \

1 0

git:master: Merge ser modules into sip-router master branch
by Andrei Pelinescu-Onciul 15 Apr '09

15 Apr '09

Module: sip-router Branch: master Commit: 3cc16e2873a48b89d495f3a2065e4171bfff70ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cc16e2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 15 21:23:34 2009 +0200 Merge ser modules into sip-router master branch (merge commit 'origin/ser_modules') * commit 'origin/ser_modules': (2777 commits) modules: added missing parse_to.h include xlog: LOG_() api update usrloc: fixed name conflict lcr: updated to the route_mode changes modules: tm register_tcmb api update ser modules ported to sip-router tls: ser_cert.sh portability fixes METHOD_OTHER is replaced with METHOD_OPTIONS, because the OPTIONS request cfg_size macro renamed to cfg_sizeof to avoid a conflict with one of the * logging API updated (see doc/logging-api.txt for details) When building the route set of ACKs for local UACs, only the reply is now Fixed compiler issues warnings over: Some errors are marked as DB API (framework) failures instead of MYSQL API The header file ds_rpc.h statically defines the doc string for some RPC "Route :" prefix (and separator) is used some more time across the permissions: fix build without -DUSE_IPV6 errors nathelper: added support for SDP rtcp attribute (RFC 3605) prefix_route: include atomic_ops.h where atomic_t is used Fix warnings on LP64 plarforms out there (all 64-bit amd64/emt64 unixes Add comma between function names and fix typo. ... ---

1 0

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009