sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:andrei/raw_sock: NEWS: notes about the new udp4_raw mode

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 557ddc199cb532427e16141d9099e4fb024adf73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=557ddc1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:03:55 2010 +0200 NEWS: notes about the new udp4_raw mode --- NEWS | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index de353af..cd1696f 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,19 @@ $Id$ sip-router 3.1 chages core: + - major performance increase on Linux multi-cpu machines that send a lot + of UDP IPv4 packets (40-50% faster in stateless mode). For it to work + udp4_raw must be enabled or set into auto mode in sr.cfg and sr must be + started as root or with CAP_NET_RAW. Note that even if udp4_raw is + off (default), if sr was started with enough privileges, it can be + enabled at runtime. + The support for using raw sockets is also available on FreeBSD (compiled + by default but not tested for performance yet), NetBSD, OpenBSD and + Darwin (not tested and not compiled by default, needs + make cfg extra_defs=-DUSE_RAW_SOCKS). To check if the support is + compiled, use ser -V |grep --color RAW_SOCKS or for a running + ser: sercmd core.udp4_raw_info. + See udp4_raw, udp4_raw_mtu and udp4_raw_ttl below. - onreply_route {...} is now equivalent with onreply_route[0] {...} - global, per protocol blacklist ignore masks (via extended send_flags). See dst_blacklist_udp_imask a.s.o (dst_blacklist_*_imask). @@ -13,6 +26,28 @@ core: - route() now supports rvalue expressions (e.g. route("test"+$i)) new config variables: + - udp4_raw - enables raw socket support for sending UDP IPv4 datagrams + (40-50% performance increase on linux multi-cpu). + Possible values: 0 - disabled (default), 1 - enabled, -1 auto. + In "auto" mode it will be enabled if possible (sr started as root or + with CAP_NET_RAW). + udp4_raw can be used on Linux and FreeBSD. For other BSDs and Darwin + one must compile with -DUSE_RAW_SOCKS. + On Linux one should also set udp4_raw_mtu if the MTU on any network + interface that could be used for sending is smaller then 1500. + Can be set at runtime as long as sr was started with enough privileges + (core.udp4_raw). + - udp4_raw_mtu - MTU value used for UDP IPv4 packets when udp4_raw is + enabled. It should be set to the minimum MTU of all the network + interfaces that could be used for sending. The default value is 1500. + Note that on BSDs it does not need to be set (if set it will be ignored, + the proper MTU will be used automatically by the kernel). On Linux it + should be set. + Can be set at runtime (core.udp4_raw_mtu). + - udp4_raw_ttl - TTL value used for UDP IPv4 packets when udp4_raw is + enabled. By default it is set to auto mode (-1), meaning that the + same TTL will be used as for normal UDP sockets. + Can be set at runtime (core.udp4_raw_ttl). - dst_blacklist_udp_imask - global blacklist events ignore mask for udp (a blacklist event/reason set in this variable will be ignored when deciding whether or not to blacklist an udp destination). Can be set

13 years, 10 months

git:andrei/raw_sock: raw sockets: added info rpc

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 27e652b7ed5ef3bccfb92d2653831a1afe37993e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27e652b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:02:10 2010 +0200 raw sockets: added info rpc Added core.udp4_raw_info RPC for getting information about the raw mode state. E.g.: sercmd> core.udp4_raw_info { udp4_raw: 1 udp4_raw_mtu: 1500 udp4_raw_ttl: 64 } --- core_cmd.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index 75d4e72..292e16f 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -44,6 +44,7 @@ #include "tcp_info.h" #include "tcp_options.h" #include "core_cmd.h" +#include "cfg_core.h" #ifdef USE_SCTP #include "sctp_options.h" #include "sctp_server.h" @@ -807,6 +808,30 @@ static void core_sctpinfo(rpc_t* rpc, void* c) + +static const char* core_udp4rawinfo_doc[] = { + "Returns udp4_raw related info.", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +static void core_udp4rawinfo(rpc_t* rpc, void* c) +{ +#ifdef USE_RAW_SOCKS + void *handle; + + rpc->add(c, "{", &handle); + rpc->struct_add(handle, "ddd", + "udp4_raw", cfg_get(core, core_cfg, udp4_raw), + "udp4_raw_mtu", cfg_get(core, core_cfg, udp4_raw_mtu), + "udp4_raw_ttl", cfg_get(core, core_cfg, udp4_raw_ttl) + ); +#else /* USE_RAW_SOCKS */ + rpc->fault(c, 500, "udp4_raw mode support not compiled"); +#endif /* USE_RAW_SOCKS */ +} + + + /* * RPC Methods exported by this module */ @@ -835,6 +860,8 @@ static rpc_export_t core_rpc_methods[] = { {"core.sctp_options", core_sctp_options, core_sctp_options_doc, 0}, {"core.sctp_info", core_sctpinfo, core_sctpinfo_doc, 0}, + {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, + 0}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

13 years, 10 months

git:mariusbucur/conference: changed the way version attribute is set for the root conference-info element (withouth using the nasty strstr, but using xmlSetProp instead)

by Marius Ovidiu Bucur

Module: sip-router Branch: mariusbucur/conference Commit: 3834638651d8d7834a6b35703835e08d8a60bdc0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3834638… Author: mariusbucur <marius(a)marius-bucur.ro> Committer: mariusbucur <marius(a)marius-bucur.ro> Date: Wed Aug 11 15:43:23 2010 +0300 changed the way version attribute is set for the root conference-info element (withouth using the nasty strstr, but using xmlSetProp instead) --- modules_k/presence_conference/notify_body.c | 46 ++++++++++----------------- 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/modules_k/presence_conference/notify_body.c b/modules_k/presence_conference/notify_body.c index 5e41e49..19c0bd1 100644 --- a/modules_k/presence_conference/notify_body.c +++ b/modules_k/presence_conference/notify_body.c @@ -184,7 +184,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) use signed int as presence module stores "version" in DB as signed int) has max. 10 characters + 1 character for the sign */ - xmlNewProp(root_node, BAD_CAST "version", BAD_CAST "00000000000"); + xmlNewProp(root_node, BAD_CAST "version", BAD_CAST "0"); xmlNewProp(root_node, BAD_CAST "state", BAD_CAST "full" ); xmlNewProp(root_node, BAD_CAST "entity", BAD_CAST buf); @@ -263,39 +263,27 @@ error: } str *conf_body_setversion(subs_t *subs, str *body) { - char *version_start=0; - char version[MAX_INT_LEN + 2]; /* +2 becasue of trailing " and \0 */ - int version_len; - + char version_str[MAX_INT_LEN + 2]; + sprintf(version_str, "%d", subs->version); if (!body) { return NULL; } - - /* xmlDocDumpFormatMemory creates \0 terminated string */ - /* version parameters starts at minimum at character 34 */ - if (body->len < 41) { - LM_ERR("body string too short!\n"); - return NULL; + + xmlDocPtr doc = xmlParseMemory(body->s, body->len); + if(!doc) { + goto error; } - version_start = strstr(body->s + 34, "version="); - if (!version_start) { - LM_ERR("version string not found!\n"); - return NULL; + xmlNodePtr conf_info = xmlDocGetRootElement(doc); + if(!conf_info) { + goto error; } - version_start += 9; - - version_len = snprintf(version, MAX_INT_LEN + 2,"%d\"", subs->version); - if (version_len >= MAX_INT_LEN + 2) { - LM_ERR("failed to convert 'version' to string\n"); - memcpy(version_start, "00000000000\"", 12); - return NULL; + if(!xmlSetProp(conf_info, BAD_CAST "version", BAD_CAST version_str)) { + goto error; } - /* Replace the placeholder 00000000000 with the version. - * Put the padding behind the "" - */ - LM_DBG("replace version with \"%s\n",version); - memcpy(version_start, version, version_len); - memset(version_start + version_len, ' ', 12 - version_len); - + xmlDocDumpFormatMemory(doc,(xmlChar**)(void*)&body->s, + &body->len, 1); + return NULL; +error: + LM_ERR("error in presence_conference conf_body_setversion\n"); return NULL; }

13 years, 10 months

[tracker] Comment added: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#83 - ds_reload fails (MySQL backend) User who did this - Kim Jakobsson (kjakobsson) ---------- Yes, I can confirm it works now, thanks. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83#comment110 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 10 months

git:master: Merge remote branch 'origin/andrei/counters'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 755fe65703f42ced4d3472cd60ffdd6c25ec0204 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=755fe65… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 01:32:07 2010 +0200 Merge remote branch 'origin/andrei/counters' * origin/andrei/counters: counters: 2nd parameter of cnt.get rpc is now optional snmp(k): fix direct access to stat vars counters: doc update counters: extended declaration syntax sercmd: cnt.help command line completion support counters: cnt.help and api update sctp: switched to counter arrays + more stats tcp: switched to counter arrays + more stats core: k statistics counter api update core: counters arrays and counters descriptions doc: NEWS counters/stats update sctp: enable statistics tcp: enable tcp statistics kex(k): updated to the lastest statistics changes kcore stats: rewrote in terms of the counters api sercmd: added command line completion for counters counters: added docs counters: new modules for counters manipulations core: counters / statistics support sercmd: fix cfg. var name completion ---

13 years, 10 months

git:andrei/counters: counters: 2nd parameter of cnt.get rpc is now optional

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/counters Commit: ec3aca49a087e796a6324345346c05bf00b879f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ec3aca4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 01:27:46 2010 +0200 counters: 2nd parameter of cnt.get rpc is now optional If the counter name is missing cnt.get will display the whole group (equivalent to cnt.grp_get_all). E.g.: $ sercmd cnt.get tcp { con_reset: 0 con_timeout: 0 connect_failed: 0 connect_success: 0 current_opened_connections: 0 current_write_queue_size: 0 established: 0 local_reject: 0 passive_open: 0 send_timeout: 0 sendq_full: 0 } $ sercmd cnt.get tcp current_opened_connections 0 --- modules/counters/counters.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/modules/counters/counters.c b/modules/counters/counters.c index 1755308..16da3c9 100644 --- a/modules/counters/counters.c +++ b/modules/counters/counters.c @@ -273,6 +273,10 @@ static int cnt_reset_f(struct sip_msg* msg, char* handle, char* bar) +static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group); + + + static void cnt_get_rpc(rpc_t* rpc, void* c) { char* group; @@ -280,10 +284,11 @@ static void cnt_get_rpc(rpc_t* rpc, void* c) counter_val_t v; counter_handle_t h; - if (rpc->scan(c, "ss", &group, &name) < 2) { - /* rpc->fault(c, 400, "group and counter name required"); */ + if (rpc->scan(c, "s", &group) < 1) return; - } + if (rpc->scan(c, "*s", &name) < 1) + return cnt_grp_get_all(rpc, c, group); + /* group & name read */ if (counter_lookup(&h, group, name) < 0) { rpc->fault(c, 400, "non-existent counter %s.%s\n", group, name); return; @@ -400,16 +405,11 @@ static void cnt_var_list_rpc(rpc_t* rpc, void* c) -static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) +static void cnt_grp_get_all(rpc_t* rpc, void* c, char* group) { void* s; - char* group; struct rpc_list_params packed_params; - if (rpc->scan(c, "s", &group) < 1) { - /* rpc->fault(c, 400, "group name required"); */ - return; - } if (rpc->add(c, "{", &s) < 0) return; packed_params.rpc = rpc; packed_params.ctx = s; @@ -418,6 +418,19 @@ static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) +static void cnt_grp_get_all_rpc(rpc_t* rpc, void* c) +{ + char* group; + + if (rpc->scan(c, "s", &group) < 1) { + /* rpc->fault(c, 400, "group name required"); */ + return; + } + return cnt_grp_get_all(rpc, c, group); +} + + + static void cnt_help_rpc(rpc_t* rpc, void* ctx) { char* group;

13 years, 10 months

[tracker] Comment added: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#83 - ds_reload fails (MySQL backend) User who did this - Daniel-Constantin Mierla (miconda) ---------- It should be fixed on GIT, there was an issue when executing MI commands via RPC interface, like is done by sercmd. Can you get latest git branch kamailio_3.0 and try? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83#comment109 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 10 months

git:andrei/raw_sock: core: compile raw socket support by default on freebsd

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 49e34588e967ed92903eb0825a0b1a4b57b4afd6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49e3458… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 17:50:47 2010 +0200 core: compile raw socket support by default on freebsd --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 4cc1ee6..53a549d 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1747,7 +1747,7 @@ ifeq ($(OS), freebsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ - -DHAVE_NETINET_IN_SYSTM + -DHAVE_NETINET_IN_SYSTM -DUSE_RAW_SOCKS ifneq ($(found_lock_method), yes) C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems found_lock_method=yes

13 years, 10 months

git:andrei/raw_sock: raw sockets: freebsd support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 2542c0f30f0ce7cd11c437f19afb53a3b3e9f2a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2542c0f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 10 17:43:25 2010 +0200 raw sockets: freebsd support Support freebsd and theoretically other BSDs (other BSDs not tested): - on most BSDs the offset and length of the ip header must be filled in host byte order (when using raw sockets with IPHDR_INC). - no need for user-space fragmentation for raw sockets - use IP_RECVDSTADDR and IPSENDSRCADDR instead of IP_PKTINFO (for raw sockets without IPHDR_INC) - fix ip header length (wrongly computed, on linux it worked because linux always ignores and overwrites it) --- raw_sock.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++---------- udp_server.c | 4 +- 2 files changed, 111 insertions(+), 26 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=254…

13 years, 10 months

[tracker] Comment added: ds_reload fails (MySQL backend)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#83 - ds_reload fails (MySQL backend) User who did this - Kim Jakobsson (kjakobsson) ---------- >From tarball. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=83#comment108 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 10 months

← Newer
1
...
25
26
27
28
29
30
31
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010