sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

git:4.4:7790adcf: core: fixed misleading indentation for return statement

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 7790adcfcd97540aeceb73a8ef556ae827007902 URL: https://github.com/kamailio/kamailio/commit/7790adcfcd97540aeceb73a8ef556ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:09:45+02:00 core: fixed misleading indentation for return statement (cherry picked from commit fc65a118d15e7942adccd332996701cdb6f1b0c7) --- Modified: tls_hooks.c --- Diff: https://github.com/kamailio/kamailio/commit/7790adcfcd97540aeceb73a8ef556ae… Patch: https://github.com/kamailio/kamailio/commit/7790adcfcd97540aeceb73a8ef556ae… --- diff --git a/tls_hooks.c b/tls_hooks.c index b46a429..62ddda2 100644 --- a/tls_hooks.c +++ b/tls_hooks.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 iptelorg GmbH + * Copyright (C) 2007 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -34,7 +34,7 @@ static int tls_hooks_loaded=0; int register_tls_hooks(struct tls_hooks* h) { - if (!tls_disable){ + if (!tls_disable) { tls_hook=*h; tls_hooks_loaded++; return 0; @@ -47,7 +47,7 @@ int tls_init(struct socket_info* si) { if (tls_hook.init_si) return tls_hook.init_si(si); - return -1; + return -1; } int tls_has_init_si()

8 years, 2 months

git:4.4:80bb7f15: presence: expire value kept and printed in logs as unsigned int

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 80bb7f1559017aafcfc0377538e7c9aa79150ff0 URL: https://github.com/kamailio/kamailio/commit/80bb7f1559017aafcfc0377538e7c9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:09:18+02:00 presence: expire value kept and printed in logs as unsigned int - code compacted for extracting subscription data (cherry picked from commit 770bae3ce1e1f561d575df689df067a7639f64c4) --- Modified: modules/presence/event_list.h Modified: modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/80bb7f1559017aafcfc0377538e7c9a… Patch: https://github.com/kamailio/kamailio/commit/80bb7f1559017aafcfc0377538e7c9a…

8 years, 2 months

[kamailio/kamailio] SIP keepalives using CRLF do not work with websocket cliente (#810)

by André Freitas

When I enable SIP.js keep-alive, it sends double CR-LFs to Kamailio via websocket, however Kamailio understands it as a malformed SIP message, and therefore does not reply with a single CR-LF. Debug log from websocket module upon arrival of keep-alive: `15(88) DEBUG: websocket [ws_frame.c:415]: decode_and_validate_ws_frame(): decoding WebSocket frame` `15(88) DEBUG: websocket [ws_frame.c:451]: decode_and_validate_ws_frame(): supported non-control frame: 0x1` `15(88) DEBUG: websocket [ws_frame.c:550]: decode_and_validate_ws_frame(): Rx (decoded):` ` ` `15(88) DEBUG: websocket [ws_frame.c:684]: ws_frame_receive(): Rx SIP message:` ` ` ` ` `15(88) DEBUG: websocket [ws_conn.c:383]: wsconn_put(): wsconn_put start for [0x7fc8cbd45860] refcnt [2]` `15(88) DEBUG: websocket [ws_conn.c:416]: wsconn_put(): wsconn_put end for [0x7fc8cbd45860] refcnt [1]` `15(88) INFO: <core> [parser/parse_fline.c:87]: parse_first_line(): ERROR: parse_first_line: message too short: 0` `15(88) ERROR: <core> [parser/parse_fline.c:257]: parse_first_line(): parse_first_line: bad message (offset: 0)` `15(88) ERROR: <core> [parser/msg_parser.c:671]: parse_msg(): ERROR: parse_msg: message=<` ` ` `>` `15(88) ERROR: <core> [receive.c:173]: receive_msg(): core parsing of SIP message failed (10.0.1.73:1043/6)` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/810

8 years, 2 months

git:master:8fa51e52: websocket: catch CRLFCRLF pings over websocket connections

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8fa51e52e9cf9dbae45069c9354cfeb36997dff9 URL: https://github.com/kamailio/kamailio/commit/8fa51e52e9cf9dbae45069c9354cfeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T11:43:23+02:00 websocket: catch CRLFCRLF pings over websocket connections - reported by GH #810 --- Modified: modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/8fa51e52e9cf9dbae45069c9354cfeb… Patch: https://github.com/kamailio/kamailio/commit/8fa51e52e9cf9dbae45069c9354cfeb… --- diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 6b32f4f..6ce5287 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -686,8 +686,10 @@ int ws_frame_receive(void *data) frame.payload_data); update_stat(ws_sip_received_frames, 1); - if(frame.payload_len==CRLF_LEN + if((frame.payload_len==CRLF_LEN && strncmp(frame.payload_data, CRLF, CRLF_LEN)==0) + || (frame.payload_len==CRLFCRLF_LEN + && strncmp(frame.payload_data, CRLFCRLF, CRLFCRLF_LEN)==0)) { ws_send_crlf(frame.wsc, opcode); wsconn_put(frame.wsc);

8 years, 2 months

git:master:6649cdf5: core: defined macro for CRLFCRLF

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6649cdf51520cfcc366f2839316c8d45c233421b URL: https://github.com/kamailio/kamailio/commit/6649cdf51520cfcc366f2839316c8d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T11:43:23+02:00 core: defined macro for CRLFCRLF - used in pinging over tcp, makes it more coherent to use --- Modified: config.h --- Diff: https://github.com/kamailio/kamailio/commit/6649cdf51520cfcc366f2839316c8d4… Patch: https://github.com/kamailio/kamailio/commit/6649cdf51520cfcc366f2839316c8d4… --- diff --git a/config.h b/config.h index 4083099..66ba0df 100644 --- a/config.h +++ b/config.h @@ -90,13 +90,16 @@ #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) #define MAX_WARNING_LEN 256 - + #define MY_BRANCH ";branch=" #define MY_BRANCH_LEN (sizeof(MY_BRANCH) - 1) #define MAX_PORT_LEN 7 /* ':' + max 5 letters + \0 */ + #define CRLF "\r\n" #define CRLF_LEN (sizeof(CRLF) - 1) +#define CRLFCRLF "\r\n\r\n" +#define CRLFCRLF_LEN (sizeof(CRLFCRLF) - 1) #define RECEIVED ";received=" #define RECEIVED_LEN (sizeof(RECEIVED) - 1)

8 years, 2 months

git:master:66473295: modules: readme files regenerated - tcpops ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 66473295ab516b862fb2c81aa1a1e35ffc4d88e2 URL: https://github.com/kamailio/kamailio/commit/66473295ab516b862fb2c81aa1a1e35… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-10-10T11:16:15+02:00 modules: readme files regenerated - tcpops ... --- Modified: modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/66473295ab516b862fb2c81aa1a1e35… Patch: https://github.com/kamailio/kamailio/commit/66473295ab516b862fb2c81aa1a1e35… --- diff --git a/modules/tcpops/README b/modules/tcpops/README index 3918b00..b0a0c3b 100644 --- a/modules/tcpops/README +++ b/modules/tcpops/README @@ -34,6 +34,9 @@ Olle E. Johansson 4. Event routes 4.1. tcp:closed + 4.2. tcp:timeout + 4.3. tcp:reset + 4.4. Example List of Examples @@ -66,6 +69,9 @@ Chapter 1. Admin Guide 4. Event routes 4.1. tcp:closed + 4.2. tcp:timeout + 4.3. tcp:reset + 4.4. Example 1. Overview @@ -289,18 +295,43 @@ event_route[tcp:closed] { 4. Event routes 4.1. tcp:closed + 4.2. tcp:timeout + 4.3. tcp:reset + 4.4. Example + + The 3 following routes are called when a socket is closed. + + The corresponding $conid , $Ri , $Rp , $si , $sp and $proto variable + will be available in the event routes. + + Whether these routes are always called, never, or on a per socket basis + is controlled by the closed_event parameter. 4.1. tcp:closed - This route is called when a socket is closed by the remote party, or - reset, or timeout. The corresponding $conid variable will be available - in the event route. + Called for each "normal" TCP socket closure by the other side + (FIN,ACK). + +4.2. tcp:timeout + + Called for connection timeouts (unanswered keepalives). + +4.3. tcp:reset - Whether this route is always called, never, or on a per socket basis is - controlled by the closed_event parameter. + Called if the connection is reset by peer (RST). + +4.4. Example ... event_route[tcp:closed] { - xlog("L_INFO", "TCP connection closed ($conid)\n"); + xlog("L_INFO", "$proto connection closed ($conid)\n"); +} + +event_route[tcp:timeout] { + xlog("L_INFO", "$proto connection timed out ($conid)\n"); +} + +event_route[tcp:reset] { + xlog("L_INFO", "$proto connection reset by peer ($conid)\n"); } ...

8 years, 2 months

git:master:b5d1f364: Merge pull request #816 from kamailio/co/tcp_closed_routes

by GitHub

Module: kamailio Branch: master Commit: b5d1f364924df57251f5bdc53a1b668cbed5ccc8 URL: https://github.com/kamailio/kamailio/commit/b5d1f364924df57251f5bdc53a1b668… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: GitHub <noreply(a)github.com> Date: 2016-10-10T11:04:20+02:00 Merge pull request #816 from kamailio/co/tcp_closed_routes TCP closed event route improvement --- Modified: modules/tcpops/doc/eventroutes.xml Modified: modules/tcpops/tcpops.c Modified: modules/tcpops/tcpops.h Modified: modules/tcpops/tcpops_mod.c Modified: tcp_conn.h Modified: tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/b5d1f364924df57251f5bdc53a1b668… Patch: https://github.com/kamailio/kamailio/commit/b5d1f364924df57251f5bdc53a1b668…

8 years, 2 months

git:master:97215407: tcpops: use dedicated routes for tcp close events

by Camille Oudot

Module: kamailio Branch: master Commit: 97215407635c61ab9d1702f5c6e300f5bd15b69b URL: https://github.com/kamailio/kamailio/commit/97215407635c61ab9d1702f5c6e300f… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-10-06T16:45:39+02:00 tcpops: use dedicated routes for tcp close events - tcp:closed for "normal" close by the other side - tcp:timeout for timeouts - tcp:reset for connections closed with RST --- Modified: modules/tcpops/tcpops.c Modified: modules/tcpops/tcpops.h Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/97215407635c61ab9d1702f5c6e300f… Patch: https://github.com/kamailio/kamailio/commit/97215407635c61ab9d1702f5c6e300f… --- diff --git a/modules/tcpops/tcpops.c b/modules/tcpops/tcpops.c index 624e887..43340ca 100644 --- a/modules/tcpops/tcpops.c +++ b/modules/tcpops/tcpops.c @@ -38,6 +38,9 @@ /* globally enabled by default */ int tcp_closed_event = 1; +int tcp_closed_routes[_TCP_CLOSED_REASON_MAX] = + {[0 ... sizeof(tcp_closed_routes)/sizeof(*tcp_closed_routes)-1] = -1}; + /** * gets the fd of the current message source connection * @@ -192,20 +195,14 @@ int tcpops_set_connection_lifetime(struct tcp_connection* con, int time) { return 1; } -static void tcpops_tcp_closed_run_route(struct tcp_connection *con) +static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) { int rt, backup_rt; struct run_act_ctx ctx; sip_msg_t *fmsg; - LM_DBG("tcp_closed_run_route event_route[tcp:closed]\n"); - - rt = route_get(&event_rt, "tcp:closed"); - if (rt < 0 || event_rt.rlist[rt] == NULL) - { - LM_DBG("route does not exist"); - return; - } + rt = tcp_closed_routes[tev->reason]; + if (rt == -1) return; if (faked_msg_init() < 0) { @@ -213,7 +210,7 @@ static void tcpops_tcp_closed_run_route(struct tcp_connection *con) return; } fmsg = faked_msg_next(); - fmsg->rcv = con->rcv; + fmsg->rcv = tev->con->rcv; backup_rt = get_route_type(); set_route_type(EVENT_ROUTE); @@ -224,7 +221,7 @@ static void tcpops_tcp_closed_run_route(struct tcp_connection *con) int tcpops_handle_tcp_closed(void *data) { - tcp_event_info_t *tev = (tcp_event_info_t *) data; + tcp_closed_event_info_t *tev = (tcp_closed_event_info_t *) data; if (tev == NULL || tev->con == NULL) { LM_WARN("received bad TCP closed event\n"); @@ -234,7 +231,7 @@ int tcpops_handle_tcp_closed(void *data) /* run event route if tcp_closed_event == 1 or if the * F_CONN_CLOSE_EV flag is explicitly set */ if (tcp_closed_event == 1 || (tev->con->flags & F_CONN_CLOSE_EV)) - tcpops_tcp_closed_run_route(tev->con); + tcpops_tcp_closed_run_route(tev); return 0; } diff --git a/modules/tcpops/tcpops.h b/modules/tcpops/tcpops.h index 8e1c823..bde142b 100644 --- a/modules/tcpops/tcpops.h +++ b/modules/tcpops/tcpops.h @@ -28,6 +28,7 @@ #include "../../events.h" extern int tcp_closed_event; +extern int tcp_closed_routes[_TCP_CLOSED_REASON_MAX]; int tcpops_get_current_fd(int conid, int *fd); int tcpops_acquire_fd_from_tcpmain(int conid, int *fd); diff --git a/modules/tcpops/tcpops_mod.c b/modules/tcpops/tcpops_mod.c index 60c7b88..b235cd4 100644 --- a/modules/tcpops/tcpops_mod.c +++ b/modules/tcpops/tcpops_mod.c @@ -118,11 +118,17 @@ static int mod_init(void) return -1; } - if (tcp_closed_event /* register event only if tcp_closed_event != 0 */ - && (sr_event_register_cb(SREV_TCP_CLOSED, tcpops_handle_tcp_closed) != 0)) - { - LM_ERR("problem registering tcpops_handle_tcp_closed call-back\n"); - return -1; + if (tcp_closed_event) { + /* register event only if tcp_closed_event != 0 */ + if (sr_event_register_cb(SREV_TCP_CLOSED, tcpops_handle_tcp_closed) != 0) { + LM_ERR("problem registering tcpops_handle_tcp_closed call-back\n"); + return -1; + } + + /* get event routes */ + tcp_closed_routes[TCP_CLOSED_EOF] = route_get(&event_rt, "tcp:closed"); + tcp_closed_routes[TCP_CLOSED_TIMEOUT] = route_get(&event_rt, "tcp:timeout"); + tcp_closed_routes[TCP_CLOSED_RESET] = route_get(&event_rt, "tcp:reset"); } return 0;

8 years, 2 months

git:master:35861261: core: dedicated struct for TCP closed events

by Camille Oudot

Module: kamailio Branch: master Commit: 35861261a4ef04cf785e9169aad0cde7ee7dd336 URL: https://github.com/kamailio/kamailio/commit/35861261a4ef04cf785e9169aad0cde… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-10-06T16:42:40+02:00 core: dedicated struct for TCP closed events this will allow to differentiate between the different reasons for connection closed events --- Modified: tcp_conn.h Modified: tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/35861261a4ef04cf785e9169aad0cde… Patch: https://github.com/kamailio/kamailio/commit/35861261a4ef04cf785e9169aad0cde… --- diff --git a/tcp_conn.h b/tcp_conn.h index 7c4ef5d..771b744 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -335,6 +335,19 @@ typedef struct tcp_event_info { struct tcp_connection *con; } tcp_event_info_t; +enum tcp_closed_reason { + TCP_CLOSED_EOF = 0, + TCP_CLOSED_TIMEOUT, + TCP_CLOSED_RESET, + + _TCP_CLOSED_REASON_MAX /* /!\ keep this one always at the end */ +}; + +typedef struct tcp_closed_event_info { + enum tcp_closed_reason reason; + struct tcp_connection *con; +} tcp_closed_event_info_t; + typedef struct ws_event_info { int type; char *buf; diff --git a/tcp_read.c b/tcp_read.c index 85dd4b1..e8b262b 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -186,17 +186,16 @@ int tcp_http11_continue(struct tcp_connection *c) } #endif /* HTTP11 */ -static int tcp_make_closed_event(struct receive_info* rcv_info, struct tcp_connection* con) +static int tcp_emit_closed_event(struct tcp_connection *con, enum tcp_closed_reason reason) { int ret; - tcp_event_info_t tev; + tcp_closed_event_info_t tev; ret = 0; LM_DBG("TCP closed event creation triggered\n"); if(likely(sr_event_enabled(SREV_TCP_CLOSED))) { - memset(&tev, 0, sizeof(tcp_event_info_t)); - tev.type = SREV_TCP_CLOSED; - tev.rcv = rcv_info; + memset(&tev, 0, sizeof(tcp_closed_event_info_t)); + tev.reason = reason; tev.con = con; ret = sr_event_exec(SREV_TCP_CLOSED, (void*)(&tev)); } else { @@ -291,19 +290,18 @@ int tcp_read_data(int fd, struct tcp_connection *c, strerror(errno), errno, ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); LOG(cfg_get(core, core_cfg, corelog),"-> [%s]:%u)\n", ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); - if((errno == ECONNRESET || errno == ETIMEDOUT) && likely(c->rcv.proto_reserved1 != 0)){ - tcp_make_closed_event(&c->rcv, c); + if (errno == ETIMEDOUT) { + tcp_emit_closed_event(c, TCP_CLOSED_TIMEOUT); + } else if (errno == ECONNRESET) { + tcp_emit_closed_event(c, TCP_CLOSED_RESET); } - return -1; } }else if (unlikely((bytes_read==0) || (*flags & RD_CONN_FORCE_EOF))){ c->state=S_CONN_EOF; *flags|=RD_CONN_EOF; - if (likely(c->rcv.proto_reserved1 != 0)){ - tcp_make_closed_event(&c->rcv, c); - } + tcp_emit_closed_event(c, TCP_CLOSED_EOF); LM_DBG("EOF on %p, FD %d ([%s]:%u ->", c, fd, ip_addr2a(&c->rcv.src_ip), c->rcv.src_port); LM_DBG("-> [%s]:%u)\n", ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); }else{

8 years, 2 months

[kamailio/kamailio] TCP closed event route improvement (#816)

by Camille Oudot

This patch for the **tcpops** module (+ some core modifications) improves the original **tcp:closed** event route handling by triggering different event routes, depending on the reason why the connection was closed: - **tcp:closed** for "normal" closure by the other side (FIN,ACK) - **tcp:timeout** for timeouts (unanswered keepalives) - **tcp:reset** if reset by peer (RST) It will break the compatibility with older scripts, as some events will require new event routes to be caught. I'll modify the documentation accordingly if/when this is accepted. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/816 -- Commit Summary -- * core: dedicated struct for TCP closed events * tcpops: use dedicated routes for tcp close events -- File Changes -- M modules/tcpops/tcpops.c (21) M modules/tcpops/tcpops.h (1) M modules/tcpops/tcpops_mod.c (16) M tcp_conn.h (13) M tcp_read.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/816.patch https://github.com/kamailio/kamailio/pull/816.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/816

8 years, 2 months

← Newer
1
...
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016