sr-dev December 2013

sr-dev@lists.kamailio.org

30 participants
319 discussions

git:master: pkg/kamailio/deb: Add dnssec module ( jessie only )
by Victor Seva 03 Dec '13

03 Dec '13

Module: sip-router Branch: master Commit: 50b1c3a52c150201a563060cd1059a49ada89af2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50b1c3a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Dec 3 16:11:00 2013 +0100 pkg/kamailio/deb: Add dnssec module ( jessie only ) --- pkg/kamailio/deb/debian/control | 13 +++++++++++++ pkg/kamailio/deb/debian/rules | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 4434be9..8271807 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -37,6 +37,7 @@ Build-Depends: bison, libxml2-dev, libxmlrpc-c3-dev, libunistring-dev, + libval-dev, python, python-dev, unixodbc-dev, @@ -56,6 +57,7 @@ Suggests: kamailio-autheph-modules, kamailio-carrierroute-modules, kamailio-cpl-modules, kamailio-dbg, + kamailio-dnssec-modules, kamailio-java-modules, kamailio-ldap-modules, kamailio-lua-modules, @@ -501,3 +503,14 @@ Description: contains the app_java module . This package provides the app_java module, an extension allowing to execute embedded Java applications within configuration file. + +Package: kamailio-dnssec-modules +Architecture: any +Depends: kamailio (= ${Source-Version}), + ${shlibs:Depends} +Description: contains the dnssec module + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the dnssec module for Kamailio. diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 777de78..25b9656 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -43,7 +43,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python geoip \ redis sqlite json mono ims outbound websocket \ - autheph sctp java + autheph sctp java dnssec # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) LIBDIR ?= lib

1 0

git:master: pkg/kamailio/deb: update changelog using version 4.2.0~dev0
by Victor Seva 03 Dec '13

03 Dec '13

Module: sip-router Branch: master Commit: 419964e1e778c9a3d4c8e46d57e374b576949047 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=419964e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Dec 3 15:55:21 2013 +0100 pkg/kamailio/deb: update changelog using version 4.2.0~dev0 --- pkg/kamailio/deb/debian/changelog | 9 +++++++++ pkg/kamailio/deb/wheezy/changelog | 9 +++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 0ecda02..22c35bd 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,12 @@ +kamailio (4.2.0~dev0) unstable; urgency=low + + * Added packages: + - kamailio-autheph-modules + - kamailio-sctp-modules + - kamailio-java-modules + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 03 Dec 2013 14:26:58 +0100 + kamailio (4.0.0) unstable; urgency=low * update to 4.0.0 from upstream diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 0ecda02..22c35bd 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,12 @@ +kamailio (4.2.0~dev0) unstable; urgency=low + + * Added packages: + - kamailio-autheph-modules + - kamailio-sctp-modules + - kamailio-java-modules + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 03 Dec 2013 14:26:58 +0100 + kamailio (4.0.0) unstable; urgency=low * update to 4.0.0 from upstream

1 0

git:master: pkg/kamailio/deb: add new modules app_java, autheph, sctp
by Victor Seva 03 Dec '13

03 Dec '13

Module: sip-router Branch: master Commit: 450d7ecb49a64e71dd28273b470911bd933bc209 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=450d7ec… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Dec 3 15:51:41 2013 +0100 pkg/kamailio/deb: add new modules app_java, autheph, sctp --- pkg/kamailio/deb/debian/control | 41 ++++++++++++++++++++++++++++++++++++++- pkg/kamailio/deb/debian/rules | 3 +- pkg/kamailio/deb/wheezy/control | 41 ++++++++++++++++++++++++++++++++++++++- pkg/kamailio/deb/wheezy/rules | 3 +- 4 files changed, 84 insertions(+), 4 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 96ad26e..4434be9 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> Build-Depends: bison, debhelper (>= 5), + default-jdk, docbook-xml, dpatch, dpkg-dev (>= 1.13.19), @@ -29,6 +30,7 @@ Build-Depends: bison, libradiusclient-ng-dev, libreadline-dev, libsasl2-dev, + libsctp-dev, libsnmp-dev, libsqlite3-dev, libssl-dev, @@ -49,10 +51,12 @@ Depends: adduser, ${misc:Depends}, ${shlibs:Depends} Conflicts: kamailio-regex-modules -Suggests: kamailio-berkeley-modules, +Suggests: kamailio-autheph-modules, + kamailio-berkeley-modules, kamailio-carrierroute-modules, kamailio-cpl-modules, kamailio-dbg, + kamailio-java-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-mono-modules, @@ -62,6 +66,7 @@ Suggests: kamailio-berkeley-modules, kamailio-presence-modules, kamailio-python-modules, kamailio-radius-modules, + kamailio-sctp-modules, kamailio-snmpstats-modules, kamailio-tls-modules, kamailio-unixodbc-modules, @@ -462,3 +467,37 @@ Description: Kamailio - Websocket Module . This package contains the module implementing WebSocket transport layer. +Package: kamailio-autheph-modules +Architecture: any +Depends: kamailio (= ${binary:Version}), + ${shlibs:Depends} +Description: authentication using ephemeral credentials module for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the ephemeral module for Kamailio. + +Package: kamailio-sctp-modules +Architecture: any +Depends: kamailio (= ${binary:Version}), + ${shlibs:Depends} +Description: authentication using ephemeral credentials module for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the sctp module for Kamailio. + +Package: kamailio-java-modules +Architecture: any +Depends: kamailio (= ${Source-Version}), + default-jre, + ${shlibs:Depends} +Description: contains the app_java module + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the app_java module, an extension allowing to + execute embedded Java applications within configuration file. diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 2223f12..777de78 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -42,7 +42,8 @@ MODULES_SP= PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ snmpstats carrierroute xmpp cpl lua python geoip \ - redis sqlite json mono ims outbound websocket + redis sqlite json mono ims outbound websocket \ + autheph sctp java # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) LIBDIR ?= lib diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index ce58700..319dcb3 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> Build-Depends: bison, debhelper (>= 5), + default-jdk, docbook-xml, dpatch, dpkg-dev (>= 1.13.19), @@ -28,6 +29,7 @@ Build-Depends: bison, libradiusclient-ng-dev, libreadline-dev, libsasl2-dev, + libsctp-dev, libsnmp-dev, libsqlite3-dev, libssl-dev, @@ -48,10 +50,12 @@ Depends: adduser, ${misc:Depends}, ${shlibs:Depends} Conflicts: kamailio-regex-modules -Suggests: kamailio-berkeley-modules, +Suggests: kamailio-autheph-modules, + kamailio-berkeley-modules, kamailio-carrierroute-modules, kamailio-cpl-modules, kamailio-dbg, + kamailio-java-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-mono-modules, @@ -61,6 +65,7 @@ Suggests: kamailio-berkeley-modules, kamailio-presence-modules, kamailio-python-modules, kamailio-radius-modules, + kamailio-sctp-modules, kamailio-snmpstats-modules, kamailio-tls-modules, kamailio-unixodbc-modules, @@ -448,3 +453,37 @@ Description: Kamailio - Websocket Module . This package contains the module implementing WebSocket transport layer. +Package: kamailio-autheph-modules +Architecture: any +Depends: kamailio (= ${binary:Version}), + ${shlibs:Depends} +Description: authentication using ephemeral credentials module for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the ephemeral module for Kamailio. + +Package: kamailio-sctp-modules +Architecture: any +Depends: kamailio (= ${binary:Version}), + ${shlibs:Depends} +Description: authentication using ephemeral credentials module for Kamailio + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the sctp module for Kamailio. + +Package: kamailio-java-modules +Architecture: any +Depends: kamailio (= ${Source-Version}), + default-jre, + ${shlibs:Depends} +Description: contains the app_java module + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package provides the app_java module, an extension allowing to + execute embedded Java applications within configuration file. diff --git a/pkg/kamailio/deb/wheezy/rules b/pkg/kamailio/deb/wheezy/rules index 1c3587d..6709a72 100755 --- a/pkg/kamailio/deb/wheezy/rules +++ b/pkg/kamailio/deb/wheezy/rules @@ -42,7 +42,8 @@ MODULES_SP= PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils lua memcached tls \ snmpstats carrierroute xmpp cpl redis python geoip \ - sqlite json mono ims outbound websocket + sqlite json mono ims outbound websocket \ + autheph sctp java # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) LIBDIR ?= lib

1 0

git:master: pkg/kamailio/deb/debian: fix mono deps
by Victor Seva 03 Dec '13

03 Dec '13

Module: sip-router Branch: master Commit: f17c51fe48149a6b7634cee2e36ee463e1ee9fef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f17c51f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Dec 3 16:42:06 2013 +0100 pkg/kamailio/deb/debian: fix mono deps --- pkg/kamailio/deb/debian/control | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 45784f1..96ad26e 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -19,7 +19,7 @@ Build-Depends: bison, libldap2-dev, liblua5.1-0-dev, libmemcached-dev, - libmono-dev, + libmono-2.0-dev, libmysqlclient-dev, libncurses5-dev, libpcre3-dev,

1 0

[tracker] Comment added: Segfault in 4.1 when cannot reverse resolve
by sip-router 03 Dec '13

03 Dec '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#375 - Segfault in 4.1 when cannot reverse resolve User who did this - Daniel-Constantin Mierla (miconda) ---------- Being at startup, probably this happens before the counters are initialized. I will check it. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=375#comment1198 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

Re: [sr-dev] deb specs for 4.1
by Victor Seva 03 Dec '13

03 Dec '13

Hi there, this is my initial effort to get a new version [0]. This will create 4.2.0~dev0 packages for wheezy and jessie at master branch. I've just removed the older releases. I will maintain only this two. If everything is OK I will cherry-pick and create 4.1.0 packages at the 4.1 branch [0] https://github.com/linuxmaniac/kamailio/tree/vseva/deb PD: I've tried to create a personal branch without any luck. Is there any naming restriction on the git repo for that?

2 1

[tracker] Comment added: Segfault in 4.1 when cannot reverse resolve
by sip-router 03 Dec '13

03 Dec '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#375 - Segfault in 4.1 when cannot reverse resolve User who did this - Hugh Waite (hugh.waite) ---------- The config snippit should be: <code> #!substdef "/PRIV_IP_ADDR/10.179.31.235/" #!substdef "/PUBL_IP_ADDR/WW.XX.YY.ZZ/" #!substdef "/HOSTNAME_INT/myhost.example.com/" ... listen=tcp:"PRIV_IP_ADDR":80 advertise "PUBL_IP_ADDR":80 listen=tcp:"PRIV_IP_ADDR":5060 advertise "PUBL_IP_ADDR":5060 listen=udp:"PRIV_IP_ADDR":5060 advertise "PUBL_IP_ADDR":5060 listen=tcp:"PRIV_IP_ADDR":5080 advertise "HOSTNAME_INT":5080 ... </code> The segfault seems to be on the advertised hostname line... ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=375#comment1197 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: Segfault in 4.1 when cannot reverse resolve
by sip-router 03 Dec '13

03 Dec '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Hugh Waite (hugh.waite) Attached to Project - sip-router Summary - Segfault in 4.1 when cannot reverse resolve Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - All Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - A Segfault is occuring on the latest 4.1 during startup when attempting to resolve the address in a 'listen' config directive. It can be generated when running kamailio -c, when the IP address is not resolveable. The problem goes away once the DNS entry is available. <code> #!substdef "/PRIV_IP_ADDR/10.179.31.235/" #!substdef "/PUBL_IP_ADDR/WW.XX.YY.ZZ/" ... listen=tcp:"PRIV_IP_ADDR":80 advertise "PUBL_IP_ADDR":80 ... </code> Backtrace: <code>(gdb) bt full #0 0x0000000000443d81 in counter_inc (name=<value optimized out>) at counters.h:126 No locals. #1 dns_resolvehost (name=<value optimized out>) at dns_cache.c:2602 host = {s = 0x2 <Address 0x2 out of bounds>, len = 4760762} ret = <value optimized out> #2 0x00000000004e5cb7 in new_sock_info (name=<value optimized out>, addr_l=<value optimized out>, port=<value optimized out>, proto=<value optimized out>, usename=<value optimized out>, useport=5080, flags=SI_NONE) at socket_info.c:297 si = 0x7fbe68525690 n = <value optimized out> he = <value optimized out> p = <value optimized out> __FUNCTION__ = "new_sock_info" #3 0x00000000004e6091 in new_sock2list (name=<value optimized out>, addr_l=<value optimized out>, port=<value optimized out>, proto=<value optimized out>, usename=<value optimized out>, useport=<value optimized out>, flags=SI_NONE, list=0x84e6d8) at socket_info.c:727 si = <value optimized out> #4 0x00000000004eb48d in add_listen_advertise_iface (name=0x7fbe685252a0 "10.179.31.235", addr_l=0x0, port=5080, proto=2, usename=0x7fbe685255e0 "edge05-int.crocodilertc.net", useport=5080, flags=SI_NONE) at socket_info.c:805 list = 0x84e6d8 c_proto = 2 a_l = <value optimized out> c_port = <value optimized out> #5 0x00000000005b6e2d in yyparse () at cfg.y:1419 yystate = <value optimized out> yyerrstatus = 0 yyssa = {0, 165, 19, 199, 462, 739, 839, 1014, 1205, 0, 0, 0, 20872, 26926, 32702, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 32702, 0, 20872, 26926, 32702, 0, 0, 0, 0, 0, 21728, 26926, 32702, 0, 26720, 8970, 32767, 0, 1, 0, 0, 0, 26744, 8970, 32767, 0, 21728, 26926, 1, 0, 26752, 8970, 32767, 0, -13839, 64, 0, 0, 26776, 8970, 32767, 0, 8160, 26893, 1, 0, 1, 0, 0, 0, -14645, 64, 0, 0, 27720, 26769, 32702, 0, 8456, 26770, 32702, 0, 27200, 8970, 32767, 0, -25944, 84, 0, 0, 8, 0, 0, 0, 14853, ---Type <return> to continue, or q <return> to quit--- 26783, 32702, 0, 7808, 26826, 32702, 0, 7896, 26826, 32702, 0, 12536, 26770, 32702, 0, -12288, 26925, 32702, 0, 8016, 26706, 32702, 0, -1, -1, 0, 0, -11272, 26769, 32702, 0, 1, 0, 0, 0, -6000, 131, 0, 0, 0, 0, 0, 0, -28656, 245, 0, 0, 27088, 8970, 32767, 0, 0, 0, 0, 0, 8160, 26893, 32702, 0, 1, 0 <repeats 11 times>, 12536, 26770, 32702, 0, 1, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 3152, 21150, 0, 0, -30955, 26893, 32702, 0} yyss = 0x7fff230a6780 yyssp = 0x7fff230a6790 </code> Are the DNS stats counters initialised at this point? More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=375 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

git:master: modules/ims_registrar_scscf: fixed comparison of P-asserted-id and Path header
by Richard Good 03 Dec '13

03 Dec '13

Module: sip-router Branch: master Commit: 120a9aa055c44eef26c1a635ceb75a150a284b56 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=120a9aa… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Dec 3 18:09:30 2013 +0200 modules/ims_registrar_scscf: fixed comparison of P-asserted-id and Path header In can_subscribe_to_reg() we check if the P-Asserted-Identity in the Subscribe is in the Register path header (i.e. is this the P-CSCF subscribing to UE reg-event) This fix changes the comparison to compare P-asserted-id without "sip:" to cater for all compliant path header formats --- modules/ims_registrar_scscf/registrar_notify.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index d5c4bf9..70fcc95 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -198,7 +198,10 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { while (c) { if (c->path.len) { for (i = 0; i < c->path.len - asserted_id.len; i++) - if (strncasecmp(c->path.s + i, asserted_id.s, asserted_id.len) == 0) { + LM_DBG("Path: <%.*s>.\n", + c->path.len, c->path.s); + //we compare the asserted_id without "sip:" to the path + if (strncasecmp(c->path.s + i, asserted_id.s+4, asserted_id.len-4) == 0) { LM_DBG("Identity found in Path <%.*s>\n", c->path.len, c->path.s); ret = CSCF_RETURN_TRUE;

1 0

git:4.1: websocket: Set pointers to NULL when freeing ws connection strcutures
by Hugh Waite 03 Dec '13

03 Dec '13

Module: sip-router Branch: 4.1 Commit: 48a3412afe166f5cbd41a057a22a3333337a2856 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48a3412… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Dec 3 13:00:55 2013 +0000 websocket: Set pointers to NULL when freeing ws connection strcutures - Fixes double free crash FS#364 - Reported by Vitaliy Aleksandrov (cherry picked from commit 95749afb7129e2909b449b79706f0de5d06a3c5d) --- modules/websocket/ws_conn.c | 1 - modules/websocket/ws_frame.c | 51 +++++++++++++++++++++++++------------ modules/websocket/ws_handshake.c | 2 +- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 263b49f..613f14e 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -138,7 +138,6 @@ static inline void _wsconn_rm(ws_connection_t *wsc) update_stat(ws_msrp_current_connections, -1); shm_free(wsc); - wsc = NULL; } void wsconn_destroy(void) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 503722e..a3a4cef 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -232,6 +232,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) pkg_free(send_buf); if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); + frame->wsc = NULL; return -1; } init_dst_from_rcv(&dst, &con->rcv); @@ -243,8 +244,10 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) LM_ERR("removing WebSocket connection\n"); tcpconn_put(con); pkg_free(send_buf); + frame->wsc = NULL; return -1; } + frame->wsc = NULL; } if (dst.proto == PROTO_WS) @@ -297,6 +300,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) update_stat(ws_msrp_failed_connections, 1); if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); + frame->wsc = NULL; tcpconn_put(con); return -1; } @@ -317,11 +321,19 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) return 0; } -static int close_connection(ws_connection_t *wsc, ws_close_type_t type, +static int close_connection(ws_connection_t **p_wsc, ws_close_type_t type, short int status, str reason) { char *data; ws_frame_t frame; + ws_connection_t * wsc = NULL; + int sub_proto = -1; + if (!p_wsc || !(*p_wsc)) + { + LM_ERR("Invalid parameters\n"); + return -1; + } + wsc = *p_wsc; if (wsc->state == WS_S_OPEN) { @@ -342,6 +354,7 @@ static int close_connection(ws_connection_t *wsc, ws_close_type_t type, frame.payload_len = reason.len + 2; frame.payload_data = data; frame.wsc = wsc; + sub_proto = wsc->sub_protocol; if (encode_and_send_ws_frame(&frame, type == @@ -367,16 +380,20 @@ static int close_connection(ws_connection_t *wsc, ws_close_type_t type, else { update_stat(ws_remote_closed_connections, 1); - if (frame.wsc->sub_protocol == SUB_PROTOCOL_SIP) + if (sub_proto == SUB_PROTOCOL_SIP) update_stat(ws_sip_remote_closed_connections, 1); - else if (frame.wsc->sub_protocol == SUB_PROTOCOL_MSRP) + else if (sub_proto == SUB_PROTOCOL_MSRP) update_stat(ws_msrp_remote_closed_connections, 1); + *p_wsc = NULL; } } else /* if (frame->wsc->state == WS_S_CLOSING) */ + { wsconn_close_now(wsc); + *p_wsc = NULL; + } return 0; } @@ -402,7 +419,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if (len < 2) { LM_WARN("message is too short\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -418,7 +435,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, { LM_WARN("WebSocket fragmentation not supported in the sip " "sub-protocol\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -427,7 +444,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if (frame->rsv1 || frame->rsv2 || frame->rsv3) { LM_WARN("WebSocket reserved fields with non-zero values\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -451,7 +468,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, default: LM_WARN("unsupported opcode: 0x%x\n", (unsigned char) frame->opcode); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1008, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1008, str_status_unsupported_opcode) < 0) LM_ERR("closing connection\n"); return -1; @@ -461,7 +478,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, { LM_WARN("this is a server - all received messages must be " "masked\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -474,7 +491,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if (len < 4) { LM_WARN("message is too short\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -489,7 +506,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, if (len < 10) { LM_WARN("message is too short\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -500,7 +517,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, || (buf[4] & 0xff) != 0 || (buf[5] & 0xff) != 0) { LM_WARN("message is too long\n"); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1009, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1009, str_status_message_too_big) < 0) LM_ERR("closing connection\n"); return -1; @@ -528,7 +545,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, { LM_WARN("message not complete frame size %u but received %u\n", frame->payload_len + mask_start + 4, len); - if (close_connection(frame->wsc, LOCAL_CLOSE, 1002, + if (close_connection(&frame->wsc, LOCAL_CLOSE, 1002, str_status_protocol_error) < 0) LM_ERR("closing connection\n"); return -1; @@ -564,7 +581,7 @@ static int handle_close(ws_frame_t *frame) LM_DBG("Rx Close: %hu %.*s\n", code, reason.len, reason.s); - if (close_connection(frame->wsc, + if (close_connection(&frame->wsc, frame->wsc->state == WS_S_OPEN ? REMOTE_CLOSE : LOCAL_CLOSE, 1000, str_status_normal_closure) < 0) { @@ -758,7 +775,7 @@ struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) str_status_bad_param.len); } - if (close_connection(wsc, LOCAL_CLOSE, 1000, + if (close_connection(&wsc, LOCAL_CLOSE, 1000, str_status_normal_closure) < 0) { LM_WARN("closing connection\n"); @@ -861,7 +878,7 @@ int ws_close(sip_msg_t *msg) return -1; } - return (close_connection(wsc, LOCAL_CLOSE, 1000, + return (close_connection(&wsc, LOCAL_CLOSE, 1000, str_status_normal_closure) == 0) ? 1: 0; } @@ -886,7 +903,7 @@ int ws_close2(sip_msg_t *msg, char *_status, char *_reason) return -1; } - return (close_connection(wsc, LOCAL_CLOSE, status, reason) == 0) ? 1: 0; + return (close_connection(&wsc, LOCAL_CLOSE, status, reason) == 0) ? 1: 0; } int ws_close3(sip_msg_t *msg, char *_status, char *_reason, char *_con) @@ -916,5 +933,5 @@ int ws_close3(sip_msg_t *msg, char *_status, char *_reason, char *_con) return -1; } - return (close_connection(wsc, LOCAL_CLOSE, status, reason) == 0) ? 1: 0; + return (close_connection(&wsc, LOCAL_CLOSE, status, reason) == 0) ? 1: 0; } diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 1ca6fe1..c4e3143 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -122,7 +122,7 @@ int ws_handle_handshake(struct sip_msg *msg) str key = {0, 0}, headers = {0, 0}, reply_key = {0, 0}, origin = {0, 0}; unsigned char sha1[SHA_DIGEST_LENGTH]; unsigned int hdr_flags = 0, sub_protocol = 0; - int version; + int version = 0; struct hdr_field *hdr = msg->headers; struct tcp_connection *con; ws_connection_t *wsc;

1 0

← Newer
1
...
25
26
27
28
29
30
31
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2013