sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:master: Add parsed_uri structure to the to_body structure.

by Jan Janak

Module: sip-router Branch: master Commit: 0873991755f732a3a57cfeb8d0d9437f4fd306bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0873991… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 5 23:47:02 2009 +0100 Add parsed_uri structure to the to_body structure. This is a compatiblity change inspired by kamailio changes. It makes it possible to store already parsed to and from URIs in the sip message structure and there is no need to reparse such URIs later. To and From headers are often parsed repeatedly in modules. As a side effect I had to avoid a nasty cyclic dependency in parser headers. I removed parse_to from msg_parser.h, the header does not have to be included there because nothing in msg_parser.h uses stuff from parse_to. In addition to that many files that previously included only msg_parser.h, and assumed that the header would pull parse_to.h as well, needed to be modified to include parse_to.h explicitly. --- msg_translator.c | 1 + parser/msg_parser.c | 1 + parser/msg_parser.h | 1 - parser/parse_from.h | 1 + parser/parse_to.h | 2 ++ 5 files changed, 5 insertions(+), 1 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index ae52878..3df42d4 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -139,6 +139,7 @@ #include "ut.h" #include "pt.h" #include "cfg/cfg.h" +#include "parser/parse_to.h" #include "forward.h" diff --git a/parser/msg_parser.c b/parser/msg_parser.c index a7df061..e50d3ff 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -58,6 +58,7 @@ #include "parse_hname2.h" #include "parse_uri.h" #include "parse_content.h" +#include "parse_to.h" #include "../compiler_opt.h" #ifdef DEBUG_DMALLOC diff --git a/parser/msg_parser.h b/parser/msg_parser.h index b1541b7..86855e8 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -59,7 +59,6 @@ #include "../config.h" #include "parse_def.h" #include "parse_cseq.h" -#include "parse_to.h" #include "parse_via.h" #include "parse_fline.h" #include "parse_retry_after.h" diff --git a/parser/parse_from.h b/parser/parse_from.h index f9e149a..1618627 100644 --- a/parser/parse_from.h +++ b/parser/parse_from.h @@ -29,6 +29,7 @@ #ifndef _PARSE_FROM_H #define _PARSE_FROM_H +#include "parse_to.h" #include "msg_parser.h" diff --git a/parser/parse_to.h b/parser/parse_to.h index c032cb1..08e4fc4 100644 --- a/parser/parse_to.h +++ b/parser/parse_to.h @@ -30,6 +30,7 @@ #define PARSE_TO #include "../str.h" +#include "msg_parser.h" enum { TAG_PARAM = 400, GENERAL_PARAM @@ -49,6 +50,7 @@ struct to_body{ str uri; /* URI */ str display; /* Display Name */ str tag_value; /* Value of tag */ + struct sip_uri parsed_uri; struct to_param *param_lst; /* Linked list of parameters */ struct to_param *last_param; /* Last parameter in the list */ };

15 years, 10 months

git:janakj/kcore: Adding cmpapi.[ch] from kamailio core.

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 06e7f4bab16c3f78686282d67ab16fb2065f01e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06e7f4b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 16:22:22 2009 +0100 Adding cmpapi.[ch] from kamailio core. --- lib/kcore/cmpapi.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/cmpapi.h | 57 ++++++++++++ 2 files changed, 297 insertions(+), 0 deletions(-) diff --git a/lib/kcore/cmpapi.c b/lib/kcore/cmpapi.c new file mode 100644 index 0000000..8223052 --- /dev/null +++ b/lib/kcore/cmpapi.c @@ -0,0 +1,240 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief comparison functions + */ + +#include "../../parser/parse_uri.h" +#include "../../parser/parse_param.h" +#include "cmpapi.h" + +int cmp_str(str *s1, str *s2) +{ + int ret = 0; + int len = 0; + if(s1->len==0 && s2->len==0) + return 0; + if(s1->len==0) + return -1; + if(s2->len==0) + return 1; + len = (s1->len<s2->len)?s1->len:s2->len; + ret = strncmp(s1->s, s2->s, len); + if(ret==0) + { + if(s1->len==s2->len) + return 0; + if(s1->len<s2->len) + return -1; + return 1; + } + return ret; +} + +int cmpi_str(str *s1, str *s2) +{ + int ret = 0; + int len = 0; + if(s1->len==0 && s2->len==0) + return 0; + if(s1->len==0) + return -1; + if(s2->len==0) + return 1; + len = (s1->len<s2->len)?s1->len:s2->len; + ret = strncasecmp(s1->s, s2->s, len); + if(ret==0) + { + if(s1->len==s2->len) + return 0; + if(s1->len<s2->len) + return -1; + return 1; + } + return ret; +} + +int cmp_hdrname_str(str *s1, str *s2) +{ + /* todo: parse hdr name and compare with short/long alternative */ + return cmpi_str(s1, s2); +} + +int cmp_hdrname_strzn(str *s1, char *s2, size_t n) +{ + str s; + s.s = s2; + s.len = n; + return cmpi_str(s1, &s); +} + +int cmp_str_params(str *s1, str *s2) +{ + param_t* pl1 = NULL; + param_hooks_t phooks1; + param_t *pit1=NULL; + param_t* pl2 = NULL; + param_hooks_t phooks2; + param_t *pit2=NULL; + + if (parse_params(s1, CLASS_ANY, &phooks1, &pl1)<0) + return -1; + if (parse_params(s2, CLASS_ANY, &phooks2, &pl2)<0) + return -1; + for (pit1 = pl1; pit1; pit1=pit1->next) + { + for (pit2 = pl2; pit2; pit2=pit2->next) + { + if (pit1->name.len==pit2->name.len + && strncasecmp(pit1->name.s, pit2->name.s, pit2->name.len)==0) + { + if(pit1->body.len!=pit2->body.len + || strncasecmp(pit1->body.s, pit2->body.s, + pit2->body.len)!=0) + return 1; + } + } + } + return 0; +} + +/** + * Compare SIP URI as per RFC3261, 19.1.4 + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) +{ + if(uri1->type!=uri2->type) + return 1; + /* quick check for length */ + if(uri1->user.len!=uri2->user.len + || uri1->host.len!=uri2->host.len + || uri1->port.len!=uri2->port.len + || uri1->passwd.len!=uri2->passwd.len) + return 1; + if(cmp_str(&uri1->user, &uri2->user)!=0) + return 1; + if(cmp_str(&uri1->port, &uri2->port)!=0) + return 1; + if(cmp_str(&uri1->passwd, &uri2->passwd)!=0) + return 1; + if(cmpi_str(&uri1->host, &uri2->host)!=0) + return 1; + /* if no params, we are done */ + if(uri1->params.len==0 && uri2->params.len==0) + return 0; + if(uri1->params.len==0) + { + if(uri2->user_param.len!=0) + return 1; + if(uri2->ttl.len!=0) + return 1; + if(uri2->method.len!=0) + return 1; + if(uri2->maddr.len!=0) + return 1; + } + if(uri2->params.len==0) + { + if(uri1->user_param.len!=0) + return 1; + if(uri1->ttl.len!=0) + return 1; + if(uri1->method.len!=0) + return 1; + if(uri1->maddr.len!=0) + return 1; + } + return cmp_str_params(&uri1->params, &uri2->params); +} + +/** + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri_str(str *s1, str *s2) +{ + struct sip_uri uri1; + struct sip_uri uri2; + + /* todo: parse uri and compare the parts */ + if(parse_uri(s1->s, s1->len, &uri1)!=0) + return -1; + if(parse_uri(s2->s, s2->len, &uri2)!=0) + return -1; + return cmp_uri(&uri1, &uri2); +} + +/** + * Compare SIP AoR + * - match user, host and port (if port missing, assume 5060) + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_aor(struct sip_uri *uri1, struct sip_uri *uri2) +{ + /* quick check for length */ + if(uri1->user.len!=uri2->user.len + || uri1->host.len!=uri2->host.len) + return 1; + if(cmp_str(&uri1->user, &uri2->user)!=0) + return 1; + if(cmp_str(&uri1->port, &uri2->port)!=0) + { + if(uri1->port.len==0 && uri2->port_no!=5060) + return 1; + if(uri2->port.len==0 && uri1->port_no!=5060) + return 1; + } + if(cmpi_str(&uri1->host, &uri2->host)!=0) + return 1; + return 0; +} + +/** + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_aor_str(str *s1, str *s2) +{ + struct sip_uri uri1; + struct sip_uri uri2; + + /* todo: parse uri and compare the parts */ + if(parse_uri(s1->s, s1->len, &uri1)!=0) + return -1; + if(parse_uri(s2->s, s2->len, &uri2)!=0) + return -1; + return cmp_aor(&uri1, &uri2); +} + diff --git a/lib/kcore/cmpapi.h b/lib/kcore/cmpapi.h new file mode 100644 index 0000000..89038f8 --- /dev/null +++ b/lib/kcore/cmpapi.h @@ -0,0 +1,57 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file + * \brief comparison functions + */ + +#ifndef _CMPAPI_H_ +#define _CMPAPI_H_ + +#include <string.h> +#include "../../str.h" + +/** + * Comparison functions + * - return: + * - < 0 - less + * - ==0 - equal + * - > 0 - greater + * cmp_str* - for strings does case sensitive comparison + * cmpi_str* - for strings does case insensitive comparison + * + */ + +#define cmp_strz(a, b) strcmp((a), (b)) +#define cmpi_strz(a, b) strcasecmp((a), (b)) + +int cmp_str(str *s1, str *s2); +int cmpi_str(str *s1, str *s2); + +int cmp_hdrname_str(str *s1, str *s2); +int cmp_hdrname_strzn(str *s1, char *s2, size_t n); +int cmp_uri_str(str *s1, str *s2); +int cmp_aor_str(str *s1, str *s2); + +#endif +

15 years, 10 months

git on sourceforge

by Jan Janak

FYI: http://apps.sourceforge.net/trac/sitedocs/wiki/Git Jan.

15 years, 10 months

git:master: Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/ sip-router

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d7a5e7bc4343c6638207c7343891126e37e20495 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7a5e7b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 18:43:52 2009 +0100 Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/sip-router * 'ser_core_cvs' of ssh://git.sip-router.org/sip-router: tcp: config option to disable active connects tcp: async mode on by default tcp: enable runtime changing for most of the cfg vars tcp: use dynamic config framework, part 2 tcp: use dynamic config framework, part 1 test: updated parse uri test program sctp: rpc info command sctp: connection reuse & connection tracking sctp: empty sctp_handle_assoc_change added regfree() function call is added to free the memory allocated by regcomp(). Conflicts: usr_avp.c - regex free fix from sip-router conflicted with the one from ser (they were the same) ---

15 years, 10 months

git:ser_core_cvs: test: updated parse uri test program

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: cdfae3a1c011e4880769bace80ace6b5bc0e7203 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdfae3a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 4 20:56:21 2009 +0000 test: updated parse uri test program --- test/p_uri.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 4 deletions(-) diff --git a/test/p_uri.c b/test/p_uri.c index 2667656..1f2cc99 100644 --- a/test/p_uri.c +++ b/test/p_uri.c @@ -1,21 +1,85 @@ - +/** uri parser test program. */ +/* compile with: + gcc -Wall p_uri.c -o p_uri -DFAST_LOCK -D__CPU_i386 -DSHM_MEM */ #include <stdio.h> #include <stdlib.h> /* exit() */ #include <string.h> +#include <stdarg.h> #include "../str.h" /* ser compat defs */ #define EXTRA_DEBUG #include "../parser/parse_uri.c" -#include "../dprint.c" int ser_error=0; -int debug=L_DBG; int log_stderr=1; -int log_facility=LOG_DAEMON; int process_no=0; struct process_table* pt=0; +int phone2tel=1; +volatile int dprint_crit=0; +int my_pid() {return 0; }; + +struct cfg_group_core default_core_cfg = { + L_DBG, /* print only msg. < L_WARN */ + LOG_DAEMON, /* log_facility -- see syslog(3) */ +#ifdef USE_DST_BLACKLIST + /* blacklist */ + 0, /* dst blacklist is disabled by default */ + DEFAULT_BLST_TIMEOUT, + DEFAULT_BLST_MAX_MEM, +#endif + /* resolver */ +#ifdef USE_IPV6 + 1, /* dns_try_ipv6 -- on by default */ +#else + 0, /* dns_try_ipv6 -- off, if no ipv6 support */ +#endif + 0, /* dns_try_naptr -- off by default */ + 30, /* udp transport preference (for naptr) */ + 20, /* tcp transport preference (for naptr) */ + 10, /* tls transport preference (for naptr) */ + 20, /* sctp transport preference (for naptr) */ + -1, /* dns_retr_time */ + -1, /* dns_retr_no */ + -1, /* dns_servers_no */ + 1, /* dns_search_list */ + 1, /* dns_search_fmatch */ + 0, /* dns_reinit */ + /* DNS cache */ +#ifdef USE_DNS_CACHE + 1, /* use_dns_cache -- on by default */ + 0, /* dns_cache_flags */ + 0, /* use_dns_failover -- off by default */ + 0, /* dns_srv_lb -- off by default */ + DEFAULT_DNS_NEG_CACHE_TTL, /* neg. cache ttl */ + DEFAULT_DNS_CACHE_MIN_TTL, /* minimum ttl */ + DEFAULT_DNS_CACHE_MAX_TTL, /* maximum ttl */ + DEFAULT_DNS_MAX_MEM, /* dns_cache_max_mem */ + 0, /* dns_cache_del_nonexp -- delete only expired entries by default */ +#endif +#ifdef PKG_MALLOC + 0, /* mem_dump_pkg */ +#endif +#ifdef SHM_MEM + 0, /* mem_dump_shm */ +#endif +}; + +void *core_cfg = &default_core_cfg; + + +void dprint(char * format, ...) +{ + va_list ap; + + fprintf(stderr, "%2d(%d) ", process_no, my_pid()); + va_start(ap, format); + vfprintf(stderr,format,ap); + fflush(stderr); + va_end(ap); +} +

15 years, 10 months

git:ser_core_cvs: sctp: rpc info command

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: b9c28270c750f3678788590d92ea6c2cbe6f7b52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9c2827… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 4 20:56:11 2009 +0000 sctp: rpc info command - added core.sctp_info which returns some very general sctp information (opened associations, tracked ones, total associations opened from startup). E.g.: $ sercmd core.sctp_info { opened_connections: 0 tracked_connections: 0 total_connections: 50007 } --- core_cmd.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index 0f3c812..988a774 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -41,6 +41,7 @@ #include "core_cmd.h" #ifdef USE_SCTP #include "sctp_options.h" +#include "sctp_server.h" #endif #ifdef USE_DNS_CACHE @@ -622,6 +623,35 @@ static void core_sctp_options(rpc_t* rpc, void* c) +static const char* core_sctpinfo_doc[] = { + "Returns sctp related info.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_sctpinfo(rpc_t* rpc, void* c) +{ +#ifdef USE_SCTP + void *handle; + struct sctp_gen_info i; + + if (!sctp_disable){ + sctp_get_info(&i); + rpc->add(c, "{", &handle); + rpc->struct_add(handle, "ddd", + "opened_connections", i.sctp_connections_no, + "tracked_connections", i.sctp_tracked_no, + "total_connections", i.sctp_total_connections + ); + }else{ + rpc->fault(c, 500, "sctp support disabled"); + } +#else + rpc->fault(c, 500, "sctp support not compiled"); +#endif +} + + + /* * RPC Methods exported by this module */ @@ -644,6 +674,7 @@ rpc_export_t core_rpc_methods[] = { {"core.tcp_options", core_tcp_options, core_tcp_options_doc,0}, {"core.sctp_options", core_sctp_options, core_sctp_options_doc, 0}, + {"core.sctp_info", core_sctpinfo, core_sctpinfo_doc, 0}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 }, {"dns.debug", dns_cache_debug, dns_cache_debug_doc, 0 },

15 years, 10 months

git:ser_core_cvs: tcp: use dynamic config framework, part 1

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 22db42e4efe8cd4a85e05a54cf513b3d1fd0ee53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22db42e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:20:22 2009 +0000 tcp: use dynamic config framework, part 1 - all tcp config variables from tcp_options.h migrated to the dynamic configuration framework. For now all are read only, but write support will come soon where it makes sense. E.g.: (with the cfg_rpc module loaded) $ sercmd cfg.help tcp async async mode for writes and connects (parameter type is integer) $ sercmd cfg.get tcp async 0 --- cfg.y | 26 ++++++------ core_cmd.c | 2 +- main.c | 46 +++++++++++--------- tcp_main.c | 86 ++++++++++++++++++------------------ tcp_options.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++--------- tcp_options.h | 16 +++++-- tcp_read.c | 2 +- 7 files changed, 207 insertions(+), 105 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=22d…

15 years, 10 months

git:ser_core_cvs: tcp: async mode on by default

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 76cb799e3b3eadc3ae4f3d2e8b28547913ccbc12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76cb799… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:21:11 2009 +0000 tcp: async mode on by default - async mode is now on by default (use tcp_async=no in the config to disable it) - renamed tcp_buf_write/TCP_BUF_WRITE into tcp_async/TCP_ASYNC in the code --- NEWS | 4 +- cfg.y | 2 +- core_cmd.c | 2 +- tcp_conn.h | 4 +- tcp_main.c | 144 ++++++++++++++++++++++++++++---------------------------- tcp_options.c | 30 ++++++------ tcp_options.h | 18 ++++---- 7 files changed, 101 insertions(+), 103 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=76c…

15 years, 10 months

git:ser_core_cvs: tcp: config option to disable active connects

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: de223f0173f640973cfda1f3b4ffc4dde5b6b5d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de223f0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:21:30 2009 +0000 tcp: config option to disable active connects - added new config option to disable active connects. If set ser will only accept new connection, it will not actively open new ones. The option can be set both in ser.cfg (tcp_no_connect=yes) or at runtime (sercmd cfg.set_now_int tcp no_connect 1). --- NEWS | 8 +++++++- cfg.lex | 3 +++ cfg.y | 9 +++++++++ core_cmd.c | 3 ++- tcp_main.c | 3 +++ tcp_options.c | 2 ++ tcp_options.h | 1 + 7 files changed, 27 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ad12ca4..e889550 100644 --- a/NEWS +++ b/NEWS @@ -209,12 +209,15 @@ modules: - t_set_retr(t1, t2) - changes the retransmissions intervals on the fly, on a per transaction basis. core: + - most tcp config vars migrated to the dynamic config framework + (can be changed at runtime, e.g. + sercmd cfg.set_now_int tcp connection_lifetime 180 ) - fallback to tcp or other congestion controlled transport protocol if a forwarded udp sip request is greater then udp_mtu (config). Default off. See udp_mtu and udp_mtu_try_proto. - sctp support (one-to-many, work in progress, for now linux - only with no fallback to one-to-one on full send buffers) + and freebsd only) - partial cygwin (windows) support revived: core+static modules, no ipv6, no tcp, no dynamic modules - most of the config variables can now be changed on the fly, @@ -233,6 +236,9 @@ core: between the short name and long name in cache as CNAME record new config variables: + tcp_no_connect = yes/no - disable connects, ser will only accept new + connections, it will never try to open new ones. + Default: no, can be changed at runtime. udp_mtu = number - fallback to another protocol (udp_mtu_try_proto must be set also either globally or per packet) if the constructed request size is greater then udp_mtu. diff --git a/cfg.lex b/cfg.lex index e36a625..b8d2877 100644 --- a/cfg.lex +++ b/cfg.lex @@ -298,6 +298,7 @@ TCP_CONNECT_TIMEOUT "tcp_connect_timeout" TCP_CON_LIFETIME "tcp_connection_lifetime" TCP_POLL_METHOD "tcp_poll_method" TCP_MAX_CONNECTIONS "tcp_max_connections" +TCP_NO_CONNECT "tcp_no_connect" TCP_SOURCE_IPV4 "tcp_source_ipv4" TCP_SOURCE_IPV6 "tcp_source_ipv6" TCP_OPT_FD_CACHE "tcp_fd_cache" @@ -592,6 +593,8 @@ EAT_ABLE [\ \t\b\r] return TCP_POLL_METHOD; } <INITIAL>{TCP_MAX_CONNECTIONS} { count(); yylval.strval=yytext; return TCP_MAX_CONNECTIONS; } +<INITIAL>{TCP_NO_CONNECT} { count(); yylval.strval=yytext; + return TCP_NO_CONNECT; } <INITIAL>{TCP_SOURCE_IPV4} { count(); yylval.strval=yytext; return TCP_SOURCE_IPV4; } <INITIAL>{TCP_SOURCE_IPV6} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index 1523af1..04d5d3e 100644 --- a/cfg.y +++ b/cfg.y @@ -351,6 +351,7 @@ static void free_socket_id_lst(struct socket_id* i); %token TCP_CON_LIFETIME %token TCP_POLL_METHOD %token TCP_MAX_CONNECTIONS +%token TCP_NO_CONNECT %token TCP_SOURCE_IPV4 %token TCP_SOURCE_IPV6 %token TCP_OPT_FD_CACHE @@ -839,6 +840,14 @@ assign_stm: #endif } | TCP_MAX_CONNECTIONS EQUAL error { yyerror("number expected"); } + | TCP_NO_CONNECT EQUAL NUMBER { + #ifdef USE_TCP + tcp_default_cfg.no_connect=$3; + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_NO_CONNECT EQUAL error { yyerror("boolean value expected"); } | TCP_SOURCE_IPV4 EQUAL ipv4 { #ifdef USE_TCP if (tcp_set_src_addr($3)<0) diff --git a/core_cmd.c b/core_cmd.c index d2d7aed..c22e59e 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -565,11 +565,12 @@ static void core_tcp_options(rpc_t* rpc, void* c) if (!tcp_disable){ tcp_options_get(&t); rpc->add(c, "{", &handle); - rpc->struct_add(handle, "dddddddddddddddddddddd", + rpc->struct_add(handle, "ddddddddddddddddddddddd", "connect_timeout", t.connect_timeout_s, "send_timeout", t.send_timeout_s, "connection_lifetime", t.con_lifetime_s, "max_connections(soft)", t.max_connections, + "no_connect", t.no_connect, "fd_cache", t.fd_cache, "async", t.async, "connect_wait", t.tcp_connect_wait, diff --git a/tcp_main.c b/tcp_main.c index 86fedb7..ecf9ebf 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1659,6 +1659,9 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, } no_id: if (unlikely(c==0)){ + /* check if connect() is disabled */ + if (cfg_get(tcp, tcp_cfg, no_connect)) + return -1; DBG("tcp_send: no open tcp connection found, opening new one\n"); /* create tcp connection */ if (likely(from==0)){ diff --git a/tcp_options.c b/tcp_options.c index f66a7ae..21591d1 100644 --- a/tcp_options.c +++ b/tcp_options.c @@ -88,6 +88,8 @@ static cfg_def_t tcp_cfg_def[] = { { "max_connections", CFG_VAR_INT | CFG_ATOMIC, 0, (1U<<31)-1, fix_max_conns, 0, "maximum connection number, soft limit"}, + { "no_connect", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set only accept new connections, never actively open new ones"}, { "fd_cache", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0, "file descriptor cache for tcp_send"}, /* tcp async options */ diff --git a/tcp_options.h b/tcp_options.h index 7a05e59..24df41e 100644 --- a/tcp_options.h +++ b/tcp_options.h @@ -115,6 +115,7 @@ struct cfg_group_tcp{ int send_timeout_s; /* in s */ int con_lifetime_s; /* in s */ int max_connections; + int no_connect; /* do not open any new tcp connection (but accept them) */ int fd_cache; /* on /off */ /* tcp async options */ int async; /* on / off */

15 years, 10 months

git:ser_core_cvs: tcp: use dynamic config framework, part 2

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 3dc4f620d8313beee6192feada38bb72faab69fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3dc4f62… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 17:20:42 2009 +0000 tcp: use dynamic config framework, part 2 - added tcp_connect_timeout, tcp_send_timeout, tcp_connection_lifetime, tcp_max_connections, tcp_accept_aliases to the config framework. - added 2 new tcp related variables: tcp alias_flags and tcp new_conn_alias_flags --- cfg.y | 8 ++-- globals.h | 6 +-- receive.c | 5 +- tcp_conn.h | 7 +--- tcp_info.h | 2 +- tcp_init.h | 10 +++++ tcp_main.c | 117 ++++++++++++++++++++++++++------------------------------ tcp_options.c | 74 +++++++++++++++++++++++++++++++++-- tcp_options.h | 13 +++++- 9 files changed, 154 insertions(+), 88 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3dc…

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev