sr-dev

sr-dev@lists.kamailio.org

15 participants
44233 discussions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: caf3128c5495d4bf556af246550e0789cc795dc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=caf3128… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Oct 10 00:38:34 2009 +0200 makefile: FLAVOUR support Basic support for sip-router, ser and kamailio flavours and install flavours, e.g.: make config FLAVOUR=sip-router make config INSTALL_FLAVOUR=kamailio; make install (will install only kamailio specific tools, but won't change the main name) make config FLAVOUR=ser; make install (will install ser tools and change the name to ser). Note that FLAVOUR does not influence the module list (one should use modules_dirs, group_include and/or modules, modules_s, modules_k) and that for now choosing kamailio will only change the name. --- Makefile | 8 +++++++- Makefile.defs | 21 ++++++++++++++++++++- Makefile.targets | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 88d96e6..768c080 100644 --- a/Makefile +++ b/Makefile @@ -915,6 +915,8 @@ proper-libs realclean-libs distclean-libs maintainer-clean-libs: $(MAKE) -C lib $(patsubst %-libs,%,$@) +# clean extra binary names (common "flavour" names) +clean: clean-extra-names # clean modules on make clean clean: clean-modules # clean utils on make clean @@ -922,9 +924,13 @@ clean: clean-utils # cleaning in libs always when cleaning sip-router clean: clean-libs +.PHONY: clean-extra-names +clean-extra-names: + @rm -f $(filter-out $(MAIN_NAME), sip-router ser kamailio) + # proper/distclean a.s.o modules, utils and libs too -proper: proper-modules proper-utils proper-libs +proper: clean-extra-names proper-modules proper-utils proper-libs distclean: distclean-modules distclean-utils distclean-libs realclean: realclean-modules realclean-utils realclean-libs maintainer-clean: maintainer-clean-modules maintainer-clean-utils \ diff --git a/Makefile.defs b/Makefile.defs index ee02e39..d3d14b0 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -111,14 +111,33 @@ export makefile_defs ifeq ($(quiet),verbose) $(info normal Makefile.defs exec) endif # verbose + +# flavour: sip-router, ser or kamailio +FLAVOUR=sip-router + +ifeq ($(FLAVOUR),sip-router) # main binary name MAIN_NAME=ser +else ifeq ($(FLAVOUR),ser) +# main binary name +MAIN_NAME=ser +else ifeq ($(FLAVOUR),kamailio) +# main binary name +MAIN_NAME=kamailio +else # default: +# main binary name +MAIN_NAME=sip-router +endif + #prefix for various configs and scripts #config name/name-prefix for distributed configs CFG_NAME=sip-router #config name/name-prefix for distributed scripts SCR_NAME=sip-router +# what to install +INSTALL_FLAVOUR=$(FLAVOUR) + #version number VERSION = 2 PATCHLEVEL = 99 @@ -1898,7 +1917,7 @@ export exported_vars # variable changeable only at configure time (once saved in config.mak they # cannot be overwritten from environment or command line, unless make cfg # is run) -saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME \ +saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ diff --git a/Makefile.targets b/Makefile.targets index 3541bfe..eeb0f5a 100644 --- a/Makefile.targets +++ b/Makefile.targets @@ -26,7 +26,7 @@ clean_targets:= clean proper distclean realclean maintainer-clean local-clean \ maintaner-clean-utils \ clean-libs proper-libs realclean-libs distclean-libs \ maintainer-clean-libs \ - clean-tmp clean_doxygen + clean-tmp clean_doxygen clean-extra-names doc_targets:= README man install-doc install-man install-ser-man \ install-every-module-doc install-every-module-man \ $(foreach m,$(modules_dirs),$(m)-doc $(m)-readme $(m)-man) \

15 years, 3 months

git:master: Typos and formatting

by Olle E. Johansson

Module: sip-router Branch: master Commit: 46e13e4093f1b8f61dd34adb05e83adebff4ead1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46e13e4… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 22:38:48 2009 +0200 Typos and formatting --- doc/tcp_tunning.txt | 52 +++++++++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 22 deletions(-) diff --git a/doc/tcp_tunning.txt b/doc/tcp_tunning.txt index b383a42..db85289 100644 --- a/doc/tcp_tunning.txt +++ b/doc/tcp_tunning.txt @@ -10,15 +10,16 @@ TCP Tunning/monitoring for lots of open connections ---------------- This document describes very briefly various settings that should improve - ser+tcp performance for sites handling a lot of tcp traffic (> 1000 open - connections or very high connection/disconnection rates). -For now it deals only with linux specific optimizations. +ser+tcp performance for sites handling a lot of tcp traffic (> 1000 open +connections or very high connection/disconnection rates). +For now it deals only with Linux specific optimizations. -1. Usefull kernel settings ---------------------------- -1.1 connection rate/pending connections: by default the connection rate is +1. Useful kernel settings +------------------------- + +1.1 Connection rate/pending connections: by default the connection rate is too small net.core.somaxconn - limit of the listen() backlog, default 128 @@ -27,7 +28,9 @@ net.ipv4.tcp_timestamps - default on., should be on (along with tcp_tw_recycle and timestamp supporting peers allows for fast connections rates) -1.2 connection in close_wait: connection should stay as little as possible +1.2 connection in close_wait + + Connection should stay as little as possible in close_wait to quickly free the fd/resources for new connections attempts WARNING: this could break normal tcp use, use it only if you know what you are doing @@ -44,10 +47,11 @@ net.ipv4.tcp_tw_reuse - allows reusing of time-wait sockets (default off) net.ipv4.tcp_syncookies - default off, in this case it's probably better to keep it off -1.3 port range +1.3 Port range net.ipv4.ip_local_port_range - should be increased (e.g. 4096-65534) -1.4 open fds +1.4 Open file descriptors + fs.file-max - maximum number of fds that will be allocated (you probably need to increase it, default depends on installed memory) @@ -59,20 +63,23 @@ fs.epoll.max_user_instances - maximum number of devices - per user (2.6.27.8+) fs.epoll.max_user_watches - maximum number of "watched" fds - per user (2.6.27.8+) -iptables - remove the ip_conntrack module (it limits the maximum tcp - connections, adds extra overhead (slow)). It's probably better to remove - all the iptables modules. - net.ipv4.tcp_max_orphans - might be worth a look if things go wrong net.core.netdev_max_backlog - maximum device backlog +Related applications +-------------------- ifconfig <dev> txqueuelen <val> - set device transmission queue len +iptables - remove the ip_conntrack module (it limits the maximum tcp + connections, adds extra overhead (slow)). It's probably better to remove + all the iptables modules. + + 2. Monitoring (values to watch for) ----------------------------------- -2.1 FDs +2.1 File descriptors fs.dentry-state - format: nr. dentries, nr. unused, age_limit, want_pages fs.file-nr - format: allocated, unused, max (==fs.file-max) @@ -87,14 +94,15 @@ fs.inode-state - format: nr. allocated, nr. free, preshrink /proc/net/sockstat -3. Ser settings +3. Sip-router settings +---------------------- -- don't forget to increase tcp_max_connections and the amount of shared memory -- you should increase the number of ser "tcp_children" processes (-N no) -As a rule of thumb, (maximum simultaneous connections)/2000 should be ok -- you might have to decrease TCP_BUF_SIZE to a smaller value (e.g 8K) -- you might want to increase PKG_MEM_POOL_SIZE (for large queues) +- Don't forget to increase tcp_max_connections and the amount of shared memory +- You should increase the number of ser "tcp_children" processes (-N no) + As a rule of thumb, (maximum simultaneous connections)/2000 should be ok +- You might have to decrease TCP_BUF_SIZE to a smaller value (e.g 8K) +- You might want to increase PKG_MEM_POOL_SIZE (for large queues) -- you might need to increase the maximum open fds limit before starting ser - (e.g. ulimit -n 1000000) +- You might need to increase the maximum open fds limit before starting ser + (e.g. ulimit -n 1000000)

15 years, 3 months

git:master: Typo

by Olle E. Johansson

Module: sip-router Branch: master Commit: 86a41ff90070932ac4dbbd685382183c308aa71b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86a41ff… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 22:34:16 2009 +0200 Typo --- doc/HISTORY | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/doc/HISTORY b/doc/HISTORY index fa14a92..62ee146 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -6,7 +6,6 @@ This is a short ser history based mainly on my memory and my old mail archive. I've tried to mention only the important events. I'm sure I have missed a lot of things and/or people. If this is your case, please don't feel offended, send me an email and I will straighten things up. - Three years ago on 4 September 2001 I committed the first working ser version on a private cvs. In fact I started writting ser 2 days before, on 2nd September. I was supposed to write some kind of sip glue for a Cisco PSTN gateway in 1 week, but of course I did it in the last 2 days :-) @@ -29,7 +28,7 @@ At the beginning of 2002 we were joined by Daniel. Jan introduced the mysql, usr Ser first public appearance was at the April 2002 Sipit. We ran it on a pda an still managed to be faster than the testing tools that were used against us :-) In May 2002 ser got ipv6 support. -In August 2002 Nils commited sipsak to berlios (very usefull testing tool). +In August 2002 Nils commited sipsak to berlios (very useful testing tool). In September 2002 ser went public: it was GPL'ed and the cvs tree was moved to berlios. During the same month Jiri introduced the FIFO interface, Karel committed serweb and we had the first GPL'ed release: ser 0.8.8. In December 2002 ser got its first big external contribution: the enum module, written by Juha Heinanen. In January 2003 Raphael commited sems on berlios.

15 years, 3 months

git:master: Small formatting updates

by Olle E. Johansson

Module: sip-router Branch: master Commit: e783a10daaa976960065b3750bdfd727676f9310 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e783a10… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 22:33:11 2009 +0200 Small formatting updates --- doc/dns.txt | 82 +++++++++++++++++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 38 deletions(-) diff --git a/doc/dns.txt b/doc/dns.txt index 1a3d904..cf595eb 100644 --- a/doc/dns.txt +++ b/doc/dns.txt @@ -7,83 +7,86 @@ # Overview +-------- - The dns subsystem in ser can either directly use libresolv and a combination + The dns subsystem in sip-router can either directly use libresolv and a combination of the locally configured dns server, /etc/hosts and the local Network Information Service (NIS/YP a.s.o) or cache the query results (both positive and negative) and look first in its internal cache. - When its internal dns cache is enabled, ser can also use dns failover: if - one destination resolves to multiple addresses ser can try all of them until + When its internal dns cache is enabled, sip-router can also use dns failover: if + one destination resolves to multiple addresses sip-router can try all of them until it finds one to which it can successfully send the packet or it exhausts all - of them. ser (tm to be more precise) uses the dns failover also when the - destination host doesn't send any reply to a forwarded invite within the - sip timeout interval (whose value can be configured using the tm fr_timer - parameter). - When SRV based load balancing is enabled ser can even do DNS based load - balancing (see RFC2782 and the dns_srv_lb option below). + of them. sip-router (The tm module to be more precise) uses the DNS failover also + when the destination host doesn't send any reply to a forwarded invite within the + SIP timeout interval (whose value can be configured using the tm fr_timer + parameter). + When SRV based load balancing is enabled sip-router can even do DNS based load + balancing (see RFC2782 and the dns_srv_lb option below). DNS Cache and Failover Drawbacks +-------------------------------- - Using the dns cache and the dns failover has also some drawbacks: + Using the DNS cache and the DNS failover has also some drawbacks: - 1. only the locally configured dns server (usually in /etc/resolv.conf) is + 1. only the locally configured DNS server (usually in /etc/resolv.conf) is used for the requests (/etc/hosts and the local Network Information Service are ignored). - Workaround: disable the dns cache (use_dns_cache=off or - compile without -DUSE_DNS_CACHE). + Workaround: disable the dns cache (use_dns_cache=off or compile without -DUSE_DNS_CACHE). - 2. the dns cache uses extra memory - Workaround: disable the dns cache. + 2. the DNS cache uses extra memory + Workaround: disable the DNS cache. - 3. the dns failover introduces a very small performance penalty - Workaround: disable the dns failover (use_dns_failover=off). + 3. the DNS failover introduces a very small performance penalty + Workaround: disable the DNS failover (use_dns_failover=off). - 4. the dns failover increases the memory usage (the internal structures - used to represent the transaction are bigger when the dns failover support is - compiled). - Workaround: compile without dns failover support (-DUSE_DNS_FAILOVER). - Turning it off from the config file is not enough in this case (the extra - memory will still be used). + 4. the DNS failover increases the memory usage (the internal structures + used to represent the transaction are bigger when the DNS failover support is + compiled). + Workaround: compile without DNS failover support (-DUSE_DNS_FAILOVER). + Turning it off from the config file is not enough in this case (the extra + memory will still be used). - On the other hand using the dns cache saves lots of DNS queries and makes + On the other hand using the DNS cache saves lots of DNS queries and makes DNS based failover and DNS based load balancing possible. If the destination - blacklist is enabled, ser can do failover even if forwarding in stateless + blacklist is enabled, sip-router can do failover even if forwarding in stateless mode. - In the ideal case with dns cache enabled ser will do only one query for + In the ideal case with the DNS cache enabled sip-router will do only one query for a NAPTR (if enabled) or SRV lookup and then it will use the results for the record's TTL (for example if all the resulting records have 1 minute TTL, - ser won't make another query for this domain for 1 minute). Even negative + the server won't make another query for this domain for 1 minute). Even negative answers will be cached. - Without the dns cache, each NAPTR or SRV lookup will result in at least 2 + Without the DNS cache, each NAPTR or SRV lookup will result in at least 2 queries. These queries will happen every time, for each message (even if all of them go to the same domain). DNS Resolver Options +-------------------- - The DNS resolver options control how ser will interact with the external + The DNS resolver options control how sip-router will interact with the external DNS servers. These options (with the dns_try_ipv6 exception) are passed to libresolv and are used each time a dns request is made. + The default values are system specific and generally depend on the /etc/resolv.conf content. For servers doing a lot of DNS requests it is - highly recommended to change the default values in the ser config file - (even if using ser's internal dns cache). + highly recommended to change the default values in the sip-router config file + (even if using sip-router's internal dns cache). - dns_try_ipv6 = on | off - if on and ser listens on at least one ipv6 socket, + dns_try_ipv6 = on | off - if on and sip-router listens on at least one ipv6 socket, ipv6 (AAAA) lookups will be performed if the ipv4 (A) lookups fail. If off only ipv4 (A) lookups will be used. - Default: on if ser is compiled with ipv6 support. + Default: on if sip-router is compiled with ipv6 support. - dns_try_naptr = on | off - if on ser will first try a NAPTR lookup for + dns_try_naptr = on | off - if on sip-router will first try a NAPTR lookup for destinations that don't have the protocol or port specified and are not simple ip addresses (as described in RFC 3263). This will introduce a slight performance penalty and will probably cause extra DNS lookups. For example a lookup for a non-existing domain will produce one extra query: NAPTR(domain), SRV(_sip._udp.domain) and A/AAAA(domain). - If the result of a query contains several NAPTR records, ser will select - among them according to the RFC2915 and ser preference towards a + If the result of a query contains several NAPTR records, sip-router will select + among them according to the RFC2915 and sip-router preference towards a specific protocol (see dns_udp_pref, dns_tcp_pref and dns_tls_pref below). For an RFC3263 compliant configuration (choose the remote side preferred protocol if supported), set dns_udp_pref, dns_tcp_pref and @@ -166,6 +169,7 @@ DNS Resolver Options DNS Resolver Compile Options +---------------------------- USE_NAPTR - if defined the naptr lookup support will be compiled in. NAPTR support still has to be enabled from ser's config file (it's @@ -179,6 +183,7 @@ DNS Resolver Compile Options DNS Cache and Failover Config Variables +--------------------------------------- use_dns_cache = on | off - if off the dns cache won't be used (all dns lookups will result into a dns request). When on all the dns request @@ -270,6 +275,7 @@ DNS Cache and Failover Config Variables Default: on DNS Cache Compile Options +------------------------- USE_DNS_CACHE - if defined the dns cache support will be compiled in (default). If not needed/wanted the dns_cache can be disabled from the @@ -309,8 +315,8 @@ DNS Cache Compile Options DNS_CACHE_DEBUG - if defined the dns cache will be very verbose (it will log lots of messages at the L_DBG levell). - Note: To remove a compile options, edit ser's Makefile.defs and remove it - form DEFS list. To add a compile options add it to the make command line, + Note: To remove a compile options, edit sip-router's Makefile.defs and remove it + from DEFS list. To add a compile options add it to the make command line, e.g.: make proper; make all extra_defs=-DUSE_DNS_FAILOVER or for a permanent solution, edit Makefile.defs and add it to DEFS (don't foget to prefix it with -D). Some options require editing

15 years, 3 months

git:master: Updating PDB readme as well...

by Olle E. Johansson

Module: sip-router Branch: master Commit: ac4b0278d0ef00333155f804eca2cc7799e6dfbd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac4b027… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 22:25:34 2009 +0200 Updating PDB readme as well... --- modules/pdb/README | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/pdb/README b/modules/pdb/README index af034bf..9df036c 100644 --- a/modules/pdb/README +++ b/modules/pdb/README @@ -14,7 +14,7 @@ Henning Westerholt Copyright � 2009 1&1 Internet AG Revision History Revision $Revision: 4863 $ $Date: 2008-09-05 13:11:33 +0200 (Fri, 05 - Sep 2008) $ + Sep 2008) $ __________________________________________________________________ Table of Contents @@ -78,6 +78,12 @@ Chapter 1. Admin Guide 1. Overview + This is a module for fast number portability handling. The client is + this module and the server exists in the /utils/pdbt directory. The PDB + module and server supports load-balancing and aggressive timeouts.i + Normally it does not need more than a few ms to query the remote server + and return the reply to the configuration script. + The pdb module allows Kamailio to send queries to a list of servers and store the answer in an AVP. The idea is to ask all servers in parallel and use the first answer, that comes back. A timeout for the query can @@ -99,7 +105,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * none + * The PDB server 3. Exported Parameters @@ -132,7 +138,7 @@ modparam("pdb", "server", "localhost:10001,host.name:10001,192.168.1.7:10002") 4.1. pdb_query (string query, string dstavp) -4.1. pdb_query (string query, string dstavp) +4.1. pdb_query (string query, string dstavp) Sends the query string to all configured servers and stores the answer in dstavp. If it takes more than the configured timeout, false is @@ -156,7 +162,7 @@ cr_route("$avp(i:82)", "$rd", "$rU", "$rU", "call_id"); 5.2. pdb_activate 5.3. pdb_deactivate -5.1. pdb_status +5.1. pdb_status Prints the status of the module. This can either be "active" or "deactivated". @@ -166,7 +172,7 @@ cr_route("$avp(i:82)", "$rd", "$rU", "$rU", "call_id"); kamctl fifo pdb_status ... -5.2. pdb_activate +5.2. pdb_activate Activates the module. This is the default after loading the module. @@ -175,7 +181,7 @@ kamctl fifo pdb_status kamctl fifo pdb_activate ... -5.3. pdb_deactivate +5.3. pdb_deactivate Deactivates the module. No more queries are performed until it is activated again. As long as the module is deactivated, the pdb_query

15 years, 3 months

git:master: Updating PDB documentation from http://sip-router.org/2009/09/ 11/number-portability-functionality/

by Olle E. Johansson

Module: sip-router Branch: master Commit: ff159bb1efcb2ff5a95b4dd0c6ddf21f79270e6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff159bb… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 22:20:24 2009 +0200 Updating PDB documentation from http://sip-router.org/2009/09/11/number-portability-functionality/ --- modules/pdb/doc/pdb_admin.xml | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/pdb/doc/pdb_admin.xml b/modules/pdb/doc/pdb_admin.xml index 7076328..dc89e78 100644 --- a/modules/pdb/doc/pdb_admin.xml +++ b/modules/pdb/doc/pdb_admin.xml @@ -13,6 +13,13 @@ <section> <title>Overview</title> <para> + This is a module for fast number portability handling. The client is this module + and the server exists in the /utils/pdbt directory. + The PDB module and server supports load-balancing and aggressive timeouts.i + Normally it does not need more than a few ms to query the remote server and return + the reply to the configuration script. + </para> + <para> The pdb module allows Kamailio to send queries to a list of servers and store the answer in an AVP. The idea is to ask all servers in parallel and use the first answer, that comes back. A timeout for the @@ -43,7 +50,7 @@ </para> <itemizedlist> <listitem> - <para><emphasis>none</emphasis></para> + <para><emphasis>The PDB server</emphasis></para> </listitem> </itemizedlist> </section>

15 years, 3 months

git:master: Updating README files

by Olle E. Johansson

Module: sip-router Branch: master Commit: a7aaf4d4811228a9374215cb4dad2cf2719b4fdd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7aaf4d… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 22:04:36 2009 +0200 Updating README files - total restart for the README-MODULES Need help updating the list of current modules. --- README | 115 ++++++------ README-MODULES | 570 ++++++++++++++++++++------------------------------------ 2 files changed, 264 insertions(+), 421 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a7a…

15 years, 3 months

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

by Olle E. Johansson

Module: sip-router Branch: master Commit: dcf0add128aa3eaec29ae082f4b1efa78c5ff3c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dcf0add… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 22:05:45 2009 +0200 Merge branch 'master' of ssh://oej@git.sip-router.org/sip-router * 'master' of ssh://oej@git.sip-router.org/sip-router: makefile: even more quiet modules warning fixes * callcontrol makefile: quiet output support pike_top: moved from tools/ to utils/ kamctl: moved from tools/ to utils/ core ev: minor cleanups topoh: new module for hiding topology details core: new sr events system core: execute callbacks for NET_DATA_IN and NET_DATA_OUT ---

15 years, 3 months

git:master: modules warning fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8830e341eaa524675d7bf309f900c75eab251916 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8830e34… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 20:59:18 2009 +0200 modules warning fixes --- lib/binrpc/binrpc_api.c | 2 +- modules_k/siputils/contact_ops.c | 2 +- modules_k/tmx/tmx_mod.c | 2 +- modules_s/ctl/binrpc_run.c | 2 ++ modules_s/eval/eval.c | 1 + modules_s/msilo/msilo.c | 1 + modules_s/permissions/ip_set.c | 1 + 7 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/binrpc/binrpc_api.c b/lib/binrpc/binrpc_api.c index c76267c..89277dd 100644 --- a/lib/binrpc/binrpc_api.c +++ b/lib/binrpc/binrpc_api.c @@ -457,7 +457,7 @@ static int get_reply(struct binrpc_handle *handle, if (n == 0) snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, "get_reply: read unexpected EOF: received %d bytes" - " of reply", crt - handle->buf); + " of reply", (int)(long)(crt - handle->buf)); else snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, "get_reply: read reply failed: %s (%d)", diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index 6601092..872c239 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -488,7 +488,7 @@ decode2format (str uri, char separator, struct uri_format *format) } #ifdef DEBUG - fprintf (stdout, "Decoding %.*s\n",end-start,start); + fprintf (stdout, "Decoding %.*s\n", (int)(long)(end-start), start); #endif state = EX_PREFIX; diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 4a51e7f..0c3af19 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -228,7 +228,7 @@ static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2) tcx = _tmx_tmb.tm_ctx_get(); if(tcx != NULL) idx = tcx->branch_index; - n = (int)k; + n = (int)(long)k; switch(n) { case 1: /* prepare cancel for every branch except idx */ diff --git a/modules_s/ctl/binrpc_run.c b/modules_s/ctl/binrpc_run.c index aa50e8a..8ad914f 100644 --- a/modules_s/ctl/binrpc_run.c +++ b/modules_s/ctl/binrpc_run.c @@ -302,6 +302,7 @@ error: +#if 0 /* expects an initialized new_b */ static int build_structs(struct binrpc_pkt *new_b, struct binrpc_pkt* body, struct rpc_struct_head* sl_head) @@ -323,6 +324,7 @@ static int build_structs(struct binrpc_pkt *new_b, struct binrpc_pkt* body, error: return ret; } +#endif diff --git a/modules_s/eval/eval.c b/modules_s/eval/eval.c index 2c064b8..2c31f75 100644 --- a/modules_s/eval/eval.c +++ b/modules_s/eval/eval.c @@ -182,6 +182,7 @@ static void get_uri_and_skip_until_params(str *param_area, str *uri) { int i, quoted, uri_pos, uri_done; uri->len = 0; + uri->s = 0; uri_done = 0; for (i=0; i<param_area->len && param_area->s[i]!=';'; ) { /* [ *(token LSW)/quoted-string ] "<" addr-spec ">" | addr-spec */ /* skip name */ diff --git a/modules_s/msilo/msilo.c b/modules_s/msilo/msilo.c index b664b9b..9aa4ebd 100644 --- a/modules_s/msilo/msilo.c +++ b/modules_s/msilo/msilo.c @@ -561,6 +561,7 @@ static int m_dump(struct sip_msg* msg, char* str1, char* str2) str next_hop = STR_NULL; uac_req_t uac_r; + i=0; /* fix warning in DBG() */ if (str1) { next_hop.s = str1; next_hop.len = strlen(str1); diff --git a/modules_s/permissions/ip_set.c b/modules_s/permissions/ip_set.c index 74bcbfa..f33297c 100644 --- a/modules_s/permissions/ip_set.c +++ b/modules_s/permissions/ip_set.c @@ -101,6 +101,7 @@ int ip_set_add_list(struct ip_set *ip_set, str ip_set_s){ ip_set_s.s += ip_s.len; ip_set_s.len -= ip_s.len; mask_s.len = 0; + mask_s.s=0; if (ip_set_s.len && ip_set_s.s[0] == '/') { ip_set_s.s++; ip_set_s.len--;

15 years, 3 months

git:master: makefile: even more quiet

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: a91ba01fc9abbd737e560704e4620370a4e1c08a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a91ba01… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 21:03:03 2009 +0200 makefile: even more quiet --- Makefile | 56 +++++++++++++++++++++++++++++++------------------------- Makefile.defs | 11 +++++++++-- Makefile.libs | 2 ++ Makefile.rules | 13 +++++++++---- 4 files changed, 51 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 3a399a6..88d96e6 100644 --- a/Makefile +++ b/Makefile @@ -247,7 +247,9 @@ ifeq (,$(strip \ $(filter config.mak config cfg cfg-defs $(clean_targets),$(MAKECMDGOALS)))) include config.mak ifeq ($(makefile_defs),1) +ifeq ($(quiet),verbose) $(info config.mak loaded) +endif # verbose # config_make valid & used config_mak=1 ifeq ($(MAIN_NAME),) @@ -265,6 +267,10 @@ $(shell rm -rf config.mak) config_mak=0 makefile_defs=0 exported_vars=0 +else +# config.mak not strictly needed, but try to load it if exists for $(Q) +config_mak=skip +-include config.mak endif endif @@ -401,7 +407,7 @@ ifeq ($(config_mak),1) include Makefile.cfg -else +else ifneq ($(config_mak),skip) config.mak: Makefile.defs @echo making config... @@ -494,8 +500,8 @@ $(1)_target=$(prefix)/$(modules_dir)$(1) $(1): modules.lst @for r in $($(1)) "" ; do \ if [ -n "$$$$r" -a -r "$$$$r/Makefile" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$$$r $$(mk_params) || [ ${err_fail} != 1 ] ; then \ :; \ else \ @@ -508,8 +514,8 @@ $(1): modules.lst $(1)-doc: modules.lst @for r in $($(1)) "" ; do \ if [ -n "$$$$r" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \\ $(MAKE) -C $$$$r/doc $(doc_format) $$(mk_params); \ fi ; \ done @@ -519,8 +525,8 @@ $(1)-doc: modules.lst $(1)-readme: modules.lst -@for r in $($(1)) "" ; do \ if [ -n "$$$$r" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$$$r $$(mk_params) README || [ ${err_fail} != 1 ];\ then \ :; \ @@ -534,8 +540,8 @@ $(1)-readme: modules.lst $(1)-man: modules.lst -@for r in $($(1)) "" ; do \ if [ -n "$$$$r" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$$$r $$(mk_params) man || [ ${err_fail} != 1 ] ;\ then \ :; \ @@ -550,8 +556,8 @@ $(1)-man: modules.lst install-$(1): modules.lst $$($(1)_dst) @for r in $($(1)) "" ; do \ if [ -n "$$$$r" -a -r "$$$$r/Makefile" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$$$r install mods_dst=$$($(1)_dst) $$(mk_params) \ || [ ${err_fail} != 1 ] ; then \ :; \ @@ -617,8 +623,8 @@ $(extra_objs): @echo "Extra objs: $(extra_objs)" @for r in $(static_modules_path) "" ; do \ if [ -n "$$r" -a -r "$$r/Makefile" ]; then \ - echo "" ; \ - echo "Making static module $r" ; \ + $(call oecho, "" ;) \ + $(call oecho, "Making static module $r" ;) \ if $(MAKE) -C $$r static $(mk_params) ; then \ :; \ else \ @@ -631,8 +637,8 @@ $(extra_objs): utils: @for r in $(utils_compile) "" ; do \ if [ -n "$$r" ]; then \ - echo "" ; \ - echo "" ; \ + $(call oecho, "" ;) \ + $(call oecho, "" ;) \ if $(MAKE) -C $$r $(mk_params) || [ ${err_fail} != 1 ] ; \ then \ :; \ @@ -774,22 +780,22 @@ $(man_prefix)/$(man_dir)/man5: # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) install-cfg: $(cfg_prefix)/$(cfg_dir) - sed $(foreach m,$(modules_dirs),\ + @sed $(foreach m,$(modules_dirs),\ -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ < etc/$(CFG_NAME)-basic.cfg > \ $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample - chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample - if [ -z "${skip_cfg_install}" -a \ + @chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample + @if [ -z "${skip_cfg_install}" -a \ ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg ]; then \ mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg.sample \ $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME).cfg; \ fi - sed $(foreach m,$(modules_dirs),\ + @sed $(foreach m,$(modules_dirs),\ -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ < etc/$(CFG_NAME)-oob.cfg \ > $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample - chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample - if [ -z "${skip_cfg_install}" -a \ + @chmod 644 $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample + @if [ -z "${skip_cfg_install}" -a \ ! -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg ]; \ then \ mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \ @@ -878,22 +884,22 @@ install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc install-sr-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 - sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ + @sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ $(foreach m,$(modules_dirs),\ -e "s#/usr/lib/$(CFG_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ -e "s#/usr/share/doc/$(CFG_NAME)/#$(doc_target)#g" \ < $(CFG_NAME).8 > \ $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 - chmod 644 $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 - sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ + @chmod 644 $(man_prefix)/$(man_dir)/man8/$(MAIN_NAME).8 + @sed -e "s#/etc/$(CFG_NAME)/$(CFG_NAME)\.cfg#$(cfg_target)$(MAIN_NAME).cfg#g" \ -e "s#/usr/sbin/#$(bin_target)#g" \ $(foreach m,$(modules_dirs),\ -e "s#/usr/lib/$(CFG_NAME)/$(m)$[^_]$#$($(m)_target)\1#g") \ -e "s#/usr/share/doc/$(CFG_NAME)/#$(doc_target)#g" \ < $(CFG_NAME).cfg.5 > \ $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 - chmod 644 $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 + @chmod 644 $(man_prefix)/$(man_dir)/man5/$(MAIN_NAME).cfg.5 install-man: install-sr-man install-every-module-man diff --git a/Makefile.defs b/Makefile.defs index a9bd307..ee02e39 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -75,15 +75,18 @@ # 2009-10-01 use -fsigned-char for gcc on ppc, ppc64, arm and arm6 # (on those archs char is unsigned by default) (andrei) +quiet?=$(if $(filter 1 yes on,$(Q)),silent,verbose) # check if already included/exported - # used for sanity checks for Makefile.defs inclusion (!= makefile_defs which # specifies if we have a set of valid defs) override makefile_defs_included:=1 ifeq ($(makefile_defs),1) +ifeq ($(quiet),verbose) $(info Makefile.defs defs skipped) +endif # verbose + else ifeq (,$(main_makefile)) @@ -94,7 +97,9 @@ ifeq (,$(main_makefile)) # don't export the vars) COREPATH?= ../.. include $(COREPATH)/config.mak +ifeq ($(quiet),verbose) $(info config.mak included) +endif # verbose # config.mak should set makefile_defs if complete export makefile_defs @@ -103,7 +108,9 @@ override makefile_defs=1 export makefile_defs +ifeq ($(quiet),verbose) $(info normal Makefile.defs exec) +endif # verbose # main binary name MAIN_NAME=ser #prefix for various configs and scripts @@ -417,11 +424,11 @@ endif # predefined macros tests (x86_macros, ...) endif # gcc ifdef CC_ARCH -$(info target architecture <$(CC_ARCH)>, host architecture <$(HOST_ARCH)>) ARCH:=$(CC_ARCH) else ARCH:=$(HOST_ARCH) endif +$(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) # compile-time options # diff --git a/Makefile.libs b/Makefile.libs index 21df837..6182580 100644 --- a/Makefile.libs +++ b/Makefile.libs @@ -20,7 +20,9 @@ endif ifneq (,$(filter install% %install install, $(MAKECMDGOALS))) compile_for_install:=yes +ifeq ($(quiet),verbose) $(info install mode) +endif # verbose endif ifeq ($(NAME),) diff --git a/Makefile.rules b/Makefile.rules index 55c7897..feadec5 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -66,9 +66,14 @@ silent_cmd_LD=LD ($(LD)) [$(strip $(crt_type) $(NAME))] $@ ifneq (,$(filter 1 yes on, $(Q) $(QUIET))) quiet=silent Q=1 +MAKE+= --no-print-directory +#shell optional print +oecho= else -Q=0 +override Q:= quiet=verbose +#shell optional print +oecho=echo $(1) endif quote:= " @@ -156,14 +161,14 @@ $(SER_IPATH_LST): FORCE $(@) 1>/dev/null 2>/dev/null ; \ then :; \ else \ - echo "re-building $(@D)" ; \ + $(call oecho,"re-building $(@D)" ;) \ $(MAKE) -wC $(@D) compile_for_install=$(lib_compile_for_install) ; \ fi .PHONY: FORCE-BUILD-LIBS FORCE-BUILD-LIBS: @for r in $(SER_LIBS_DIRS) ; do \ - echo building lib $$r; \ + $(call oecho,building lib $$r ;) \ $(MAKE) -wC $$r compile_for_install=$(lib_compile_for_install) ; \ done @@ -207,7 +212,7 @@ clean: local-clean clean-modules: -@for r in $(cmodules) $(static_modules_path) "" ; do \ if [ -d "$$r" ]; then \ - echo "module $$r" ; \ + $(call oecho,"module $$r" ;) \ $(MAKE) -C "$$r" clean ; \ [ -d "$$r"/doc/Makefile ] && $(MAKE) -C "$$r"/doc clean ; \ fi ; \

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev