sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:4.0: modules/websocket: Fix pkg memory leaks
by Hugh Waite 30 Sep '13

30 Sep '13

Module: sip-router Branch: 4.0 Commit: 76319cf9600b71364e3cd6509f61da2f60b2f10f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76319cf… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Jul 3 10:46:44 2013 +0100 modules/websocket: Fix pkg memory leaks - Fix pkg memory leaks in error cases - Fix incorrect memory allocation size for ws connections - Fix typo in websocket stats (cherry picked from commit d0f88e19577d9b914922f83049075b7786f3d8df) --- modules/websocket/ws_conn.c | 4 ++-- modules/websocket/ws_frame.c | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 0adde39..9f9069f 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -90,7 +90,7 @@ int wsconn_init(void) wsconn_id_hash = (ws_connection_t **) shm_malloc(TCP_ID_HASH_SIZE * - sizeof(ws_connection_t)); + sizeof(ws_connection_t*)); if (wsconn_id_hash == NULL) { LM_ERR("allocating WebSocket hash-table\n"); @@ -364,7 +364,7 @@ static int add_node(struct mi_root *tree, ws_connection_t *wsc) dst_proto = (con->rcv.proto == PROTO_WS) ? "ws" : "wss"; memset(dst_ip, 0, IP6_MAX_STR_SIZE + 1); - ip_addr2sbuf(&con->rcv.dst_ip, src_ip, IP6_MAX_STR_SIZE); + ip_addr2sbuf(&con->rcv.dst_ip, dst_ip, IP6_MAX_STR_SIZE); pong = wsc->awaiting_pong ? "awaiting Pong, " : ""; diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index ad26103..e54a830 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -219,6 +219,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) if ((con = tcpconn_get(frame->wsc->id, 0, 0, 0, 0)) == NULL) { LM_WARN("TCP/TLS connection get failed\n"); + pkg_free(send_buf); if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); return -1; @@ -230,6 +231,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) { LM_ERR("removing WebSocket connection\n"); + pkg_free(send_buf); return -1; } } @@ -240,6 +242,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) { STATS_TX_DROPS; LM_WARN("TCP disabled\n"); + pkg_free(send_buf); return -1; } } @@ -250,6 +253,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) { STATS_TX_DROPS; LM_WARN("TLS disabled\n"); + pkg_free(send_buf); return -1; } } @@ -291,15 +295,15 @@ static int close_connection(ws_connection_t *wsc, ws_close_type_t type, char *data; ws_frame_t frame; - data = pkg_malloc(sizeof(char) * (reason.len + 2)); - if (data == NULL) - { - LM_ERR("allocating pkg memory\n"); - return -1; - } - if (wsc->state == WS_S_OPEN) { + data = pkg_malloc(sizeof(char) * (reason.len + 2)); + if (data == NULL) + { + LM_ERR("allocating pkg memory\n"); + return -1; + } + data[0] = (status & 0xff00) >> 8; data[1] = (status & 0x00ff) >> 0; memcpy(&data[2], reason.s, reason.len);

1 0

git:4.0: modules/tls: Free TLS data for secure websocket connections
by Hugh Waite 30 Sep '13

30 Sep '13

Module: sip-router Branch: 4.0 Commit: 1e774166724e0bdd2c43091b3b19c1b82d197242 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e77416… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Jul 3 10:39:32 2013 +0100 modules/tls: Free TLS data for secure websocket connections (cherry picked from commit 074f12c5a444188aa023797ac70e2d38d225cb18) --- modules/tls/tls_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index e3d0a61..f71956d 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -564,7 +564,7 @@ void tls_h_tcpconn_clean(struct tcp_connection *c) /* * runs within global tcp lock */ - if (c->type != PROTO_TLS) { + if ((c->type != PROTO_TLS) && (c->type != PROTO_WSS)) { BUG("Bad connection structure\n"); abort(); }

1 0

git:4.0: core: Improve tcp stats output
by Hugh Waite 30 Sep '13

30 Sep '13

Module: sip-router Branch: 4.0 Commit: 77a53b8df680808a20c73953f1e5348df5d309d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77a53b8… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Jul 4 09:33:56 2013 +0100 core: Improve tcp stats output - Add connection ref count - Add websocket protocols (cherry picked from commit fb4dc4b7b866239a90a4d6441ed319664697edab) --- core_cmd.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index 9914737..a31d124 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -772,8 +772,12 @@ static void core_tcp_list(rpc_t* rpc, void* c) /* tcp data */ if (con->rcv.proto == PROTO_TCP) type = "TCP"; - else if (con->rcv.proto == PROTO_TCP) + else if (con->rcv.proto == PROTO_TLS) type = "TLS"; + else if (con->rcv.proto == PROTO_WSS) + type = "WSS"; + else if (con->rcv.proto == PROTO_WS) + type = "WS"; else type = "UNKNOWN"; @@ -811,11 +815,12 @@ static void core_tcp_list(rpc_t* rpc, void* c) default: state = "UNKNOWN"; } - rpc->struct_add(handle, "dssdsdsd", + rpc->struct_add(handle, "dssddsdsd", "id", con->id, "type", type, "state", state, "timeout", timeout, + "ref_count", con->refcnt, "src_ip", src_ip, "src_port", con->rcv.src_port, "dst_ip", dst_ip,

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Jason Penton 30 Sep '13

30 Sep '13

Module: sip-router Branch: master Commit: 3c7f8ba5e3febe4dc2c8eec003436492efefdf2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c7f8ba… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Sep 30 11:21:31 2013 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

git:master: modules/tm: extended async usage
by Jason Penton 30 Sep '13

30 Sep '13

Module: sip-router Branch: master Commit: 5ab44c7c2fc78038302bf455ff49e374fc79550b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ab44c7… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Sep 30 11:14:54 2013 +0200 modules/tm: extended async usage - enables resuming of tx in orginal route block tx was suspended, not only failure route - dedicated lock to prevent multiple invocations of suspend on tz (reply lock used to be used) - extra flag (T_ASYNC_CONTINUE) to mark a transaction that is being execute post suspend --- modules/tm/h_table.h | 19 ++++++- modules/tm/lock.c | 36 ++++++++++++- modules/tm/lock.h | 1 + modules/tm/t_fwd.c | 5 ++ modules/tm/t_reply.c | 135 +++++++++++++++++++++++++++-------------------- modules/tm/t_reply.h | 2 +- modules/tm/t_suspend.c | 72 +++++++++++++++---------- modules/tm/t_suspend.h | 3 + 8 files changed, 180 insertions(+), 93 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5ab…

1 0

git:master: core: resolve down to A/AAAA records when no naptr records
by Daniel-Constantin Mierla 30 Sep '13

30 Sep '13

Module: sip-router Branch: master Commit: b50888cf447ea3a3315e665c97f71a07bb687337 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b50888c… Author: Øyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 30 11:15:13 2013 +0200 core: resolve down to A/AAAA records when no naptr records - try all protocols, not only UDP --- dns_cache.c | 10 +++++++++- resolve.c | 27 +++++++++++---------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 6db93c1..917b43e 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2830,8 +2830,10 @@ struct hostent* dns_naptr_sip_resolvehost(str* name, unsigned short* port, naptr_bmp_t tried_bmp; struct dns_hash_entry* e; char n_proto; + char origproto; str srv_name; + origproto=*proto; he=0; if (dns_hash==0){ /* not init => use normal, non-cached version */ LOG(L_WARN, "WARNING: dns_sip_resolvehost: called before dns cache" @@ -2872,7 +2874,13 @@ struct hostent* dns_naptr_sip_resolvehost(str* name, unsigned short* port, dns_hash_put(e); } naptr_not_found: - return no_naptr_srv_sip_resolvehost(name,port,proto); + *proto = origproto; + he = no_naptr_srv_sip_resolvehost(name,port,proto); + /* fallback all the way down to A/AAAA */ + if (he==0) { + he=dns_get_he(name,dns_flags); + } + return he; } #endif /* USE_NAPTR */ diff --git a/resolve.c b/resolve.c index be47260..d01ab80 100644 --- a/resolve.c +++ b/resolve.c @@ -1498,20 +1498,7 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch } if (default_order){ for (i=0; i<list_len;i++) { - switch ( srv_proto_list[i].proto) { - case PROTO_UDP: - srv_proto_list[i].proto_pref=4; - break; - case PROTO_TCP: - srv_proto_list[i].proto_pref=3; - break; - case PROTO_TLS: - srv_proto_list[i].proto_pref=2; - break; - case PROTO_SCTP: - srv_proto_list[i].proto_pref=1; - break; - } + srv_proto_list[i].proto_pref=proto_pref_score(i);; } } @@ -1571,6 +1558,9 @@ struct hostent* no_naptr_srv_sip_resolvehost(str* name, unsigned short* port, ch if ((port)&&(*port==0)){ *port=(srv_proto_list[i].proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; /* just in case we don't find another */ } + if ((proto)&&(*proto==0)){ + *proto = PROTO_UDP; + } srv_name.s=tmp_srv; srv_name.len=len; #ifdef USE_DNS_CACHE @@ -1611,9 +1601,9 @@ struct hostent* naptr_sip_resolvehost(str* name, unsigned short* port, char n_proto; str srv_name; naptr_bmp_t tried_bmp; /* tried bitmap */ + char origproto; - - + origproto = *proto; naptr_head=0; he=0; if (name->len >= MAX_DNS_NAME) { @@ -1650,7 +1640,12 @@ struct hostent* naptr_sip_resolvehost(str* name, unsigned short* port, #endif } /* fallback to srv lookup */ + *proto = origproto; he=no_naptr_srv_sip_resolvehost(name,port,proto); + /* fallback all the way down to A/AAAA */ + if (he==0) { + he=dns_get_he(name,dns_flags); + } end: if (naptr_head) free_rdata_list(naptr_head);

1 0

git:master: pkg/kamailio/centos: updates to CentOS 6 build
by Peter Dunkley 27 Sep '13

27 Sep '13

Module: sip-router Branch: master Commit: 6cdae87e29bc4c62651cf843ace680e9a6999d66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6cdae87… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Sat Sep 28 00:30:50 2013 +0100 pkg/kamailio/centos: updates to CentOS 6 build - Improved startup scripts - Updated .spec - README listing and explaining which Kamailio modules are not built for CentOS --- pkg/kamailio/centos/6/README | 29 ++++ pkg/kamailio/centos/6/kamailio.init | 89 ++++++++++--- pkg/kamailio/centos/6/kamailio.spec | 220 ++++++------------------------ pkg/kamailio/centos/6/kamailio.sysconfig | 19 +++- 4 files changed, 162 insertions(+), 195 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6cd…

1 0

git:tmp/ims_charging: ims_charging: added async support
by Carlos Ruiz Diaz 27 Sep '13

27 Sep '13

Module: sip-router Branch: tmp/ims_charging Commit: 32e26c3e914366636e4dcc6e8872eea16740e090 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32e26c3… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Fri Sep 27 16:05:17 2013 -0400 ims_charging: added async support - Ro_ccr is now called asynchronously and resumed on an external custom cfg route - Interim and final CCR are now also async --- modules/ims_charging/ccr.c | 2 +- modules/ims_charging/dialog.c | 12 +- modules/ims_charging/ims_ro.c | 462 ++++++++++++++++++++++++++------------- modules/ims_charging/ims_ro.h | 12 +- modules/ims_charging/mod.c | 63 ++++-- modules/ims_charging/mod.h | 4 + modules/ims_charging/ro_timer.c | 200 ++++++++++------- modules/ims_charging/ro_timer.h | 4 + 8 files changed, 500 insertions(+), 259 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=32e…

1 0

continuous rls related db_mysql errors
by Juha Heinanen 27 Sep '13

27 Sep '13

after upgrading my presence server to latest master, i started to get continuous rls related db_mysql error messages like these Sep 26 10:27:56 siika /usr/sbin/pres-serv[578]: ERROR: db_mysql [km_dbase.c:122]: db_mysql_submit_query(): driver error on query: Lost connection to MySQL server during query Sep 26 10:27:56 siika /usr/sbin/pres-serv[578]: ERROR: <core> [db_query.c:181]: db_do_raw_query(): error while submitting query Sep 26 10:27:56 siika /usr/sbin/pres-serv[578]: ERROR: db_mysql [km_dbase.c:557]: db_mysql_start_transaction(): executing raw_query Sep 26 10:27:56 siika /usr/sbin/pres-serv[578]: ERROR: rls [resource_notify.c:960]: timer_send_full_state_notifies(): in start_transaction i have not made any changes to my config file where i have modparam("rls", "db_mode", 2) -- juha

3 15

git:master: pkg/kamailio/centos: updated .spec for CentOS 6
by Peter Dunkley 26 Sep '13

26 Sep '13

Module: sip-router Branch: master Commit: 257ca31bb89cb4cb74cad226998574469873bc3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=257ca31… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Thu Sep 26 23:59:53 2013 +0100 pkg/kamailio/centos: updated .spec for CentOS 6 - Added gzcompress - Updated rel to dev9 --- pkg/kamailio/centos/6/kamailio.spec | 45 ++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 13 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 023fa80..1b709dc 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 4.1.0 -%define rel dev8.0%{dist} +%define rel dev9.0%{dist} @@ -17,18 +17,18 @@ Vendor: kamailio.org BuildRoot: %{_tmppath}/%{name}-%{ver}-buildroot Conflicts: kamailio-auth-ephemeral < %ver, kamailio-auth-identity < %ver Conflicts: kamailio-bdb < %ver, kamailio-cdp < %ver, kamailio-cdp < %ver -Conflicts: kamailio-dialplan < %ver, kamailio-ims < %ver -Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver -Conflicts: kamailio-mysql < %ver, kamailio-outbound < %ver -Conflicts: kamailio-perl < %ver, kamailio-postgresql < %ver -Conflicts: kamailio-presence < %ver, kamailio-purple < %ver -Conflicts: kamailio-python < %ver, kamailio-regex < %ver -Conflicts: kamailio-sctp < %ver, kamailio-snmpstats < %ver -Conflicts: kamailio-sqlite < %ver, kamailio-tls < %ver -Conflicts: kamailio-unixODBC < %ver, kamailio-utils < %ver -Conflicts: kamailio-websocket < %ver, kamailio-xhttp-pi < %ver -Conflicts: kamailio-xmlops < %ver, kamailio-xmlrpc < %ver -Conflicts: kamailio-xmpp < %ver +Conflicts: kamailio-dialplan < %ver, kamailio-gzcompress < %ver +Conflicts: kamailio-ims < %ver, kamailio-lcr < %ver, kamailio-ldap < %ver +Conflicts: kamailio-lua < %ver, kamailio-mysql < %ver +Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver +Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver +Conflicts: kamailio-purple < %ver, kamailio-python < %ver +Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver +Conflicts: kamailio-snmpstats < %ver, kamailio-sqlite < %ver +Conflicts: kamailio-tls < %ver, kamailio-unixODBC < %ver +Conflicts: kamailio-utils < %ver, kamailio-websocket < %ver +Conflicts: kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver +Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver BuildRequires: bison, flex, gcc, make, redhat-rpm-config %description @@ -104,6 +104,16 @@ BuildRequires: pcre-devel String translations based on rules for Kamailio. +%package gzcompress +Summary: Compressed body (SIP and HTTP) handling for kamailio. +Group: System Environment/Daemons +Requires: zlib, kamailio = %ver +BuildRequires: zlib-devel + +%description gzcompress +Compressed body (SIP and HTTP) handling for kamailio. + + %package ims Summary: IMS modules and extensions module for Kamailio. Group: System Environment/Daemons @@ -730,6 +740,12 @@ fi %{_libdir}/kamailio/modules/dialplan.so +%files gzcompress +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.gzcompress +%{_libdir}/kamailio/modules/gzcompress.so + + %files ims %defattr(-,root,root) %{_libdir}/kamailio/libkamailio_ims.so @@ -967,6 +983,9 @@ fi %changelog +* Thu Sep 26 2013 Peter Dunkley <peter.dunkley(a)crocodilertc.net> + - Updated rel to dev9 + - Added gzcompress module to .spec * Thu Sep 12 2013 Peter Dunkley <peter.dunkley(a)crocodilertc.net> - stun no longer depends on OpenSSL so it has been moved to the standard module set

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013