sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
246 discussions

[tracker] Task closed: DNS failover bugs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#313 - DNS failover bugs User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=313 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.

11 years, 5 months

[tracker] Comment added: DNS failover bugs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#313 - DNS failover bugs User who did this - Daniel-Constantin Mierla (miconda) ---------- On a second thought, the dns failover can return a different transport (e.g., first option udp and second tls), thus enforcing the receiving socket can be risky, resulting in failure. Anyhow, for a controlled environment when it is known the result cannot be on a different transport, I added a new module parameter to tm that can enforce receiving socket. Default is unset, thus same functionality like so far. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=313#comment978 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.

11 years, 5 months

[tracker] Comment added: Nathelper: modparam natping_processes max value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#321 - Nathelper: modparam natping_processes max value User who did this - Daniel-Constantin Mierla (miconda) ---------- The limit can be removed. Just be sure natping_processes cannot be set to negative value and that is not tested. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=321#comment977 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.

11 years, 5 months

[tracker] Comment added: modules/sdpops: add new functions sdp_remove_transport sdp_with_transport

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#322 - modules/sdpops: add new functions sdp_remove_transport sdp_with_transport User who did this - Daniel-Constantin Mierla (miconda) ---------- Can be committed. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=322#comment976 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.

11 years, 5 months

[tracker] User took ownership: modules/sdpops: add new functions sdp_remove_transport sdp_with_transport

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#322 - modules/sdpops: add new functions sdp_remove_transport sdp_with_transport More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=322 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.

11 years, 5 months

[tracker] Task opened: modules/sdpops: add new functions sdp_remove_transport sdp_with_transport (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - modules/sdpops: add new functions sdp_remove_transport sdp_with_transport Task Type - Improvement Category - Core Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - sdp_with_transport() allows to check for the transport of a media stream sdp_remove_transport() allows to remove a media stream by its transport route[ROUTE_CHECK_SRTP] { #!ifdef CHECK_SRTP if (has_body("application/sdp")) { if(!sdp_with_transport("RTP/SAVP")) { send_reply("415", "Unsupported Media Transport. We only allow RTP/SAVP media transport"); exit; } } #!endif return; } 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=322 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.

11 years, 5 months

git:master: modules/websocket: Fix connection leaks

by Hugh Waite

Module: sip-router Branch: master Commit: 27474179bdeef0ddaba05389f510446a387d85e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2747417… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Jul 4 10:31:46 2013 +0100 modules/websocket: Fix connection leaks - Decrease the TCP connection reference count after each use --- modules/websocket/ws_conn.c | 5 +++++ modules/websocket/ws_frame.c | 5 +++++ modules/websocket/ws_handshake.c | 23 ++++++++++++++--------- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index aeda6b2..27a9968 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -356,6 +356,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(); @@ -422,8 +423,12 @@ static int add_node(struct mi_root *tree, ws_connection_t *wsc) pong, interval, sub_protocol) == 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 263f4d2..086cf79 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -240,6 +240,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; } @@ -252,6 +253,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; } } @@ -263,6 +265,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; } } @@ -293,6 +296,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"); + tcpconn_put(con); return -1; } @@ -308,6 +312,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) } pkg_free(send_buf); + tcpconn_put(con); return 0; } diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index a719919..1ca6fe1 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -154,7 +154,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) @@ -162,7 +162,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 */ @@ -209,7 +209,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", @@ -253,7 +253,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); @@ -271,7 +271,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", @@ -291,7 +291,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", @@ -337,7 +337,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 */ @@ -348,7 +348,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); @@ -424,7 +424,7 @@ 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; } else { @@ -434,7 +434,12 @@ int ws_handle_handshake(struct sip_msg *msg) update_stat(ws_msrp_successful_handshakes, 1); } + 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, 5 months

git:master: dialog: added timer process to clean unconfirmed dialogs older than 5min

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 97781390e663116f9e5d11f5644e1145487b6cfb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9778139… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 5 09:23:32 2013 +0200 dialog: added timer process to clean unconfirmed dialogs older than 5min - timer runs every 90sec (customization to be added in the future) - safety procedure for cleaning dialog list --- modules/dialog/dialog.c | 29 ++++++++++++++++++++++++----- modules/dialog/dlg_hash.c | 33 +++++++++++++++++++++++++++++++++ modules/dialog/dlg_hash.h | 3 +++ 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index e560b4e..ae105d4 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -138,6 +138,7 @@ int dlg_db_mode_param = DB_MODE_NONE; str dlg_xavp_cfg = {0}; int dlg_ka_timer = 0; int dlg_ka_interval = 0; +int dlg_clean_timer = 90; /* db stuff */ static str db_url = str_init(DEFAULT_DB_URL); @@ -147,6 +148,7 @@ static int pv_get_dlg_count( struct sip_msg *msg, pv_param_t *param, pv_value_t *res); void dlg_ka_timer_exec(unsigned int ticks, void* param); +void dlg_clean_timer_exec(unsigned int ticks, void* param); /* commands wrappers and fixups */ static int fixup_profile(void** param, int param_no); @@ -697,9 +699,14 @@ static int mod_init(void) } destroy_dlg_callbacks( DLGCB_LOADED ); + + /* timer process to send keep alive requests */ if(dlg_ka_timer>0 && dlg_ka_interval>0) register_sync_timers(1); + /* timer process to clean old unconfirmed dialogs */ + register_sync_timers(1); + return 0; } @@ -708,11 +715,18 @@ static int child_init(int rank) { dlg_db_mode = dlg_db_mode_param; - if(rank==PROC_MAIN && dlg_ka_timer>0 && dlg_ka_interval>0) - { - if(fork_sync_timer(PROC_TIMER, "Dialog KA Timer", 1 /*socks flag*/, - dlg_ka_timer_exec, NULL, dlg_ka_timer /*sec*/)<0) { - LM_ERR("failed to start ka timer routine as process\n"); + if(rank==PROC_MAIN) { + if(dlg_ka_timer>0 && dlg_ka_interval>0) { + if(fork_sync_timer(PROC_TIMER, "Dialog KA Timer", 1 /*socks flag*/, + dlg_ka_timer_exec, NULL, dlg_ka_timer /*sec*/)<0) { + LM_ERR("failed to start ka timer routine as process\n"); + return -1; /* error */ + } + } + + if(fork_sync_timer(PROC_TIMER, "Dialog Clean Timer", 1 /*socks flag*/, + dlg_clean_timer_exec, NULL, dlg_clean_timer /*sec*/)<0) { + LM_ERR("failed to start clean timer routine as process\n"); return -1; /* error */ } } @@ -1221,6 +1235,11 @@ void dlg_ka_timer_exec(unsigned int ticks, void* param) dlg_ka_run(ticks); } +void dlg_clean_timer_exec(unsigned int ticks, void* param) +{ + dlg_clean_run(ticks); +} + static int fixup_dlg_bye(void** param, int param_no) { char *val; diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index bba619a..6f944e1 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -223,6 +223,38 @@ int dlg_ka_run(ticks_t ti) return 0; } +/** + * clean old unconfirmed dialogs + * + */ +int dlg_clean_run(ticks_t ti) +{ + unsigned int i; + unsigned int tm; + dlg_cell_t *dlg; + dlg_cell_t *tdlg; + + tm = (unsigned int)time(NULL); + for(i=0; i<d_table->size; i++) + { + lock_set_get(d_table->locks, d_table->entries[i].lock_idx); + dlg = d_table->entries[i].first; + while (dlg) { + tdlg = dlg; + dlg = dlg->next; + if(tdlg->state==DLG_STATE_UNCONFIRMED && tdlg->init_ts<tm-300) { + /* dialog in early state older than 5min */ + LM_NOTICE("dialog in early state is too old (%p ref %d)\n", + tdlg, tdlg->ref); + unlink_unsafe_dlg(&d_table->entries[i], tdlg); + destroy_dlg(tdlg); + } + } + lock_set_release(d_table->locks, d_table->entries[i].lock_idx); + } + return 0; +} + /*! * \brief Initialize the global dialog table * \param size size of the table @@ -434,6 +466,7 @@ struct dlg_cell* build_new_dlg( str *callid, str *from_uri, str *to_uri, memset( dlg, 0, len); dlg->state = DLG_STATE_UNCONFIRMED; + dlg->init_ts = (unsigned int)time(NULL); dlg->h_entry = core_hash( callid, 0, d_table->size); LM_DBG("new dialog on hash %u\n",dlg->h_entry); diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index ed295cc..4bfc911 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -114,6 +114,7 @@ typedef struct dlg_cell unsigned int h_entry; /*!< index of hash table entry (the slot number) */ unsigned int state; /*!< dialog state */ unsigned int lifetime; /*!< dialog lifetime */ + unsigned int init_ts; /*!< init (creation) time (absolute UNIX ts)*/ unsigned int start_ts; /*!< start time (absolute UNIX ts)*/ unsigned int dflags; /*!< internal dialog memory flags */ unsigned int iflags; /*!< internal dialog persistent flags */ @@ -527,6 +528,8 @@ int dlg_ka_add(dlg_cell_t *dlg); int dlg_ka_run(ticks_t ti); +int dlg_clean_run(ticks_t ti); + /*! * \brief Update dialog lifetime - for internal callers. */

11 years, 5 months

git:master: textopsx: enable usage of msg_apply_changes() for sip replies

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 85f6a45e6d74044488b63a89ce8feaaf3c4b00bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85f6a45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 4 22:29:06 2013 +0200 textopsx: enable usage of msg_apply_changes() for sip replies --- modules/textopsx/textopsx.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index bbe1ff1..2a7273d 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -79,7 +79,7 @@ extern select_row_t sel_declaration[]; /* cfg functions */ static cmd_export_t cmds[] = { {"msg_apply_changes", (cmd_function)msg_apply_changes_f, 0, - 0, REQUEST_ROUTE }, + 0, REQUEST_ROUTE|ONREPLY_ROUTE }, {"change_reply_status", change_reply_status_f, 2, change_reply_status_fixup, ONREPLY_ROUTE }, {"remove_body", (cmd_function)w_remove_body_f, 0, @@ -152,7 +152,7 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) str obuf; sip_msg_t tmp; - if(get_route_type()!=REQUEST_ROUTE) + if(msg->first_line.type!=SIP_REPLY && get_route_type()!=REQUEST_ROUTE) { LM_ERR("invalid usage - not in request route\n"); return -1; @@ -160,9 +160,14 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) init_dest_info(&dst); dst.proto = PROTO_UDP; - obuf.s = build_req_buf_from_sip_req(msg, - (unsigned int*)&obuf.len, &dst, - BUILD_NO_LOCAL_VIA|BUILD_NO_VIA1_UPDATE); + if(msg->first_line.type == SIP_REPLY) { + obuf.s = generate_res_buf_from_sip_res(msg, + (unsigned int*)&obuf.len, BUILD_NO_VIA1_UPDATE); + } else { + obuf.s = build_req_buf_from_sip_req(msg, + (unsigned int*)&obuf.len, &dst, + BUILD_NO_LOCAL_VIA|BUILD_NO_VIA1_UPDATE); + } if(obuf.s == NULL) { LM_ERR("couldn't update msg buffer content\n"); @@ -216,9 +221,9 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) pkg_free(obuf.s); /* reparse the message */ - LM_DBG("SIP Request content updated - reparsing\n"); + LM_DBG("SIP message content updated - reparsing\n"); if (parse_msg(msg->buf, msg->len, msg)!=0){ - LM_ERR("parse_msg failed\n"); + LM_ERR("parsing new sip message failed\n"); return -1; }

11 years, 5 months

git:master: textopsx: updated docs for msg_apply_changes() and added sections ids

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 647a99bd21f6059505ea1ee65ac93c6c00fc8c8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=647a99b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 4 22:34:41 2013 +0200 textopsx: updated docs for msg_apply_changes() and added sections ids --- modules/textopsx/README | 240 ++++++++++++++++++------------------ modules/textopsx/doc/functions.xml | 38 +++--- 2 files changed, 138 insertions(+), 140 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=647…

11 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2013