sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:tmp/ims_charging: Fixed minor typos in ims_charging-documentation

by Carsten Bock

Module: sip-router Branch: tmp/ims_charging Commit: e98012e859ea6dd2c198d650f272d3e489758a22 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e98012e… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 13:30:38 2013 +0200 Fixed minor typos in ims_charging-documentation --- modules/ims_charging/doc/ims_charging_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_charging/doc/ims_charging_admin.xml b/modules/ims_charging/doc/ims_charging_admin.xml index cccfc06..33e72e7 100644 --- a/modules/ims_charging/doc/ims_charging_admin.xml +++ b/modules/ims_charging/doc/ims_charging_admin.xml @@ -45,6 +45,7 @@ <title>External Libraries or Applications</title> <para>This modules requires the internal IMS library.</para> </section> +</section> <section> <title>Understanding Charging in the IP-Multimedia-Subsystem (IMS)</title> <para>Before each service usage, the charging system must be asked for permission (credit authorization). The charging server must make a decision: Either authorize or deny the session. @@ -133,7 +134,6 @@ As a result, we have the following three scenarios: </mediaobject> </section> </section> - </section> <section> <title>Parameters</title> <section>

11 years, 2 months

git:tmp/ims_charging: Regenerated README after documentation update

by Carsten Bock

Module: sip-router Branch: tmp/ims_charging Commit: 1265420b8b700eec9c96fd7752a5c3d528a51c32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1265420… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 13:24:51 2013 +0200 Regenerated README after documentation update --- modules/ims_charging/README | 627 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 627 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=126…

11 years, 2 months

git:tmp/ims_charging: Fixed minor typos in ims_charging-documentation

by Carsten Bock

Module: sip-router Branch: tmp/ims_charging Commit: bcdc27641fbec8176cea19fd4cefad1830a5c4db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcdc276… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 13:23:05 2013 +0200 Fixed minor typos in ims_charging-documentation --- modules/ims_charging/doc/ims_charging_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_charging/doc/ims_charging_admin.xml b/modules/ims_charging/doc/ims_charging_admin.xml index 86dd442..cccfc06 100644 --- a/modules/ims_charging/doc/ims_charging_admin.xml +++ b/modules/ims_charging/doc/ims_charging_admin.xml @@ -117,7 +117,7 @@ As a result, we have the following three scenarios: </itemizedlist> </section> <section> - <title>Online Charging (Ro)</title> + <title>Online Charging (Ro): A practical example</title> <para>But how does it look in reality? Let us make a more practical example:</para> <para>Let us assume we have a subscriber, who has sufficient credit for 75 seconds of talking. The subscriber initiates a call; as we do not know, how long the call will take, we start with requesting credit for 30 seconds (CCR-Request, we could request any duration, e.g. 2 hours, but it would probably block other calls if we reserve all the required credit).</para> <para>The call proceeds, so after 30 seconds we send another CCR-Request with the indication that we used the reserved 30 seconds and that we request another 30 seconds. We reduce the account of the subscriber by 30 seconds, so he has a credit of 45 seconds. Since 45 seconds is more than the requested 30 seconds, this second request can also easily be accepted and another 30 seconds can be granted. After this request, the account is at 45 seconds and we still (or again) have 30 seconds reserved.</para>

11 years, 2 months

git:tmp/ims_charging: Fixed minor typos in ims_charging-documentation

by Carsten Bock

Module: sip-router Branch: tmp/ims_charging Commit: ba0299bd965de8d513d70151c11bf13c4ec11560 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba0299b… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 13:21:04 2013 +0200 Fixed minor typos in ims_charging-documentation --- modules/ims_charging/doc/ims_charging.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/ims_charging/doc/ims_charging.xml b/modules/ims_charging/doc/ims_charging.xml index ed02d9b..9f4ddb4 100644 --- a/modules/ims_charging/doc/ims_charging.xml +++ b/modules/ims_charging/doc/ims_charging.xml @@ -41,6 +41,12 @@ <holder>Smile Communications</holder> </copyright> + <copyright> + <year>2013</year> + + <holder>ng-voice GmbH</holder> + </copyright> + </bookinfo> <toc/>

11 years, 2 months

git:tmp/ims_charging: Fixed minor typos in ims_charging-documentation

by Carsten Bock

Module: sip-router Branch: tmp/ims_charging Commit: e8a054d0e684b8f73bd0733d7d00d5e6b5e9b23f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8a054d… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 13:20:04 2013 +0200 Fixed minor typos in ims_charging-documentation --- modules/ims_charging/doc/ims_charging_admin.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/ims_charging/doc/ims_charging_admin.xml b/modules/ims_charging/doc/ims_charging_admin.xml index b7d2d5a..86dd442 100644 --- a/modules/ims_charging/doc/ims_charging_admin.xml +++ b/modules/ims_charging/doc/ims_charging_admin.xml @@ -48,14 +48,14 @@ <section> <title>Understanding Charging in the IP-Multimedia-Subsystem (IMS)</title> <para>Before each service usage, the charging system must be asked for permission (credit authorization). The charging server must make a decision: Either authorize or deny the session. -For postpaid scenarios this is fairly easy: The charging-server only needs to collect the usage data for processing it at the end of the month. As no realtime account updating is needed, this is often called „offline-charging“. -For prepaid scenarios the charging server needs to know the user's account balance and it will need to update the account in real-time. This is often referred to as „online-charging“. - +For postpaid scenarios this is fairly easy: The charging-server only needs to collect the usage data for processing it at the end of the month. As no realtime account updating is needed, this is often called "offline-charging". +For prepaid scenarios the charging server needs to know the user's account balance and it will need to update the account in real-time. This is often referred to as "online-charging".</para> +<para> Question: What is the double of the Radius? -Answer: It's the Diameter! - -As quite often, we use the Diameter-Protocol to do the Charging in the IMS. And as quite often, IMS uses a huge bunch of acronyms to describe the different interfaces: We call the diameter-interface for offline-charging the „Rf“-interface and the interface for online charging the „Ro“-interface. - +Answer: It's the Diameter!</para> +<para> +As quite often, we use the Diameter-Protocol to do the Charging in the IMS. And as quite often, IMS uses a huge bunch of acronyms to describe the different interfaces: We call the diameter-interface for offline-charging the "Rf"-interface and the interface for online charging the "Ro"-interface.</para> +<para> Each system, that needs this credit authorization, have to be equipped with a proper charging trigger, a so-called charging-trigger-function (CTF) in order to communicate with the charging-server (also called charging-function): </para> <mediaobject>

11 years, 2 months

git:tmp/ims_charging: Fixed minor typos in ims_charging-documentation

by Carsten Bock

Module: sip-router Branch: tmp/ims_charging Commit: 364dc576f602db40e93f446443e278290609237b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=364dc57… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 13:16:20 2013 +0200 Fixed minor typos in ims_charging-documentation --- modules/ims_charging/doc/ims_charging_admin.xml | 883 +++++++++++------------ 1 files changed, 421 insertions(+), 462 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=364…

11 years, 2 months

git:tmp/ims_charging: Documentation updates.

by Carsten Bock

Module: sip-router Branch: tmp/ims_charging Commit: 4af2d9a46f1b7be273c079040989bd0d0c884feb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4af2d9a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 12:58:56 2013 +0200 Documentation updates. --- modules/ims_charging/doc/images/charging1.png | Bin 0 -> 8503 bytes modules/ims_charging/doc/images/charging2.png | Bin 0 -> 80472 bytes modules/ims_charging/doc/ims_charging_admin.xml | 542 ++++++++++++++++++++++- 3 files changed, 522 insertions(+), 20 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4af…

11 years, 2 months

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 565a410cd0ad1d4b21b374c38b3c9e22478d62d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=565a410… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Sep 30 12:31:39 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

11 years, 2 months

git:4.0: modules/websocket: Fix connection leaks

by Hugh Waite

Module: sip-router Branch: 4.0 Commit: a7e7d9277f503ab42055b4b3be130e3f4a6fcae1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7e7d92… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Mon Sep 30 10:44:27 2013 +0100 modules/websocket: Fix connection leaks - Decrease the TCP connection reference count after each use (cherry picked from commit 27474179bdeef0ddaba05389f510446a387d85e1) Resolved conflicts due to new feeatures in master: modules/websocket/ws_conn.c modules/websocket/ws_handshake.c --- modules/websocket/ws_conn.c | 5 +++++ modules/websocket/ws_frame.c | 5 +++++ modules/websocket/ws_handshake.c | 21 +++++++++++++-------- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 9f9069f..57c2119 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -325,6 +325,7 @@ void wsconn_close_now(ws_connection_t *wsc) return; } + tcpconn_put(con); con->send_flags.f |= SND_F_CON_CLOSE; con->state = S_CONN_BAD; con->timeout = get_ticks_raw(); @@ -383,8 +384,12 @@ static int add_node(struct mi_root *tree, ws_connection_t *wsc) wsconn_state_str[wsc->state], pong, interval) == 0) + { + tcpconn_put(con); return -1; + } + tcpconn_put(con); return 1; } else diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index e54a830..124a2fc 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -231,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"); + tcpconn_put(con); pkg_free(send_buf); return -1; } @@ -243,6 +244,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); + tcpconn_put(con); return -1; } } @@ -254,6 +256,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); + tcpconn_put(con); return -1; } } @@ -280,12 +283,14 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) update_stat(ws_failed_connections, 1); if (wsconn_rm(frame->wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); + tcpconn_put(con); return -1; } update_stat(ws_transmitted_frames, 1); pkg_free(send_buf); + tcpconn_put(con); return 0; } diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index c959ae8..94b7280 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -146,7 +146,7 @@ int ws_handle_handshake(struct sip_msg *msg) if (con->type != PROTO_TCP && con->type != PROTO_TLS) { LM_ERR("unsupported transport: %d", con->type); - return 0; + goto end; } if (parse_headers(msg, HDR_EOH_F, 0) < 0) @@ -154,7 +154,7 @@ int ws_handle_handshake(struct sip_msg *msg) LM_ERR("error parsing headers\n"); ws_send_reply(msg, 500, &str_status_internal_server_error, NULL); - return 0; + goto end; } /* Process HTTP headers */ @@ -201,7 +201,7 @@ int ws_handle_handshake(struct sip_msg *msg) ws_send_reply(msg, 400, &str_status_bad_request, NULL); - return 0; + goto end; } LM_DBG("found %.*s: %.*s\n", @@ -245,7 +245,7 @@ int ws_handle_handshake(struct sip_msg *msg) ws_send_reply(msg, 400, &str_status_bad_request, NULL); - return 0; + goto end; } str2sint(&hdr->body, &version); @@ -263,7 +263,7 @@ int ws_handle_handshake(struct sip_msg *msg) ws_send_reply(msg, 426, &str_status_upgrade_required, &headers); - return 0; + goto end; } LM_DBG("found %.*s: %.*s\n", @@ -308,7 +308,7 @@ int ws_handle_handshake(struct sip_msg *msg) str_hdr_sec_websocket_version.s, WS_VERSION); ws_send_reply(msg, 400, &str_status_bad_request, &headers); - return 0; + goto end; } /* Construct reply_key */ @@ -319,7 +319,7 @@ int ws_handle_handshake(struct sip_msg *msg) LM_ERR("allocating pkg memory\n"); ws_send_reply(msg, 500, &str_status_internal_server_error, NULL); - return 0; + goto end; } memcpy(reply_key.s, key.s, key.len); memcpy(reply_key.s + key.len, str_ws_guid.s, str_ws_guid.len); @@ -380,10 +380,15 @@ int ws_handle_handshake(struct sip_msg *msg) if ((wsc = wsconn_get(msg->rcv.proto_reserved1)) != NULL) wsconn_rm(wsc, WSCONN_EVENTROUTE_NO); - return 0; + goto end; } + tcpconn_put(con); return 1; +end: + if (con) + tcpconn_put(con); + return 0; } struct mi_root *ws_mi_disable(struct mi_root *cmd, void *param)

11 years, 2 months

git:4.0: core: Fix connection leak with websockets

by Hugh Waite

Module: sip-router Branch: 4.0 Commit: d5eadc90ebdb6460b43d304de86a37893263ce2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5eadc9… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Jul 4 10:30:51 2013 +0100 core: Fix connection leak with websockets - Decrease connection ref count after using connection (cherry picked from commit ffdae5987b99b9bfd39992d407a3a0a33aa772ab) --- forward.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/forward.h b/forward.h index 17ac683..0e1d725 100644 --- a/forward.h +++ b/forward.h @@ -134,6 +134,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) union sockaddr_union local_addr; struct tcp_connection *con = NULL; struct ws_event_info wsev; + int ret; #endif outb.s = buf; @@ -162,13 +163,13 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) con = tcpconn_get(dst->id, 0, 0, 0, 0); else { LM_CRIT("BUG: msg_send called with null_id & to\n"); - return -1; + goto error; } if (con == NULL) { LM_WARN("TCP/TLS connection for WebSocket could not be found\n"); - return -1; + goto error; } memset(&wsev, 0, sizeof(ws_event_info_t)); @@ -176,7 +177,9 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) wsev.buf = outb.s; wsev.len = outb.len; wsev.id = con->id; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev); + tcpconn_put(con); + return ret; } #endif

11 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2013