sr-dev

sr-dev@lists.kamailio.org

44307 discussions

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":

14 years, 4 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

14 years, 4 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

14 years, 4 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

14 years, 4 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);

14 years, 4 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">

14 years, 4 months

git:master: core: tcp_read.c insensitive search for HTTP11 headers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 33f8efe0ee6af800cfb0e870be3e0c9626a5110f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33f8efe… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Tue Sep 21 13:11:33 2010 +0100 core: tcp_read.c insensitive search for HTTP11 headers --- tcp_read.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index b8be180..1fe5a91 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -122,16 +122,39 @@ static struct local_timer tcp_reader_ltimer; static ticks_t tcp_reader_prev_ticks; #ifdef READ_HTTP11 +static inline char *strfindcasestrz(str *haystack, char *needlez) +{ + int i,j; + str needle; + + needle.s = needlez; + needle.len = strlen(needlez); + for(i=0;i<haystack->len-needle.len;i++) { + for(j=0;j<needle.len;j++) { + if ( !((haystack->s[i+j]==needle.s[j]) || + ( isalpha((int)haystack->s[i+j]) + && ((haystack->s[i+j])^(needle.s[j]))==0x20 )) ) + break; + } + if (j==needle.len) + return haystack->s+i; + } + return 0; +} + int tcp_http11_continue(struct tcp_connection *c) { struct dest_info dst; char *p; struct msg_start fline; int ret; + str msg; ret = 0; - p = parse_first_line(c->req.buf, c->req.pos - c->req.buf, &fline); + msg.s = c->req.start; + msg.len = c->req.pos - c->req.start; + p = parse_first_line(msg.s, msg.len, &fline); if(p==NULL) return 0; @@ -145,7 +168,7 @@ int tcp_http11_continue(struct tcp_connection *c) return 0; /* check for Expect header */ - if(strstr(c->req.start, "Expect: 100-continue")!=NULL) + if(strfindcasestrz(&msg, "Expect: 100-continue")!=NULL) { init_dst_from_rcv(&dst, &c->rcv); if (tcp_send(&dst, 0, HTTP11CONTINUE, HTTP11CONTINUE_LEN) < 0) { @@ -153,7 +176,7 @@ int tcp_http11_continue(struct tcp_connection *c) } } /* check for Transfer-Encoding header */ - if(strstr(c->req.start, "Transfer-Encoding: chunked")!=NULL) + if(strfindcasestrz(&msg, "Transfer-Encoding: chunked")!=NULL) { c->req.flags |= F_TCP_REQ_BCHUNKED; ret = 1;

14 years, 4 months

git:master: xcap_server: set content-type per auid in reply

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 406f43b42f8d5ef015d4fd7b1e17158430be7b2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=406f43b… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Tue Sep 21 13:09:42 2010 +0100 xcap_server: set content-type per auid in reply - accept also xcap-caps auid --- modules_k/xcap_server/xcap_misc.c | 4 ++++ modules_k/xcap_server/xcap_server.c | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 1c844e7..103d218 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -145,6 +145,10 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) LM_DBG("matched resource-lists\n"); xuri->type = RESOURCE_LIST; xuri->auid.len = 14; + } else if(s.len>10 && strncmp(s.s, "xcap-caps/", 10)==0) { + LM_DBG("matched xcap-caps\n"); + xuri->type = XCAP_CAPS; + xuri->auid.len = 9; } else { LM_ERR("unsupported auid in [%.*s]\n", xuri->uri.len, xuri->uri.s); diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 4f5d5c0..d37c860 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -403,6 +403,13 @@ static str xcaps_str_ok = {"OK", 2}; static str xcaps_str_srverr = {"Server error", 12}; static str xcaps_str_nocontent = {"No content", 10}; static str xcaps_str_appxml = {"application/xml", 15}; +static str xcaps_str_apprlxml = {"application/resource-lists+xml", 30}; +static str xcaps_str_apprsxml = {"application/rls-services+xml", 28}; +#if 0 +static str xcaps_str_appxcxml = {"application/xcap-caps+xml", 25}; +#endif +static str xcaps_str_appapxml = {"application/auth-policy+xml", 27}; + /** * @@ -721,6 +728,7 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) str body; int ret = 0; xcap_uri_t xuri; + str *ctype; if(puri==0 || ppath==0) { @@ -771,11 +779,18 @@ static int w_xcaps_get(sip_msg_t* msg, char* puri, char* ppath) if(ret==0) { /* doc found */ + ctype = &xcaps_str_appxml; + if(xuri.type==RESOURCE_LIST) + ctype = &xcaps_str_apprlxml; + else if(xuri.type==PRES_RULES) + ctype = &xcaps_str_appapxml; + else if(xuri.type==RLS_SERVICE) + ctype = &xcaps_str_apprsxml; xcaps_send_reply(msg, 200, &xcaps_str_ok, &etag, - &xcaps_str_appxml, &body); + ctype, &body); } else { /* doc not found */ - xcaps_send_reply(msg, 204, &xcaps_str_nocontent, &xcaps_str_empty, + xcaps_send_reply(msg, 200, &xcaps_str_nocontent, &xcaps_str_empty, &xcaps_str_empty, &xcaps_str_empty); } return 1;

14 years, 4 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 */

14 years, 4 months

git:master: core: no 2nd via log message set to info level

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2df94c0f9a1c1a797fef4508863a7bb985c8f10b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2df94c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 20 17:43:38 2010 +0200 core: no 2nd via log message set to info level - replies to self requests have no 2nd via --- forward.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index c071416..9e675da 100644 --- a/forward.c +++ b/forward.c @@ -754,7 +754,7 @@ int forward_reply(struct sip_msg* msg) || (msg->via2==0) || (msg->via2->error!=PARSE_OK)) { /* no second via => error */ - LOG(L_ERR, "ERROR: forward_reply: no 2nd via found in reply\n"); + LOG(L_INFO, "broken reply to forward - no 2nd via\n"); goto error; }

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev