sr-dev October 2012

sr-dev@lists.kamailio.org

31 participants
241 discussions

Makefile problem building RPMs after sercmd to kamcmd change
by Peter Dunkley 25 Oct '12

25 Oct '12

Hi, My rpmbuilds are failing with these errors: make[3]: *** No rule to make target `/home/peter.dunkley/rpmbuild/BUILDROOT/kamailio-3.4.0-dev4.fc17.x86_64/usr/share/man//man8', needed by `install-util-man'. Stop. make[2]: *** [/home/peter.dunkley/rpmbuild/BUILDROOT/kamailio-3.4.0-dev4.fc17.x86_64/usr/sbin//kamcmd] Error 2 ERROR: make --no-print-directory -C ../../utils/sercmd install-if-newer failed make[1]: *** [install-utils] Error 1 make: *** [install-modules] Error 1 I'm not a make guru, so after taking a quick look, I can't see what the problem is. Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 2

MSRP relay authentication
by Peter Dunkley 25 Oct '12

25 Oct '12

Hi, MSRP AUTH requests must be authenticated using HTTP Digest authentication. Part of the concatenated data when doing this authentication is the method name. Because of the way MSRP requests are formatted, the part of the request-line that would contain the method name in HTTP or SIP requests is always MSRP. The MSRP method name (AUTH in this case) is at the end of the request-line. When Kamailio converts an MSRP request to SIP it has a method name of MSRP. This means that when Kamailio authenticates an MSRP request it uses "MSRP" as the method name, not the actual MSRP method name (AUTH). Is this correct? Should MSRP requests be authenticated with a method name of "MSRP" (which kind-of makes sense as this is the string at the start of the MSRP request line - which is where the method names are in HTTP and SIP) or should the MSRP method name of "AUTH" be used? If it is the later, does anyone know of an easy way to add this to Kamailio? Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 4

git:master: modules_k/xcap_server: Tidied up example
by Peter Dunkley 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: e804a70e47f938338e6d93930c297ff958f16e22 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e804a70… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 25 21:36:28 2012 +0100 modules_k/xcap_server: Tidied up example --- modules_k/xcap_server/README | 18 ++++++++++-------- modules_k/xcap_server/doc/xcap_server_admin.xml | 14 ++++++++++---- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 662d3e5..8b2bc57 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -369,15 +369,16 @@ event_route[xhttp:request] { pres_update_watchers("$var(uri)", "presence"); pres_refresh_watchers("$var(uri)", "presence", 1); } - else if($xcapuri(u=>auid)=~"rls-services" || $xcapuri(u=>auid)=~ -"resource-lists") + else if($xcapuri(u=>auid)=~"rls-services" + || $xcapuri(u=>auid)=~"resource-lists") { rls_update_subs("$var(uri)", "presence"); } else if($xcapuri(u=>auid)=~"pidf-manipulation") { - pres_refresh_watchers("$var(uri)", "presence", 2, "$xcapuri( -u=>uri_adoc)", "$xcapuri(u=>file)"); + pres_refresh_watchers("$var(uri)", "presence", 2, + "$xcapuri(u=>uri_adoc)", + "$xcapuri(u=>file)"); } exit; break; @@ -392,15 +393,16 @@ u=>uri_adoc)", "$xcapuri(u=>file)"); pres_update_watchers("$var(uri)", "presence"); pres_refresh_watchers("$var(uri)", "presence", 1); } - else if($xcapuri(u=>auid)=~"rls-services" || $xcapuri(u=>auid)=~ -"resource-lists") + else if($xcapuri(u=>auid)=~"rls-services" + || $xcapuri(u=>auid)=~"resource-lists") { rls_update_subs("$var(uri)", "presence"); } else if($xcapuri(u=>auid)=~"pidf-manipulation") { - pres_refresh_watchers("$var(uri)", "presence", 2, "$xcapuri( -u=>uri_adoc)", "$xcapuri(u=>file)"); + pres_refresh_watchers("$var(uri)", "presence", 2, + "$xcapuri(u=>uri_adoc)", + "$xcapuri(u=>file)"); } exit; break; diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index 3196972..4979334 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -420,13 +420,16 @@ event_route[xhttp:request] { pres_update_watchers("$var(uri)", "presence"); pres_refresh_watchers("$var(uri)", "presence", 1); } - else if($xcapuri(u=>auid)=~"rls-services" || $xcapuri(u=>auid)=~"resource-lists") + else if($xcapuri(u=>auid)=~"rls-services" + || $xcapuri(u=>auid)=~"resource-lists") { rls_update_subs("$var(uri)", "presence"); } else if($xcapuri(u=>auid)=~"pidf-manipulation") { - pres_refresh_watchers("$var(uri)", "presence", 2, "$xcapuri(u=>uri_adoc)", "$xcapuri(u=>file)"); + pres_refresh_watchers("$var(uri)", "presence", 2, + "$xcapuri(u=>uri_adoc)", + "$xcapuri(u=>file)"); } exit; break; @@ -441,13 +444,16 @@ event_route[xhttp:request] { pres_update_watchers("$var(uri)", "presence"); pres_refresh_watchers("$var(uri)", "presence", 1); } - else if($xcapuri(u=>auid)=~"rls-services" || $xcapuri(u=>auid)=~"resource-lists") + else if($xcapuri(u=>auid)=~"rls-services" + || $xcapuri(u=>auid)=~"resource-lists") { rls_update_subs("$var(uri)", "presence"); } else if($xcapuri(u=>auid)=~"pidf-manipulation") { - pres_refresh_watchers("$var(uri)", "presence", 2, "$xcapuri(u=>uri_adoc)", "$xcapuri(u=>file)"); + pres_refresh_watchers("$var(uri)", "presence", 2, + "$xcapuri(u=>uri_adoc)", + "$xcapuri(u=>file)"); } exit; break;

1 0

git:master: modules/msrp: Better fix for the relay problem
by Peter Dunkley 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: 6b9e4fcc176e3141f25c74f17f599b88d30f8ff9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b9e4fc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 25 21:09:40 2012 +0100 modules/msrp: Better fix for the relay problem --- modules/msrp/msrp_netio.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/msrp/msrp_netio.c b/modules/msrp/msrp_netio.c index ba8e884..f9acca1 100644 --- a/modules/msrp/msrp_netio.c +++ b/modules/msrp/msrp_netio.c @@ -113,8 +113,6 @@ int msrp_relay(msrp_frame_t *mf) memcpy(p, fpath->name.s + 11, mf->buf.s + mf->buf.len - fpath->name.s - 11); p += mf->buf.s + mf->buf.len - fpath->name.s - 11; - sar = (str_array_t*)tpath->parsed.data; - env = msrp_get_env(); if(env->envflags&MSRP_ENV_DSTINFO) { @@ -126,6 +124,7 @@ int msrp_relay(msrp_frame_t *mf) LM_ERR("error parsing To-Path header\n"); return -1; } + sar = (str_array_t*)tpath->parsed.data; if(sar==NULL || sar->size<2) { LM_DBG("To-Path has no next hop URI -- nowehere to forward\n"); @@ -138,10 +137,8 @@ int msrp_relay(msrp_frame_t *mf) } dst = &env->dstinfo; done: - if (sar->size == 2) + if (dst->send_flags.f & SND_F_FORCE_CON_REUSE) { - /* If the next hop is a client a connection must already - exist... */ port = su_getport(&dst->to); if (likely(port)) { @@ -179,7 +176,6 @@ done: return -1; } } - /* If the next hop is a relay just throw it out there... */ else if (tcp_send(dst, 0, reqbuf, p - reqbuf) < 0) { LM_ERR("forwarding frame failed\n"); return -1;

1 0

git:master: modules/msrp: Updated example in README
by Peter Dunkley 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: 682f002698c761c5570e587db5c48653668a1bb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=682f002… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 25 21:34:23 2012 +0100 modules/msrp: Updated example in README - Use new pv_www_authenticate() variant to pass in $msrp(method) - Send responses to SEND that we are relaying to clients - Handle REPORTS as end-to-end requests (that are not responded to) - Send 501 for requests that are not AUTH, SEND, or REPORT --- modules/msrp/README | 34 +++++++++++++++++++--------------- modules/msrp/doc/msrp_admin.xml | 34 +++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/modules/msrp/README b/modules/msrp/README index cc778fd..22a583b 100644 --- a/modules/msrp/README +++ b/modules/msrp/README @@ -432,11 +432,8 @@ event_route[msrp:frame-in] { if(msrp_is_reply()) { msrp_relay(); - exit; } - - # handle AUTH MSRP requests - if($msrp(method)=="AUTH") + else if($msrp(method)=="AUTH") { if($msrp(nexthops)>0) { @@ -447,12 +444,13 @@ event_route[msrp:frame-in] { # frame for local server - send Use-Path # -- passwd can be loaded from DB based on $au $var(passwd) = "xyz123"; - if(!pv_www_authenticate("myrealm", "$var(passwd)", "0")) + if(!pv_www_authenticate("myrealm", "$var(passwd)", "0", + "$msrp(method)")) { if(auth_get_www_authenticate("myrealm", "1", - "$var(wauth)")) + "$var(wauth)")) { - msrp_reply("401", "Authorization Required", + msrp_reply("401", "Unauthorized", "$var(wauth)"); } else { msrp_reply("500", "Server Error"); @@ -485,14 +483,15 @@ event_route[msrp:frame-in] { + $var(sessid) + ";tcp\r\n" + "Expires: " + $var(expires) + "\r\n"; msrp_reply("200", "OK", "$var(headers)"); - exit; } - - if($msrp(method)=="SEND") + else if($msrp(method)=="SEND" || $msrp(method)=="REPORT") { if($msrp(nexthops)>1) { - msrp_reply("200", "Received"); + if ($msrp(method)!="REPORT") + { + msrp_reply("200", "OK"); + } msrp_relay(); exit; } @@ -500,17 +499,22 @@ event_route[msrp:frame-in] { if($sht(msrp=>$var(sessid)::srcaddr) == $null) { # one more hop, but we don't have address in htable - msrp_reply("481", "No Such Session"); + msrp_reply("481", "Session-does-not-exist"); exit; } + else if($msrp(method)!="REPORT") + { + msrp_reply("200", "OK"); + } msrp_relay_flags("1"); msrp_set_dst("$sht(msrp=>$var(sessid)::srcaddr)", "$sht(msrp=>$var(sessid)::srcsock)"); msrp_relay(); - exit; } - - msrp_relay(); + else + { + msrp_reply("501", "Request-method-not-understood"); + } } ... diff --git a/modules/msrp/doc/msrp_admin.xml b/modules/msrp/doc/msrp_admin.xml index 0b20bc8..1422e8e 100644 --- a/modules/msrp/doc/msrp_admin.xml +++ b/modules/msrp/doc/msrp_admin.xml @@ -477,11 +477,8 @@ event_route[msrp:frame-in] { if(msrp_is_reply()) { msrp_relay(); - exit; } - - # handle AUTH MSRP requests - if($msrp(method)=="AUTH") + else if($msrp(method)=="AUTH") { if($msrp(nexthops)>0) { @@ -492,12 +489,13 @@ event_route[msrp:frame-in] { # frame for local server - send Use-Path # -- passwd can be loaded from DB based on $au $var(passwd) = "xyz123"; - if(!pv_www_authenticate("myrealm", "$var(passwd)", "0")) + if(!pv_www_authenticate("myrealm", "$var(passwd)", "0", + "$msrp(method)")) { if(auth_get_www_authenticate("myrealm", "1", - "$var(wauth)")) + "$var(wauth)")) { - msrp_reply("401", "Authorization Required", + msrp_reply("401", "Unauthorized", "$var(wauth)"); } else { msrp_reply("500", "Server Error"); @@ -530,14 +528,15 @@ event_route[msrp:frame-in] { + $var(sessid) + ";tcp\r\n" + "Expires: " + $var(expires) + "\r\n"; msrp_reply("200", "OK", "$var(headers)"); - exit; } - - if($msrp(method)=="SEND") + else if($msrp(method)=="SEND" || $msrp(method)=="REPORT") { if($msrp(nexthops)>1) { - msrp_reply("200", "Received"); + if ($msrp(method)!="REPORT") + { + msrp_reply("200", "OK"); + } msrp_relay(); exit; } @@ -545,17 +544,22 @@ event_route[msrp:frame-in] { if($sht(msrp=>$var(sessid)::srcaddr) == $null) { # one more hop, but we don't have address in htable - msrp_reply("481", "No Such Session"); + msrp_reply("481", "Session-does-not-exist"); exit; } + else if($msrp(method)!="REPORT") + { + msrp_reply("200", "OK"); + } msrp_relay_flags("1"); msrp_set_dst("$sht(msrp=>$var(sessid)::srcaddr)", "$sht(msrp=>$var(sessid)::srcsock)"); msrp_relay(); - exit; } - - msrp_relay(); + else + { + msrp_reply("501", "Request-method-not-understood"); + } } ]]> ...

1 0

git:master: modules/websocket: Updated example kamailio.cfg
by Peter Dunkley 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: c062817d0833a0d24a6afacc928f980298be1d60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c062817… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 25 21:35:57 2012 +0100 modules/websocket: Updated example kamailio.cfg - Reflects latest MSRP related updates --- modules/websocket/example/kamailio.cfg | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/websocket/example/kamailio.cfg b/modules/websocket/example/kamailio.cfg index 09fd968..b43583b 100644 --- a/modules/websocket/example/kamailio.cfg +++ b/modules/websocket/example/kamailio.cfg @@ -411,11 +411,8 @@ event_route[msrp:frame-in] { if(msrp_is_reply()) { msrp_relay(); - exit; } - - # handle AUTH MSRP requests - if($msrp(method)=="AUTH") + else if($msrp(method)=="AUTH") { if($msrp(nexthops)>0) { @@ -423,12 +420,12 @@ event_route[msrp:frame-in] { exit; } - if(!www_authenticate("MY_DOMAIN", "subscriber")) + if(!www_authenticate("MY_DOMAIN", "subscriber", "$msrp(method)")) { if(auth_get_www_authenticate("myrealm", "1", "$var(wauth)")) { - msrp_reply("401", "Authorization Required", + msrp_reply("401", "Unauthorized", "$var(wauth)"); } else { msrp_reply("500", "Server Error"); @@ -461,14 +458,15 @@ event_route[msrp:frame-in] { + $var(sessid) + ";tcp\r\n" + "Expires: " + $var(expires) + "\r\n"; msrp_reply("200", "OK", "$var(expires)"); - exit; } - - if($msrp(method)=="SEND") + else if($msrp(method)=="SEND" || $msrp(method)=="REPORT") { if($msrp(nexthops)>1) { - msrp_reply("200", "Received"); + if ($msrp(method)!="REPORT") + { + msrp_reply("200", "OK"); + } msrp_relay(); exit; } @@ -476,16 +474,21 @@ event_route[msrp:frame-in] { if($sht(msrp=>$var(sessid)::srcaddr) == $null) { # one more hop, but we don't have address in htable - msrp_reply("481", "No Such Session"); + msrp_reply("481", "Session-does-not-exist"); exit; } + else if($msrp(method)!="REPORT") + { + msrp_relay("200", "OK"); + } msrp_relay_flags("1"); msrp_set_dst("$sht(msrp=>$var(sessid)::srcaddr)", "$sht(msrp=>$var(sessid)::srcsock)"); msrp_relay(); - exit; } - - msrp_relay(); + else + { + msrp_reply("501", "Request-method-not-understood"); + } } #!endif

1 0

Header parsing/processing problem
by Peter Dunkley 25 Oct '12

25 Oct '12

Hi, When adding the oma.xcap-directory auid support to xcap_server I couldn't get the following bit of code (in xcap_server.c:xcaps_get_directory()) to work: while (hdr != NULL) { if (cmp_hdrname_strzn(&hdr->name, "Host", 4) == 0) { server_name = hdr->body; break; } hdr = hdr->next; } The host header was never found. However, simply putting 'xdbg("$hdr(Host)\n");' in event_route[xhttp:request] made it start working. Have I missed something in the code, or is this a bug? Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 2

git:master: modules/websocket: Added explicit parsing of all headers before searching for WebSocket specific headers
by Peter Dunkley 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: 067051b8c9da440566cbd09d80bb1abd424f68de URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=067051b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 25 20:17:05 2012 +0100 modules/websocket: Added explicit parsing of all headers before searching for WebSocket specific headers --- modules/websocket/ws_handshake.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index bbf35fb..55dfc34 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -149,6 +149,14 @@ int ws_handle_handshake(struct sip_msg *msg) return 0; } + if (parse_headers(msg, HDR_EOH_F, 0) < 0) + { + LM_ERR("error parsing headers\n"); + ws_send_reply(msg, 500, &str_status_internal_server_error, + NULL); + return 0; + } + /* Process HTTP headers */ while (hdr != NULL) {

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Peter Dunkley 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: f61a61e44168a213a065e4a7dc1c751a874fbce3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f61a61e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 25 20:35:13 2012 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: Makefile.utils: add rule to create man page dir ---

1 0

git:master: modules_k/xcap_server: Removed some test debug that was left in by mistake
by Peter Dunkley 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: 6273279621dd4a8e6f6fe6a2faa548755a3eacd6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6273279… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 25 19:59:31 2012 +0100 modules_k/xcap_server: Removed some test debug that was left in by mistake --- modules_k/xcap_server/xcap_server.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index a359290..3d0be18 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -917,10 +917,8 @@ static int xcaps_get_directory(struct sip_msg *msg, str *user, str *domain, str while (hdr != NULL) { - LM_ERR("Found header: %.*s\n", hdr->name.len, hdr->name.s); if (cmp_hdrname_strzn(&hdr->name, "Host", 4) == 0) { - LM_ERR("Found %.*s\n", hdr->body.len, hdr->body.s); server_name = hdr->body; break; }

1 0

← Newer
1
2
3
4
5
6
7
8
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2012