sr-dev October 2012

sr-dev@lists.kamailio.org

31 participants
242 discussions

git:master: modules/websocket: Added support for MSRP WebSocket sub-protocol
by Peter Dunkley 11 Oct '12

11 Oct '12

Module: sip-router Branch: master Commit: 132509a7affe0f0bffd87f3606513b1475e98a03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=132509a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 11 12:57:26 2012 +0100 modules/websocket: Added support for MSRP WebSocket sub-protocol - Prototype of draft-pd-msrp-websocket - Enables session based chat and group chat from HTML5 clients --- modules/websocket/README | 51 +++++++++++++-- modules/websocket/doc/websocket_admin.xml | 61 ++++++++++++++++-- modules/websocket/example/kamailio.cfg | 101 ++++++++++++++++++++++++++++- modules/websocket/ws_conn.c | 3 +- modules/websocket/ws_conn.h | 4 +- modules/websocket/ws_frame.c | 39 ++++++++++-- modules/websocket/ws_handshake.c | 98 ++++++++++++++++++++-------- modules/websocket/ws_handshake.h | 13 +++- modules/websocket/ws_mod.c | 19 ++++++ 9 files changed, 340 insertions(+), 49 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=132…

1 0

git:master: core: fixed small issue w/ include directive
by Marius Zbihlei 11 Oct '12

11 Oct '12

Module: sip-router Branch: master Commit: baf9486e80018206d4edcdfb666b393d8b43aadf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=baf9486… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Oct 11 10:59:45 2012 +0300 core: fixed small issue w/ include directive --- resolve.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/resolve.h b/resolve.h index 66fd3ff..6e7a2bf 100644 --- a/resolve.h +++ b/resolve.h @@ -59,7 +59,7 @@ #endif #ifdef USE_DNSSEC -#include "validator/validator.h" +#include <validator/validator.h> #endif /* define RESOLVE_DBG for debugging info (very noisy) */

1 0

[Kamailio-Devel] RLS and presence Server
by Sangeeta Shah 11 Oct '12

11 Oct '12

Hi, In your post you mentioned that you were able to get RLS And Presence working correctly on the same server. I have the following info in the config file and for some reason my RLS/Presence functionality doesn't seem to work. Any help is appreciated. #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" loadmodule "presence_mwi.so" loadmodule "presence_reginfo.so" loadmodule "pua_reginfo.so" #!endif .... #!ifdef WITH_XCAPSRV loadmodule "xhttp.so" loadmodule "xcap_server.so" #!endif #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) #modparam("presence", "fallback2db", 1) modparam("presence", "db_update_period", 20) modparam("presence", "subs_db_mode", 3) modparam("presence", "publ_cache", 0) # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 0) modparam("presence_xml", "integrated_xcap_server", 1) modparam("pua_reginfo", "default_domain", "10.50.251.12") modparam("pua_reginfo", "server_address", "sip:reginfo@10.50.251.12") #!endif #!ifdef WITH_XCAPSRV # ----- xcap_server params ----- modparam("xcap_server", "db_url", DBURL) #!endif #!ifdef WITH_RLS # ------rls module params ------ modparam("rls", "db_url", DBURL) modparam("rls", "db_mode", 2) modparam("rls", "integrated_xcap_server", 1) modparam("rls", "to_presence_code" ,10) modparam("rls", "server_address", "sip:rls@10.50.251.12:5060") #!endif route[PRESENCE] { if(!is_method("PUBLISH|SUBSCRIBE|NOTIFY")) return; #!ifdef WITH_PRESENCE xdbg("===== In presence server route =====\n"); if (!t_newtran()) { sl_reply_error(); exit; }; if(is_method("PUBLISH")) { xdbg("======= Handling publish request ===== \n"); handle_publish(); t_release(); } else if( is_method("SUBSCRIBE")) { xdbg("======== Handling subscribe request ==== \n"); #!ifdef WITH_RLS $var(ret_code) = rls_handle_subscribe(); xdbg("========= RLS Handle subscriber returned with ret code: $var(ret_code) ===\n"); if ($var(ret_code) == 10) #!endif xdbg("======== Calling Handle subscribe ===== \n"); handle_subscribe(); t_release(); } else if (is_method("NOTIFY")) { xdbg("======== Handling notify request ==== \n"); $var(ret_code) = rls_handle_notify(); xdbg("======== Handled notify request: $var($ret_code) ==== \n"); t_release(); } exit; #!endif Anything here look incorrect. I am using Kamailio 3.3 with RLS/presence and integrated XCAP. Thanks, Sangeeta Sangeeta Shah | Member of Technical Staff 224-764-3504| 224-764-3430 Web site: www.infinite-convergence.com<http://www.infinite-convergence.com> | email : sangeeta.shah(a)infinite.com Infinite Convergence Solutions | Enabling Communication ______________________________________________________________________________________________________________________________ This e-mail contains PRIVILEGED AND CONFIDENTIAL INFORMATION intended solely for the use of the addressee(s). If you are not the intended recipient, please notify so to the sender by e-mail and delete the original message. In such cases, please notify us immediately at sanchar-sadhan(a)infinite.com . Further, you are not to copy, disclose, or distribute this e-mail or its contents to any unauthorized person(s) .Any such actions are considered unlawful. This e-mail may contain viruses. Infinite has taken every reasonable precaution to minimize this risk, but is not liable for any damage you may sustain as a result of any virus in this e-mail. You should carry out your own virus checks before opening the e-mail or attachments. Infinite reserves the right to monitor and review the content of all messages sent to or from this e-mail address. Messages sent to or from this e-mail address may be stored on the Infinite e-mail system. ***INFINITE******** End of Disclaimer********INFINITE********

2 1

auth_db module not compiling
by Shane Harrison 11 Oct '12

11 Oct '12

Hi all, A bit new to this open source environment so not sure of the etiquette re. compile errors in master branch. Looks like pvar.h (line 167) has been changed post 3.3 branch. Struct pv_elem_t has a member 'spec' that is now a pointer and previously wasn't. This is causing auth_db to choke on compile. Should I raise a bug report or is correct thing to do to discuss here first. When I feel more "at home" would be happy to submit a patch to fix if that is the more correct road to follow - assuming it is not simply an issue my end. Cheers Shane -- Imagination NZ Ltd Level 6 92 Queens Drive P0 Box 30449 Lower Hutt 5040

2 2

New commits on branch 3.3
by Daniel-Constantin Mierla 10 Oct '12

10 Oct '12

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d75cb5f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 10 10:02:00 2012 +0200 tcp: fix connection alias replacing When the TCP_ALIAS_REPLACE is set and an alias has to be added to a connection that had 0 aliases (it can happen due to TCP_ALIAS_REPLACE flag), the connection aliases count was wrongly forced to 1. For more details see: http://lists.sip-router.org/pipermail/sr-users/2012-October/074932.html Patch-by Jijo (cherry picked from commit e71435b0276c89ef756fecf1bbd5e339b80e804c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f505e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 9 16:30:24 2012 +0200 core: reset params pointers if there is a failure in parse_params() - patch by Jijo (cherry picked from commit b12c2df6ccb903e2ca22d34bb968f3ebc2712b89) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14f091d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 9 12:29:09 2012 +0200 tm: set log level to debug for negative return code of run_top_route() - it returns the code of last execution action, negative return is not necessary an error (cherry picked from commit 038780fdf40c8d5d3694538f199411810fad7a0e) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94affa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 9 11:39:16 2012 +0200 rtpproxy: safety check for rtp stats pv - if the rtpproxy is not responding, there is no returned value and could cause crash when doing strlen(NULL) - return $null in case of various errors, being safer to check returned PV value in the script against $null, rather than having undefined value - reported by J. Gallart (cherry picked from commit 753f511f281b0f4406908086547225c5c0bc0d23) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5700525… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 9 09:13:15 2012 +0200 msrp: fixed copy&paste issue for getting To-Path size - the parsing of From-Path was used instead - reported by Peter Dunkley (cherry picked from commit 146873cf2b101d6363bb20c235b7dcdb8bb54134) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6f98a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 3 14:20:27 2012 +0200 mem: fixed MDBG() parameters - log level is not necessary for this macro (cherry picked from commit 0193d296e39a9fc095e90682f5335a2907403474) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d5c354… Author: Juha Heinanen <jh(a)tutpro.com> Date: Wed Oct 3 09:27:38 2012 +0300 mem/f_malloc.c: downgraded print free(0) warning from LOG to MDBG. (cherry picked from commit 7b6234a3e8d0427c767942327aff57ade676eb5e) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35fa70d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 2 21:24:09 2012 +0200 mem: enhanced the warning message for free(0) of QM in debug mode (cherry picked from commit 41fa8653157a989ed1a77f72b25a20fd984b999d) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=074faa8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 28 14:38:42 2012 +0200 app_mono: fixed c&p typo names in examples (cherry picked from commit f71d76c0f39f2c6b0e070e1246f371f17b45b2dd) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=444cb98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 27 14:57:51 2012 +0200 core/mem: moved safety check for null before range check in *free() - affects only when memory debug is enabled at compilation - apparently libssl has some free(0) which makes it not possible to work with memory debugging (reported on irc channel) (cherry picked from commit 927a8a1aa705438d210fc244066a8c5a5b84a746) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b369394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 26 00:18:49 2012 +0200 registrar(k): some contact attributes were not in $ulc(...) - ruid, reg-id and instance were not returned by $ulc(...) (cherry picked from commit 20c436df0c81b38777052b4ba6fb425577f5c707) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bae3768… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 25 13:52:05 2012 +0200 utils/misc: few updates to vim syntax highlighting (cherry picked from commit 7943249ea75d8103d1364bcb4b6a63a2e685e88a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2ba2bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 25 11:31:17 2012 +0200 sanity: fix to parameter type in example (cherry picked from commit 779addb9df44434448f78ab17d2daa756d31d3c0) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33e935c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 21 09:44:21 2012 +0200 topoh: use L_DBG instead of L_ERR for some debugging messages - reported by Miguel Baptista (cherry picked from commit e8501b8eb592fa799af1fd1cfba8fa628cbfa800) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=929cd2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 18 09:27:38 2012 +0200 pkg/kamailio/rpm: fixed copy&paste error for PKG_MEMORY size (cherry picked from commit 9430ee8d313ece9c97384868ee7623c0979028f5) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c313f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 18 09:18:52 2012 +0200 pkg/kamailio/rpm: added option to set pkg memory size for init.d script - split of MEMORY parameter to SHM_MEMORY and PKG_MEMORY - EXTRA_OPTIONS variable to add other command line parameters (cherry picked from commit 9430290ad91ca775bb18f54e70308917ce1e790a) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f5df3a2… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Sep 17 17:34:57 2012 +0300 core:parser fix possible bug in msg_parser If buffer was NULL, tmp was returned uninitialized, thus possible to cause problems (cherry picked from commit cccdaead04411175c46dd660c91c037c45f80c33) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc4b47f… Author: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Sep 17 10:55:48 2012 +0200 benchmark: fixed bug/typo in calculating time diff ;) (cherry picked from commit d9b009ef3c430f6ea064b4a72d5b94ce842ede1d) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37e67be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 11 08:52:53 2012 +0200 kex: documented mi statistics commands - reported by David at lublink (cherry picked from commit 6b7a27e81cc838de6af9a1c55edb937d1094ce98) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7572ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 31 10:29:45 2012 +0200 auth: print return code in log when nonce is invalid - it will give a clue about why nonce is considered invalid (cherry picked from commit 494b383edde7a2d193c220f3117506e4cc95932f) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=756b1cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 30 10:15:26 2012 +0200 db_cluster: safety check for existence of several DB API members (cherry picked from commit 21583d47751fc7f684dac41a3bfbfc3b2c0bf3a3) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4bfc9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 27 10:37:50 2012 +0200 db_cluster: more verbosity when building cluster structures (cherry picked from commit b53ca97379e1b4aeae80b794f23e25e9150a0e58) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6a8291… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 24 09:14:28 2012 +0200 db_cluster: use connection from write structure for db updates - could be related to an issue reported by Øyvind Kolbu (cherry picked from commit 4d15ba97bab58108cfedc45158d90583f67cdadf) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5719b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 19 21:29:06 2012 +0200 core: rephrased debug message about no 2nd via in reply (cherry picked from commit 8bc7114c6a915985ca2f4e9ab50ea608437c7256) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26ecb49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 15 13:01:43 2012 +0200 dispatcher(k): corrected setid_pvname parameter name - readme listed it as setid_pvar, the source code expected setid_pvname - reported by Dan B. (cherry picked from commit e1149b05868b918d0bc52b2d46bb02f7799358db) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90a50be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 15 12:48:32 2012 +0200 dispatcher(k): corrected the variable which is set by ds_is_from_list() - setid_pvar is used instead of grp_avp - reported by Dan B. (cherry picked from commit be05dfc0f4af62f9c368960fe75a810548be8b87) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c7ecd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 14 22:18:50 2012 +0200 acc(k): added notes about dynamic table name for db acc to docs (cherry picked from commit 91d6d3c8a1484b23ff74f0cfd6356447985455a5) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7287933… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 12 14:52:07 2010 +0200 acc(k): table name for db acc can be dynamic - you can include variables in table name and will be evaluated at runtime: modparam("acc", "db_table_acc", "acc_$time(year)_$time(mon)") will write now to table acc_2010_10 - same can be done for missed_calls table name - second parameter of acc_db_request() supports as well config variables (cherry picked from commit e8f6a95d43b6a4340cf7e97213af5c71fa2a69e9) (cherry picked from commit 95ee0a3ee75556a25f3a9286837a57decf6c3c91) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9400477… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 14 11:19:08 2012 +0200 pkg/kamailio/rpm: execute 'success' for start operation - reported by Andre (cherry picked from commit f9c5c389b2412d23f1fdd35c6e97dfe7dbe44811) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d94df59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 9 16:14:43 2012 +0200 usrloc(k): safety check for raw_query - db get all contacts functions requires raw_query, but not all db modules implement it (cherry picked from commit f61295a91bb92645ea46dea5f6101232afeb720d)

1 0

git:master: core: disable build of DNSSEC (patch from Marius)
by Henning Westerholt 10 Oct '12

10 Oct '12

Module: sip-router Branch: master Commit: 728f6033a7ee663f3e46717c8ea49703135d3c12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=728f603… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Wed Oct 10 19:15:10 2012 +0200 core: disable build of DNSSEC (patch from Marius) --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 2b7f332..039ca33 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1751,7 +1751,7 @@ ifeq ($(OS), linux) LIBS+=-lpthread endif endif - ifeq (,$(findstring -DUSE_DNSSEC, $(C_DEFS))) + ifneq (,$(findstring -DUSE_DNSSEC, $(C_DEFS))) LIBS+=-lval-threads -lcrypto -lsres -lpthread $(info "using libval for DNSSEC validation") endif

1 0

git:master: modules/msrp: Updated typo in MSRP example
by Peter Dunkley 10 Oct '12

10 Oct '12

Module: sip-router Branch: master Commit: 98ceaec93a6c69399ea4bfcf47a82e01610d848e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98ceaec… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 10 18:00:51 2012 +0100 modules/msrp: Updated typo in MSRP example --- modules/msrp/README | 2 +- modules/msrp/doc/msrp_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/msrp/README b/modules/msrp/README index 9c38ffc..c73dac9 100644 --- a/modules/msrp/README +++ b/modules/msrp/README @@ -397,7 +397,7 @@ loadmodule "xlog.so" # ----- mi_fifo params ----- modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("htable", "htable", "c=>size=8;autoexpire=1800;") +modparam("htable", "htable", "msrp=>size=8;autoexpire=1800;") request_route { sl_send_reply("403", "No SIP Here"); diff --git a/modules/msrp/doc/msrp_admin.xml b/modules/msrp/doc/msrp_admin.xml index 7b42342..6e828e2 100644 --- a/modules/msrp/doc/msrp_admin.xml +++ b/modules/msrp/doc/msrp_admin.xml @@ -442,7 +442,7 @@ loadmodule "xlog.so" # ----- mi_fifo params ----- modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("htable", "htable", "c=>size=8;autoexpire=1800;") +modparam("htable", "htable", "msrp=>size=8;autoexpire=1800;") request_route { sl_send_reply("403", "No SIP Here");

1 0

git:master: modules/msrp: From-Path: not updated correctly in msrp_relay()
by Peter Dunkley 10 Oct '12

10 Oct '12

Module: sip-router Branch: master Commit: d9c2638bd27c50a7cba4a96ee7b5592d05f39c90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9c2638… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 10 16:15:32 2012 +0100 modules/msrp: From-Path: not updated correctly in msrp_relay() - When the last To-Path-URI is pre-pended to the From-Path: header the first two characters of "From-Path: " are skipped, leaving "om-Path: ". 11 characters should actually be skipped. --- modules/msrp/msrp_netio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/msrp/msrp_netio.c b/modules/msrp/msrp_netio.c index e636df3..3c12355 100644 --- a/modules/msrp/msrp_netio.c +++ b/modules/msrp/msrp_netio.c @@ -108,8 +108,8 @@ int msrp_relay(msrp_frame_t *mf) memcpy(p, tpath->body.s, l + 1 - tpath->body.s); p += l + 1 - tpath->body.s; - memcpy(p, fpath->name.s + 2, mf->buf.s + mf->buf.len - fpath->name.s - 2); - p += mf->buf.s + mf->buf.len - fpath->name.s - 2; + 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; env = msrp_get_env();

1 0

XCAP
by Olle E. Johansson 10 Oct '12

10 Oct '12

Is there a reason why we don't save the XML media tag (Content-type) for XCAP documents? Aren't we supposed to reuse the media tags in a GET operation? I see that I can add AUIDs, but not URNs or Media tags for these application usages. ...learning SIMPLE isn't simple... :-) /O

2 3

Segmentation fault when MSRP frame is received
by Peter Dunkley 10 Oct '12

10 Oct '12

Hi, I've been trying to get MSRP working with the code in git master. I get a segmentation fault when I send in an MSRP frame. The frame I am using is the example from the module README: MSRP 6aef SEND To-Path: msrps://a.example.org:9000/kjfjan;tcp msrps://b.example.net:9000/aeiug;tcp msrps://bob.example.net:8145/foo;tcp From-Path: msrps://alice.example.org:7965/bar;tcp Success-Report: yes Byte-Range: 1-*/* Message-ID: 87652 Content-Type: text/plain Hi Bob, I'm about to send you a photo. -------6aef$ I have put this into a text file (with \r\n line endings) and am using nc to feed it into Kamailio. My MSRP event_route[] is also copied directly from the module README. This is the back-trace from GDB: Program terminated with signal 11, Segmentation fault. #0 0x00007f604f6dfd00 in pv_get_msrp (msg=0x7f604f8e7700, param=0x7f60573cb1f0, res=0x7fffed403b90) at msrp_vars.c:269 269 return pv_get_uintval(msg, param, res, sar->size-1); (gdb) bt #0 0x00007f604f6dfd00 in pv_get_msrp (msg=0x7f604f8e7700, param=0x7f60573cb1f0, res=0x7fffed403b90) at msrp_vars.c:269 #1 0x000000000048a6ca in pv_get_spec_value (msg=0x7f604f8e7700, sp=0x7f60573cb1d8, value=0x7fffed403b90) at pvapi.c:1233 #2 0x00000000004b7bf0 in rval_get_int (h=0x7fffed404a10, msg=<value optimized out>, i=0x7fffed403e5c, rv=<value optimized out>, cache=<value optimized out>) at rvalue.c:974 #3 0x00000000004bc22c in rval_expr_eval_int (h=0x7fffed404a10, msg=0x7f604f8e7700, res=0x7fffed403e5c, rve=0x7f60573cb1c8) at rvalue.c:1914 #4 0x00000000004bc3a9 in rval_expr_eval_int (h=0x7fffed404a10, msg=0x7f604f8e7700, res=0x7fffed4042b8, rve=0x7f60573cbf68) at rvalue.c:1947 #5 0x0000000000415f4c in do_action (h=0x7fffed404a10, a=0x7f60573cd6d8, msg=0x7f604f8e7700) at action.c:1123 #6 0x000000000041c586 in run_actions (h=0x7fffed404a10, a=0x7f60573cd6d8, msg=0x7f604f8e7700) at action.c:1646 #7 0x0000000000415fa3 in do_action (h=0x7fffed404a10, a=0x7f60573d1e88, msg=0x7f604f8e7700) at action.c:1142 #8 0x000000000041c586 in run_actions (h=0x7fffed404a10, a=0x7f60573ba538, msg=0x7f604f8e7700) at action.c:1646 #9 0x000000000041cbc0 in run_top_route (a=0x7f60573ba538, msg=0x7f604f8e7700, c=<value optimized out>) at action.c:1731 #10 0x00007f604f6d769e in msrp_frame_received (data=<value optimized out>) at msrp_mod.c:377 #11 0x0000000000512d49 in msrp_process_msg ( tcpbuf=0x7f6050576a28 "MSRP 6aef SEND\r\nTo-Path: msrps://a.example.org:9000/kjfjan;tcp msrps://b.example.net:9000/aeiug;tcp msrps://bob.example.net:8145/foo;tcp\r\nFrom-Path: msrps://alice.example.org:7965/bar;tcp\r\nSuccess-Rep"..., len=330, rcv_info=0x7f6050576758, con=0x7f6050576740) at tcp_read.c:1010 #12 0x00000000005176df in tcp_read_req (con=0x7f6050576740, bytes_read=0x7fffed404d98, read_flags=0x7fffed404d94) at tcp_read.c:1380 #13 0x0000000000519630 in handle_io (fm=<value optimized out>, events=<value optimized out>, idx=<value optimized out>) at tcp_read.c:1552 #14 0x000000000051bae9 in io_wait_loop_epoll (unix_sock=<value optimized out>) at io_wait.h:1092 #15 tcp_receive_loop (unix_sock=<value optimized out>) at tcp_read.c:1721 #16 0x00000000004ec0eb in tcp_init_children () at tcp_main.c:4953 #17 0x0000000000466789 in main_loop () at main.c:1722 #18 0x000000000046819c in main (argc=<value optimized out>, argv=<value optimized out>) at main.c:2563 Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

4 5

← Newer
1
...
16
17
18
19
20
21
22
...
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