sr-dev September 2010

sr-dev@lists.kamailio.org

25 participants
222 discussions

git:master: makefile: don't try to build docs for empty modules

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c0c4a3a24001e40a89e3819f6407346fe1fdf0cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0c4a3a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 17:34:40 2010 +0200 makefile: don't try to build docs for empty modules - don't try to build READMEs for modules directories without Makefiles - don't try to build manpages for modules that do not have the corresponding xml file - don't install docs for modules without Makefiles (remains of deleted modules) --- Makefile | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7cb480a..311a16c 100644 --- a/Makefile +++ b/Makefile @@ -616,7 +616,7 @@ $(1): modules.lst .PHONY: $(1)-doc $(1)-doc: modules.lst +@for r in $($(1)) "" ; do \ - if [ -n "$$$$r" ]; then \ + if [ -n "$$$$r" -a -r "$$$$r/Makefile" ]; then \ $(call oecho, "" ;) \ $(call oecho, "" ;) \ $(MAKE) -C $$$$r/doc $(doc_format) $$(mk_params); \ @@ -627,7 +627,7 @@ $(1)-doc: modules.lst $(1)-readme: modules.lst -+@for r in $($(1)) "" ; do \ - if [ -n "$$$$r" ]; then \ + if [ -n "$$$$r" -a -r "$$$$r/Makefile" ]; then \ $(call oecho, "" ;) \ $(call oecho, "" ;) \ if $(MAKE) -C $$$$r $$(mk_params) README || [ ${err_fail} != 1 ];\ @@ -641,11 +641,13 @@ $(1)-readme: modules.lst .PHONY: $(1)-man $(1)-man: modules.lst - -+@for r in $($(1)) "" ; do \ - if [ -n "$$$$r" ]; then \ + -+@for r in $($(1)_basenames) "" ; do \ + if [ -n "$$$$r" -a -r $(1)/"$$$$r/Makefile" -a \ + -r $(1)/"$$$$r/$$$$r.xml" ]; then \ $(call oecho, "" ;) \ $(call oecho, "" ;) \ - if $(MAKE) -C $$$$r $$(mk_params) man || [ ${err_fail} != 1 ] ;\ + if $(MAKE) -C $(1)/"$$$$r" $$(mk_params) man || \ + [ ${err_fail} != 1 ] ;\ then \ :; \ else \ @@ -675,7 +677,7 @@ install-$(1): modules.lst $$($(1)_dst) install-$(1)-doc: modules.lst $(doc_prefix)/$(doc_dir)$(1) @for r in $($(1)_basenames) "" ; do \ - if [ -n "$$$$r" ]; then \ + if [ -n "$$$$r" -a -r $(1)/"$$$$r/Makefile" ]; then \ if [ -f $(1)/"$$$$r"/README ]; then \ $$(call try_err,\ $(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)$(1)/README ); \ @@ -693,7 +695,7 @@ install-$(1)-doc: modules.lst $(doc_prefix)/$(doc_dir)$(1) install-$(1)-man: $(1)-man $(man_prefix)/$(man_dir)/man7 @for r in $($(1)_basenames) "" ; do \ - if [ -n "$$$$r" ]; then \ + if [ -n "$$$$r" -a -r $(1)/"$$$$r/Makefile" ]; then \ if [ -f $(1)/"$$$$r"/"$$$$r".7 ]; then \ $$(call try_err,\ $(INSTALL_TOUCH) $(man_prefix)/$(man_dir)/man7/"$$$$r".7 );\

13 years, 7 months

git:master: presence(k): refresh watchers function exported to config

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: de33514c3a90688cbb9ad171984f7b752f82aa4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de33514… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 21 16:46:40 2010 +0200 presence(k): refresh watchers function exported to config --- modules_k/presence/README | 30 ++++- modules_k/presence/doc/presence_admin.xml | 51 +++++++- modules_k/presence/presence.c | 202 +++++++++++++++++++--------- 3 files changed, 216 insertions(+), 67 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=de3…

13 years, 7 months

git:master: Makefile: log func name for kamailio flavour

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f8584159fa88e92b36f8657d645f00d0ff851099 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f858415… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 20 15:47:44 2010 +0200 Makefile: log func name for kamailio flavour - default behavior in 1.5.x --- Makefile.defs | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index e8a1a21..55b9010 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -704,6 +704,9 @@ endif ifeq ($(WITHAS), 1) C_DEFS+= -DWITH_AS_SUPPORT endif +ifeq ($(FLAVOUR),kamailio) + C_DEFS+= -DLOG_FUNC_NAME +endif ifneq ($(STUN),) C_DEFS+= -DUSE_STUN

13 years, 7 months

git:master: xcap_server: added example of handling xcap-caps request

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f6c6d6e94e4b37e77a2776afb3ec5ae8f1d57c93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6c6d6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 21 15:20:08 2010 +0200 xcap_server: added example of handling xcap-caps request --- modules_k/xcap_server/README | 29 +++++++++++++++++++++++ modules_k/xcap_server/doc/xcap_server_admin.xml | 29 +++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 8abde67..4405afb 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -309,6 +309,35 @@ event_route[xhttp:request] { $var(uri) = $xcapuri(u=>xuid); else $var(uri) = "sip:"+ $xcapuri(u=>xuid) + "@" + $Ri; + + # handle XCAP capability request + if($rm=="GET" && $xcapuri(u=>auid)=="xcap-caps") + { + $var(xbody) = +"<?xml version='1.0' encoding='UTF-8'?> +<xcap-caps xmlns='urn:ietf:params:xml:ns:xcap-caps'> + <auids> + <auid>rls-services</auid> + <auid>pidf-manipulation</auid> + <auid>xcap-caps</auid> + <auid>resource-lists</auid> + <auid>pres-rules</auid> + </auids> + <extensions> + </extensions> + <namespaces> + <namespace>urn:ietf:params:xml:ns:rls-services</namespace> + <namespace>urn:ietf:params:xml:ns:pidf</namespace> + <namespace>urn:ietf:params:xml:ns:xcap-caps</namespace> + <namespace>urn:ietf:params:xml:ns:resource-lists</namespace> + <namespace>urn:ietf:params:xml:ns:pres-rules</namespace> + </namespaces> +</xcap-caps>"; + xhttp_reply("200", "ok", "application/xcap-caps+xml", + "$var(xbody)"); + exit; + } + xdbg("SCRIPT: xcap service $xcapuri(u=>auid) for $xcapuri(u=>xuid)\n"); switch($rm) { case "PUT": diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index ecf9893..2c890c0 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -361,6 +361,35 @@ event_route[xhttp:request] { $var(uri) = $xcapuri(u=>xuid); else $var(uri) = "sip:"+ $xcapuri(u=>xuid) + "@" + $Ri; + + # handle XCAP capability request + if($rm=="GET" && $xcapuri(u=>auid)=="xcap-caps") + { + $var(xbody) = +"<?xml version='1.0' encoding='UTF-8'?> +<xcap-caps xmlns='urn:ietf:params:xml:ns:xcap-caps'> + <auids> + <auid>rls-services</auid> + <auid>pidf-manipulation</auid> + <auid>xcap-caps</auid> + <auid>resource-lists</auid> + <auid>pres-rules</auid> + </auids> + <extensions> + </extensions> + <namespaces> + <namespace>urn:ietf:params:xml:ns:rls-services</namespace> + <namespace>urn:ietf:params:xml:ns:pidf</namespace> + <namespace>urn:ietf:params:xml:ns:xcap-caps</namespace> + <namespace>urn:ietf:params:xml:ns:resource-lists</namespace> + <namespace>urn:ietf:params:xml:ns:pres-rules</namespace> + </namespaces> +</xcap-caps>"; + xhttp_reply("200", "ok", "application/xcap-caps+xml", + "$var(xbody)"); + exit; + } + xdbg("SCRIPT: xcap service $xcapuri(u=>auid) for $xcapuri(u=>xuid)\n"); switch($rm) { case "PUT":

13 years, 8 months

git:master: makefile: xcap_server added to the excluded list

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4d6de6c8aafae2004a17d74ac826db390f4b5c42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d6de6c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 14:48:19 2010 +0200 makefile: xcap_server added to the excluded list Not compiled by default because it depends on libxml2. --- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4e36e93..7cb480a 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,7 @@ module_group_radius=acc_radius auth_radius misc_radius avp_radius uri_radius \ # kamailio modules module_group_presence=presence presence_dialoginfo presence_mwi presence_xml \ pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ - rls xcap_client + rls xcap_client xcap_server #ser modules module_group_presence+=dialog presence_b2b xcap # obsolete/unmaintained ser modules @@ -258,7 +258,7 @@ module_group_ktls=tls # K presence modules module_group_kpresence=presence presence_dialoginfo presence_mwi presence_xml \ pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ - rls xcap_client + rls xcap_client xcap_server # if not set on the cmd. line, env or in the modules.lst (cfg_group_include) # exclude the below modules. @@ -282,7 +282,7 @@ else dialplan lcr utils presence presence_mwi \ presence_dialoginfo presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \ - regex xcap_client + regex xcap_client xcap_server #excluded because they depend on external *.h files exclude_modules+= h350 # excluded because they do not compile (remove them only after they are

13 years, 8 months

git:master: iptrtpproxy: minor doc updates

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 77bcb35eb4b4fc15aeeca8cab9577e34eeaf0168 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77bcb35… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 14:13:17 2010 +0200 iptrtpproxy: minor doc updates - minor fixes + note about setting iptdir in Makefile - README regenerated --- modules/iptrtpproxy/README | 13 ++++++++++--- modules/iptrtpproxy/doc/iptrtpproxy.xml | 30 +++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/modules/iptrtpproxy/README b/modules/iptrtpproxy/README index 7854b36..4a02c94 100644 --- a/modules/iptrtpproxy/README +++ b/modules/iptrtpproxy/README @@ -32,9 +32,9 @@ Tomas Mandys It provides similar functionality as nathelper but communicates with netfilter kernel xt_RTPPROXY module using libipt_RTPPROXY userspace - library. See http://www.2p.cz/en/netfilter_rtp_proxy All RTP streams - are manipulated directly in kernel space, no data are copied from - kernel to userspace and back, it reduces load and delay. + library. All RTP streams are manipulated directly in kernel space, no + data is copied from kernel to userspace and back, it reduces load and + delay. See http://www.2p.cz/en/netfilter_rtp_proxy for more details. The ser module is written as light-weighted, there is not implemented any dialog managment as in nathelper, the reason is that such API @@ -60,6 +60,13 @@ Tomas Mandys * netfilter xt_RTPROXY & libipt_RTPPROXY, see http://www.2p.cz/en/netfilter_rtp_proxy +Note + + The module Makefile must be edited and iptdir setup to the directory + with the iptable sources (if different from ~/iptables). Alternatively + compile the module using: + make -C modules/iptrtpproxy iptdir=path_to_iptables_src + 1.3. Parameters 1.3.1. config (string) diff --git a/modules/iptrtpproxy/doc/iptrtpproxy.xml b/modules/iptrtpproxy/doc/iptrtpproxy.xml index 7c9e039..10cfcc6 100644 --- a/modules/iptrtpproxy/doc/iptrtpproxy.xml +++ b/modules/iptrtpproxy/doc/iptrtpproxy.xml @@ -1,6 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" + [ <!ENTITY % local.common.attrib + "xmlns:xi CDATA #FIXED 'http://www.w3.org/2001/XInclude'"> +  + <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> + %docentities; + ] +> <section id="iptrtpproxy" xmlns:xi="http://www.w3.org/2001/XInclude"> <sectioninfo> @@ -34,11 +41,12 @@ <para> It provides similar functionality as <emphasis>nathelper</emphasis> but communicates with <emphasis>netfilter</emphasis> kernel <emphasis>xt_RTPPROXY</emphasis> module using - <emphasis>libipt_RTPPROXY</emphasis> userspace library. - See <ulink url="http://www.2p.cz/en/netfilter_rtp_proxy">http://www.2p.cz/en/netfilter_rtp_proxy</ulink> - All RTP streams are - manipulated directly in kernel space, no data are copied from - kernel to userspace and back, it reduces load and delay. + <emphasis>libipt_RTPPROXY</emphasis> userspace library. + All RTP streams are + manipulated directly in kernel space, no data is copied from + kernel to userspace and back, it reduces load and delay. + See <ulink url="http://www.2p.cz/en/netfilter_rtp_proxy"> + http://www.2p.cz/en/netfilter_rtp_proxy</ulink> for more details. </para> <para> @@ -92,6 +100,14 @@ </listitem> </itemizedlist> </para> + <note><para> + The module Makefile must be edited and iptdir setup to the directory with + the iptable sources (if different from ~/iptables). Alternatively + compile the module using: + <programlisting> + make -C modules/iptrtpproxy iptdir=path_to_iptables_src + </programlisting> + </para></note> </section> <section id="iptrtpproxy.parameters">

13 years, 8 months

git:master: iptrtpproxy: s/cfg_parse/sr_cfg_parse/

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e3797ca3476ac75ad3688557c6fb3fd3440ce5aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e3797ca… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 14:02:31 2010 +0200 iptrtpproxy: s/cfg_parse/sr_cfg_parse/ cfg_parse name changed into sr_cfg_parse (since commit 50ca02e5). --- modules/iptrtpproxy/iptrtpproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/iptrtpproxy/iptrtpproxy.c b/modules/iptrtpproxy/iptrtpproxy.c index 670285b..8764436 100644 --- a/modules/iptrtpproxy/iptrtpproxy.c +++ b/modules/iptrtpproxy/iptrtpproxy.c @@ -1053,7 +1053,7 @@ static int parse_iptrtpproxy_cfg() { cfg_section_parser(parser, parse_switchboard_section, NULL); cfg_set_options(parser, section_options); memset(&parse_config_vals, 0, sizeof(parse_config_vals)); - if (cfg_parse(parser)) { + if (sr_cfg_parse(parser)) { return -1; } cfg_parser_close(parser);

13 years, 8 months

git:master: iptrtpproxy: makefile LIBS update

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bf7b4ffd6c9238488d08be491ef212881f13349c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf7b4ff… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 14:01:07 2010 +0200 iptrtpproxy: makefile LIBS update Look for libipt_RTPPROXY first under /lib/xtables (default install dir) and if not found in $(iptdir)/extensions (compile dir). --- modules/iptrtpproxy/Makefile | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/iptrtpproxy/Makefile b/modules/iptrtpproxy/Makefile index 4576575..4d6fd76 100644 --- a/modules/iptrtpproxy/Makefile +++ b/modules/iptrtpproxy/Makefile @@ -6,14 +6,17 @@ # WARNING: do not run this directly, it should be run by the master Makefile # -# define path to netfilter/iptables directory -iptdir = ~/work/netfilter/iptables +# define path to netfilter/iptables source directory +iptdir = ~/iptables include ../../Makefile.defs auto_gen= NAME=iptrtpproxy.so -LIBS += $(iptdir)/iptables.o -L $(iptdir)/libiptc -liptc \ - -L $(iptdir)/extensions -lext -INCLUDES = -I $(iptdir)/include +#LIBS += $(iptdir)/iptables.o -L $(iptdir)/libiptc -liptc \ +# -L $(iptdir)/extensions -lext +# look for libipt_RTPPROXY first under /lib/xtables (default install dir) +# and if not found in $(iptdir)/extensions (compile dir) +LIBS = -L/lib/xtables -L$(iptdir)/extensions -lipt_RTPPROXY -ldl +INCLUDES = -I$(iptdir)/include DEFS+=-DSER_MOD_INTERFACE

13 years, 8 months

git:master: makefile: xmlops added to the excluded list

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 755251d7591a7df1765236511e3b47ac37b4537d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=755251d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 13:56:40 2010 +0200 makefile: xmlops added to the excluded list Not compiled by default because it depends on libxml2. --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index c4cc1a9..4e36e93 100644 --- a/Makefile +++ b/Makefile @@ -294,6 +294,8 @@ else exclude_modules+= app_lua # depends on libpython-dev exclude_modules+= app_python + # depends on libxml2 + exclude_modules+= xmlops endif # always exclude the CVS dir

13 years, 8 months

git:master: xcap_client: defined xcap-caps auid type

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 03c5fe9d1ef6e9fc9db66bcee47723da63ed583f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03c5fe9… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Tue Sep 21 13:10:53 2010 +0100 xcap_client: defined xcap-caps auid type --- modules_k/xcap_client/xcap_callbacks.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/xcap_client/xcap_callbacks.h b/modules_k/xcap_client/xcap_callbacks.h index 8fe09fd..ae04bfb 100644 --- a/modules_k/xcap_client/xcap_callbacks.h +++ b/modules_k/xcap_client/xcap_callbacks.h @@ -35,6 +35,7 @@ #define RESOURCE_LIST 1<<2 #define RLS_SERVICE 1<<3 #define PIDF_MANIPULATION 1<<4 +#define XCAP_CAPS 1<<5 /* callback function prototype */

13 years, 8 months

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2010