sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
250 discussions

Start a nNew thread

Broken link to xmpp at Kamailio (OpenSER) Documentation Factory
by Auro Tripathy 25 Jun '12

25 Jun '12

http://www.kamailio.org/docs/modules/devel/xmpp.html

2 2

[tracker] Comment added: siputils module. Adding the function: get_uri_param
by sip-router 25 Jun '12

25 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#238 - siputils module. Adding the function: get_uri_param User who did this - Luis Martin (lmartin) ---------- uri_param_2() modifications are just white-spacing indents (emacs tabs). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=238#comment699 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: siputils module. Adding the function: get_uri_param
by sip-router 25 Jun '12

25 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#238 - siputils module. Adding the function: get_uri_param User who did this - Daniel-Constantin Mierla (miconda) ---------- For sake of full set of functions, the function can be added. But the parameters' values can be received via {param.value,...} transformation: http://www.kamailio.org/wiki/cookbooks/3.3.x/transformations#paramvalue_name In the patch I see the function uri_param_2() is touched a lot, is only white-space indenting change? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=238#comment698 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: siputils module. Adding the function: get_uri_param (Attachment added)
by sip-router 25 Jun '12

25 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Luis Martin (lmartin) Attached to Project - sip-router Summary - siputils module. Adding the function: get_uri_param Task Type - Improvement Category - tools/scripts Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 3.3 Due in Version - Undecided Due Date - Undecided Details - This patch affects the 'siputils' module. http://kamailio.org/docs/modules/stable/modules_k/siputils.html This patch affects to the files: kamailio/modules_k/siputils/siputils.c kamailio/modules_k/siputils/checks.c kamailio/modules_k/siputils/checks.h Among the functions that 'siputils' provides, we have: 4.5. uri_param(param) http://kamailio.org/docs/modules/stable/modules_k/siputils.html#id2531859 4.6. uri_param(param,value) http://kamailio.org/docs/modules/stable/modules_k/siputils.html#id2539159 4.7. add_uri_param(param) http://kamailio.org/docs/modules/stable/modules_k/siputils.html#id2534537 What if I want the value back from a given "param" within the URI? This is what this patch does. It adds a function called 'get_uri_param': get_uri_param(struct sip_msg* _msg, char* _param, char* _value) Returns > 0 if _param if found and _value will have its associated value. Returns < 0 if _param is not found. Example (kamailio.cfg): loadmodule "siputils.so" (...) $var(value) = ""; if(get_uri_param("grp","$var(value)")) { xlog("L_INFO", "-----------------------------\n"); xlog("L_INFO", "This gives you the value of grp!\n"); xlog("L_INFO", "grp detected: \"$var(value)\"\n"); xlog("L_INFO", "-----------------------------\n"); } else { xlog("L_INFO", "no grp detected\n" ); } If the URI is like: sip:1234@192.168.20.10;option=test2;grp=test The code below will output: 'This gives you the value of grp!' 'grp detected: "test"' Hope it helps, Luis Martin Gil One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=238 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

Presence_profile documentation
by Olle E. Johansson 25 Jun '12

25 Jun '12

http://kamailio.org/docs/modules/3.3.x/modules_k/presence_profile.html From reading this documentation I can't figure out anything on how to use this great and cool (I hope) new module. I suggest that the author not only correct the spelling of his name (because I don't believe the HTML representation is correct) but also give some usage examples. Add some examples on how to update the presence status, the model for usage and configuration issues. I think UA-config is important, so we might as well add a bit of information from the RFC to educate our users. Thanks for adding this module! /O

3 2

git:master: dispatcher(k): allow set id 0 for OPTIONS callback
by Daniel-Constantin Mierla 25 Jun '12

25 Jun '12

Module: sip-router Branch: master Commit: 2664cb9aa8ffd5d26ef6a0841318ccbcdefbf69b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2664cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 25 10:36:31 2012 +0200 dispatcher(k): allow set id 0 for OPTIONS callback - set id is provided in param pointer address, 0 being equivalent to NULL - reported by Avi Brender --- modules_k/dispatcher/dispatch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index a60401c..7429e97 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -2326,9 +2326,9 @@ static void ds_options_callback( struct cell *t, int type, sip_msg_t *fmsg; int state; - /* The Param does contain the group, in which the failed host + /* The param contains the group, in which the failed host * can be found.*/ - if (!*ps->param) + if (ps->param==NULL) { LM_DBG("No parameter provided, OPTIONS-Request was finished" " with code %d\n", ps->code);

1 0

git:pd/websocket: modules/websocket: Fixed a couple of connection issues and now dropping received SIP requests into receive_msg ()
by Peter Dunkley 25 Jun '12

25 Jun '12

Module: sip-router Branch: pd/websocket Commit: 5c4133c2ba036776a1ea3c1f73c51a7d9d518fbe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c4133c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 17:37:25 2012 +0100 modules/websocket: Fixed a couple of connection issues and now dropping received SIP requests into receive_msg() - SIP parser not updated for WS and WSS yet --- modules/websocket/ws_conn.c | 23 ++++++---- modules/websocket/ws_frame.c | 88 +++++++++++++------------------------ modules/websocket/ws_handshake.c | 11 +++-- 3 files changed, 51 insertions(+), 71 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5c4…

3 2

git:pd/websocket: modules/websocket: improvements to ws.dump MI command
by Peter Dunkley 23 Jun '12

23 Jun '12

Module: sip-router Branch: pd/websocket Commit: c270ac0e54ada9cc2599b21f8c87b5a0704093af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c270ac0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 24 00:40:24 2012 +0100 modules/websocket: improvements to ws.dump MI command --- modules/websocket/ws_conn.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 664750f..e2795a0 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -369,25 +369,27 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) { if (node->value.s == NULL || node->value.len == 0) { - LM_ERR("empty display order parameter\n"); + LM_WARN("empty display order parameter\n"); return init_mi_tree(400, str_status_empty_param.s, str_status_empty_param.len); } strlower(&node->value); - if (strncmp(node->value.s, "id", 2) == 0) + if (strncmp(node->value.s, "id_hash", 7) == 0) order = 0; - else if (strncmp(node->value.s, "used", 4) == 0) + else if (strncmp(node->value.s, "used_desc", 9) == 0) order = 1; + else if (strncmp(node->value.s, "used_asc", 8) == 0) + order = 2; else { - LM_ERR("bad display order parameter\n"); + LM_WARN("bad display order parameter\n"); return init_mi_tree(400, str_status_bad_param.s, str_status_bad_param.len); } if (node->next != NULL) { - LM_ERR("too many parameters\n"); + LM_WARN("too many parameters\n"); return init_mi_tree(400, str_status_too_many_params.s, str_status_too_many_params.len); } @@ -419,7 +421,7 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) break; } } - else + else if (order == 1) { wsc = wsconn_used_list->head; while (wsc) @@ -437,6 +439,24 @@ struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param) wsc = wsc->used_next; } } + else + { + wsc = wsconn_used_list->tail; + while (wsc) + { + if ((found = add_node(rpl_tree, wsc)) < 0) + return 0; + + connections += found; + if (connections >= MAX_WS_CONNS_DUMP) + { + truncated = 1; + break; + } + + wsc = wsc->used_prev; + } + } WSCONN_UNLOCK; if (addf_mi_node_child(&rpl_tree->node, 0, 0, 0,

1 0

git:pd/websocket: pkg/kamailio/fedora: added WebSocket module to .spec file
by Peter Dunkley 23 Jun '12

23 Jun '12

Module: sip-router Branch: pd/websocket Commit: 6dfd1476bee55dd6287652b1f9ee9a8cf4d809f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dfd147… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 22:13:35 2012 +0100 pkg/kamailio/fedora: added WebSocket module to .spec file --- pkg/kamailio/fedora/16/kamailio.spec | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index ecd9405..c52cc5c 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -25,7 +25,7 @@ Conflicts: kamailio-tls < %ver, kamailio-purple < %ver, kamailio-ldap < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-perl < %ver, kamailio-lua < %ver Conflicts: kamailio-python < %ver, kamailio-regex < %ver Conflicts: kamailio-dialplan < %ver, kamailio-lcr < %ver -Conflicts: kamailio-xmlops < %ver +Conflicts: kamailio-xmlops < %ver, kamailio-websocket < %ver %if 0%{?fedora} Conflicts: kamailio-radius < %ver, kamailio-carrierroute < %ver Conflicts: kamailio-redis < %ver, kamailio-json < %ver @@ -250,6 +250,16 @@ BuildRequires: libxml2-devel XML operation functions for Kamailio. +%package websocket +Summary: WebSocket transport for Kamailio. +Group: System Environment/Daemons +Requires: openssl, libunistring, kamailio = %ver +BuildRequires: openssl-devel, libunistring-devel + +%description websocket +WebSocket transport for Kamailio. + + %package purple Summary: Multi-protocol IM and presence gateway module. Group: System Environment/Daemons @@ -343,14 +353,14 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ - xmlops" + xmlops websocket" %else make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ klcr ksqlite kberkeley" include_modules="xmlrpc\ - xmlops" + xmlops websocket" %endif @@ -365,7 +375,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\ klcr ksqlite kredis kjson kmono kberkeley" include_modules="xmlrpc\ - xmlops" + xmlops websocket" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \ @@ -380,7 +390,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\ kcpl ksnmpstats kpresence kregex kdialplan\ klcr ksqlite kberkeley" include_modules="xmlrpc\ - xmlops" + xmlops websocket" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ @@ -893,6 +903,12 @@ fi %{_libdir}/kamailio/modules/xmlops.so +%files websocket +%defattr(-,root,root) +#%doc %{_docdir}/kamailio/modules/README.websocket +%{_libdir}/kamailio/modules/websocket.so + + %if 0%{?fedora} %files radius %defattr(-,root,root) @@ -941,6 +957,8 @@ fi %changelog +* Sat Jun 23 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Added websocket module * Mon Jun 11 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Updated ver to 3.4.0 and rel to dev0 * Mon Jun 4 2012 Peter Dunkley <peter(a)dunkley.me.uk>

1 0

git:pd/websocket: parser: Update Via parsing state-machine to support WS and WSS
by Peter Dunkley 23 Jun '12

23 Jun '12

Module: sip-router Branch: pd/websocket Commit: 7cd27114725b49864b6be812658aa00003c54e99 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7cd2711… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 21:57:09 2012 +0100 parser: Update Via parsing state-machine to support WS and WSS --- parser/parse_via.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/parser/parse_via.c b/parser/parse_via.c index 48ef466..69756bc 100644 --- a/parser/parse_via.c +++ b/parser/parse_via.c @@ -97,6 +97,7 @@ enum { TCP_TLS1, TCP2, FIN_TCP, TLS2, FIN_TLS, SCTP1, SCTP2, SCTP3, FIN_SCTP, + WS_WSS1, WS_WSS2, FIN_WSS, OTHER_PROTO, L_PROTO, F_PROTO }; @@ -1370,6 +1371,18 @@ parse_again: vb->proto=PROTO_SCTP; state=F_HOST; /* start looking for host*/ goto main_via; + case WS_WSS2: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_TCP; + state=F_HOST; /* start looking for host*/ + goto main_via; + case FIN_WSS: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_TLS; + state=F_HOST; /* start looking for host*/ + goto main_via; case OTHER_PROTO: /* finished proto parsing */ vb->transport.len=tmp-vb->transport.s; @@ -1384,6 +1397,7 @@ parse_again: case SCTP1: case SCTP2: case SCTP3: + case WS_WSS1: /* finished proto parsing */ vb->transport.len=tmp-vb->transport.s; vb->proto=PROTO_OTHER; @@ -1443,6 +1457,20 @@ parse_again: state=F_LF; saved_state=F_HOST; /* start looking for host*/ goto main_via; + case WS_WSS2: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_TCP; + state=F_LF; + saved_state=F_HOST; /* start looking for host*/ + goto main_via; + case FIN_WSS: + /* finished proto parsing */ + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_TLS; + state=F_LF; + saved_state=F_HOST; /* start looking for host*/ + goto main_via; case OTHER_PROTO: /* finished proto parsing */ vb->transport.len=tmp-vb->transport.s; @@ -1458,6 +1486,7 @@ parse_again: case SCTP1: case SCTP2: case SCTP3: + case WS_WSS1: /* finished proto parsing */ vb->transport.len=tmp-vb->transport.s; vb->proto=PROTO_OTHER; @@ -1521,6 +1550,18 @@ parse_again: state=F_CR; saved_state=F_HOST; goto main_via; + case WS_WSS2: + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_TCP; + state=F_CR; + saved_state=F_HOST; + goto main_via; + case FIN_WSS: + vb->transport.len=tmp-vb->transport.s; + vb->proto=PROTO_TLS; + state=F_CR; + saved_state=F_HOST; + goto main_via; case OTHER_PROTO: vb->transport.len=tmp-vb->transport.s; vb->proto=PROTO_OTHER; @@ -1535,6 +1576,7 @@ parse_again: case SCTP1: case SCTP2: case SCTP3: + case WS_WSS1: /* finished proto parsing */ vb->transport.len=tmp-vb->transport.s; vb->proto=PROTO_OTHER; @@ -1596,6 +1638,12 @@ parse_again: case TLS2: state=FIN_TLS; break; + case WS_WSS1: + state=WS_WSS2; + break; + case WS_WSS2: + state=FIN_WSS; + break; case F_PROTO: state=SCTP1; vb->transport.s=tmp; @@ -1612,6 +1660,7 @@ parse_again: case SCTP1: case SCTP2: case SCTP3: + case FIN_WSS: case FIN_SCTP: state=OTHER_PROTO; break; @@ -1641,6 +1690,9 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1676,6 +1728,9 @@ parse_again: case SCTP1: case SCTP2: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1705,6 +1760,9 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1732,6 +1790,9 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1763,6 +1824,9 @@ parse_again: case SCTP1: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1792,6 +1856,9 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1819,6 +1886,41 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: + state=OTHER_PROTO; + break; + default: + LOG(L_ERR, "ERROR: parse_via: bad char <%c> on" + " state %d\n", *tmp, state); + goto error; + } + break; + case 'W': + case 'w': + switch(state){ + case F_PROTO: + state=WS_WSS1; + vb->transport.s=tmp; + break; + case OTHER_PROTO: + break; + case UDP1: + case UDP2: + case FIN_UDP: + case TCP_TLS1: + case TCP2: + case FIN_TCP: + case TLS2: + case FIN_TLS: + case SCTP1: + case SCTP2: + case SCTP3: + case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1848,6 +1950,9 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1875,6 +1980,9 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1902,6 +2010,9 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default: @@ -1930,6 +2041,9 @@ parse_again: case SCTP2: case SCTP3: case FIN_SCTP: + case WS_WSS1: + case WS_WSS2: + case FIN_WSS: state=OTHER_PROTO; break; default:

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 June 2012