sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

git:master:40c8a62c: siptrace: updated the log messages
by Daniel-Constantin Mierla 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 40c8a62ce85cc14ecf4e30b17d322f9a4177ed8e URL: https://github.com/kamailio/kamailio/commit/40c8a62ce85cc14ecf4e30b17d322f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-06T11:45:33+01:00 siptrace: updated the log messages - debug level and function name are added automatically by LM_*() macros --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/40c8a62ce85cc14ecf4e30b17d322f9… Patch: https://github.com/kamailio/kamailio/commit/40c8a62ce85cc14ecf4e30b17d322f9… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index cc0c0f2..7d5c952 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1667,7 +1667,7 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to, struct dest_i /* check if from and to are in the same family*/ if(from_su.s.sa_family != to_su.s.sa_family) { - LOG(L_ERR, "ERROR: trace_send_hep_duplicate: interworking detected ?\n"); + LM_ERR("interworking detected ?\n"); goto error; } @@ -1744,7 +1744,7 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to, struct dest_i len = sizeof(struct hep_ip6hdr); } else { - LOG(L_ERR, "ERROR: trace_send_hep_duplicate: Unsupported protocol family\n"); + LM_ERR("Unsupported protocol family\n"); goto error;; } @@ -1755,7 +1755,7 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to, struct dest_i len += sizeof(struct hep_hdr) + body->len; buffer = (void *)pkg_malloc(len+1); if (buffer==0){ - LOG(L_ERR, "ERROR: trace_send_hep_duplicate: out of memory\n"); + LM_ERR("out of memory\n"); goto error; }

1 0

Kamailio World 2016 – Call For Speakers
by Daniel-Constantin Mierla 06 Jan '16

06 Jan '16

Hello, should anyone here be interested in submitting a proposal for a presentation at Kamailio World 2016, note that the process is open now. More details were posted on a news article at: - http://www.kamailio.org/w/2016/01/kamailio-world-2016-call-for-speakers/ Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Book: SIP Routing With Kamailio - http://www.asipto.com http://miconda.eu

1 0

git:master:284c11ed: siptrace: don't execute core event for net data out for HEP packets
by Daniel-Constantin Mierla 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 284c11ed16bdc5afcc9abf49c9f5c1749ce831e0 URL: https://github.com/kamailio/kamailio/commit/284c11ed16bdc5afcc9abf49c9f5c17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-06T10:05:35+01:00 siptrace: don't execute core event for net data out for HEP packets --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/284c11ed16bdc5afcc9abf49c9f5c17… Patch: https://github.com/kamailio/kamailio/commit/284c11ed16bdc5afcc9abf49c9f5c17… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index df6ceff..cc0c0f2 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1790,7 +1790,7 @@ static int trace_send_hep_duplicate(str *body, str *from, str *to, struct dest_i memcpy((void*)(buffer + buflen) , (void*)body->s, body->len); buflen +=body->len; - if (msg_send(dst_fin, buffer, buflen)<0) + if (msg_send_buffer(dst_fin, buffer, buflen, 1)<0) { LM_ERR("cannot send hep duplicate message\n"); goto error;

1 0

git:master:526fb4cd: core: added msg_send_buffer() function to allow skipping execution of core events
by Daniel-Constantin Mierla 06 Jan '16

06 Jan '16

Module: kamailio Branch: master Commit: 526fb4cdc2246284ecbd7de9ed65678da2dbe357 URL: https://github.com/kamailio/kamailio/commit/526fb4cdc2246284ecbd7de9ed65678… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-06T10:03:00+01:00 core: added msg_send_buffer() function to allow skipping execution of core events - useful for non-sip messages sent out to skip execution of SREV_NET_DATA_OUT, like HEP packets for sipcapture - msg_send() is now a defined alias for msg_send_buffer() --- Modified: forward.h --- Diff: https://github.com/kamailio/kamailio/commit/526fb4cdc2246284ecbd7de9ed65678… Patch: https://github.com/kamailio/kamailio/commit/526fb4cdc2246284ecbd7de9ed65678… --- diff --git a/forward.h b/forward.h index f1418d0..9c075b8 100644 --- a/forward.h +++ b/forward.h @@ -97,6 +97,7 @@ void forward_set_send_info(int v); int is_check_self_func_list_set(void); +#define msg_send(_dst, _buf, _len) msg_send_buffer((_dst), (_buf), (_len), 0) /* params: * dst = struct dest_info containing: @@ -109,9 +110,12 @@ int is_check_self_func_list_set(void); * (useful for sending replies on the same connection as the request * that generated them; use 0 if you don't want this) * buf, len = buffer + * flags = control internal behavior + * * 1 - skip executing event SREV_NET_DATA_OUT * returns: 0 if ok, -1 on error*/ -static inline int msg_send(struct dest_info* dst, char* buf, int len) +static inline int msg_send_buffer(struct dest_info* dst, char* buf, int len, + int flags) { struct dest_info new_dst; str outb; @@ -127,7 +131,9 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) outb.s = buf; outb.len = len; - sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb); + if(!(flags&1)) { + sr_event_exec(SREV_NET_DATA_OUT, (void*)&outb); + } if(outb.s==NULL) { LM_ERR("failed to update outgoing buffer\n");

1 0

[kamailio] tcpops: implement event_route for unexpectedly closed tcp connections (#454)
by Armen Babikyan 04 Jan '16

04 Jan '16

Comments are welcome You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/454 -- Commit Summary -- * tcpops: implement event_route for unexpectedly closed tcp connections -- File Changes -- M events.c (13) M events.h (2) M modules/tcpops/tcpops.c (44) M modules/tcpops/tcpops.h (2) M modules/tcpops/tcpops_mod.c (6) M tcp_read.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/454.patch https://github.com/kamailio/kamailio/pull/454.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/454

4 6

git:master:bef6dd6b: tcpops: include header for faked message to get rid of compile warnings
by Daniel-Constantin Mierla 04 Jan '16

04 Jan '16

Module: kamailio Branch: master Commit: bef6dd6bb52921a703db295ff7736ea5a8ad212e URL: https://github.com/kamailio/kamailio/commit/bef6dd6bb52921a703db295ff7736ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-04T23:10:01+01:00 tcpops: include header for faked message to get rid of compile warnings - warnings resulted after the commit for event_route[tcp:closed] --- Modified: modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/bef6dd6bb52921a703db295ff7736ea… Patch: https://github.com/kamailio/kamailio/commit/bef6dd6bb52921a703db295ff7736ea… --- diff --git a/modules/tcpops/tcpops.c b/modules/tcpops/tcpops.c index d89e01a..b407e13 100644 --- a/modules/tcpops/tcpops.c +++ b/modules/tcpops/tcpops.c @@ -31,6 +31,7 @@ #include "../../globals.h" #include "../../pass_fd.h" #include "../../timer.h" +#include "../../fmsg.h" #include "../../sr_module.h" /**

1 0

git:master:5856d984: tcpops: framework to execute event_route[tcp:closed]
by Daniel-Constantin Mierla 04 Jan '16

04 Jan '16

Module: kamailio Branch: master Commit: 5856d9848345a429c0a7bd91a6d9eccf45d067d3 URL: https://github.com/kamailio/kamailio/commit/5856d9848345a429c0a7bd91a6d9ecc… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-04T23:06:52+01:00 tcpops: framework to execute event_route[tcp:closed] --- Modified: modules/tcpops/tcpops.c Modified: modules/tcpops/tcpops.h Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5856d9848345a429c0a7bd91a6d9ecc… Patch: https://github.com/kamailio/kamailio/commit/5856d9848345a429c0a7bd91a6d9ecc… --- diff --git a/modules/tcpops/tcpops.c b/modules/tcpops/tcpops.c index 037a8cb..d89e01a 100644 --- a/modules/tcpops/tcpops.c +++ b/modules/tcpops/tcpops.c @@ -31,6 +31,7 @@ #include "../../globals.h" #include "../../pass_fd.h" #include "../../timer.h" +#include "../../sr_module.h" /** * gets the fd of the current message source connection @@ -185,3 +186,46 @@ int tcpops_set_connection_lifetime(struct tcp_connection* con, int time) { LM_DBG("new connection lifetime for conid=%d: %d\n", con->id, con->timeout); return 1; } + +static void tcpops_tcp_closed_run_route(struct tcp_connection *con) +{ + 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; + } + + if (faked_msg_init() < 0) + { + LM_ERR("faked_msg_init() failed\n"); + return; + } + fmsg = faked_msg_next(); + fmsg->rcv = con->rcv; + + backup_rt = get_route_type(); + set_route_type(EVENT_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); + set_route_type(backup_rt); +} + +int tcpops_handle_tcp_closed(void *data) +{ + tcp_event_info_t *tev = (tcp_event_info_t *) data; + + if (tev == NULL || tev->con == NULL) { + LM_WARN("received bad TCP closed event\n"); + return -1; + } + + tcpops_tcp_closed_run_route(tev->con); + + return 0; +} diff --git a/modules/tcpops/tcpops.h b/modules/tcpops/tcpops.h index c9a0771..771516f 100644 --- a/modules/tcpops/tcpops.h +++ b/modules/tcpops/tcpops.h @@ -25,11 +25,13 @@ #define TCP_KEEPALIVE_H_ #include "../../tcp_conn.h" +#include "../../events.h" int tcpops_get_current_fd(int conid, int *fd); int tcpops_acquire_fd_from_tcpmain(int conid, int *fd); int tcpops_keepalive_enable(int fd, int idle, int count, int interval, int closefd); int tcpops_keepalive_disable(int fd, int closefd); int tcpops_set_connection_lifetime(struct tcp_connection* con, int time); +int tcpops_handle_tcp_closed(void *data); #endif /* TCP_KEEPALIVE_H_ */ diff --git a/modules/tcpops/tcpops_mod.c b/modules/tcpops/tcpops_mod.c index c400020..0de40c7 100644 --- a/modules/tcpops/tcpops_mod.c +++ b/modules/tcpops/tcpops_mod.c @@ -35,6 +35,7 @@ #include "../../tcp_options.h" #include "../../dprint.h" #include "../../mod_fix.h" +#include "../../events.h" #include "tcpops.h" @@ -101,6 +102,11 @@ static int mod_init(void) { LM_DBG("TCP keepalive module loaded.\n"); + 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; + } + return 0; }

1 0

git:master:1980c79d: core: trigger event_route execution for unexpectedly-closed and client-closed tcp connections
by Daniel-Constantin Mierla 04 Jan '16

04 Jan '16

Module: kamailio Branch: master Commit: 1980c79d4fb2111c8c245045035f4ecb5d17fd7f URL: https://github.com/kamailio/kamailio/commit/1980c79d4fb2111c8c245045035f4ec… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-04T23:05:30+01:00 core: trigger event_route execution for unexpectedly-closed and client-closed tcp connections --- Modified: tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/1980c79d4fb2111c8c245045035f4ec… Patch: https://github.com/kamailio/kamailio/commit/1980c79d4fb2111c8c245045035f4ec… --- diff --git a/tcp_read.c b/tcp_read.c index bf07574..84ddf90 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -186,6 +186,25 @@ 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) +{ + int ret; + tcp_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; + tev.con = con; + ret = sr_event_exec(SREV_TCP_CLOSED, (void*)(&tev)); + } else { + LM_DBG("no callback registering for handling TCP closed event - dropping!\n"); + } + return ret; +} + /** reads data from an existing tcp connection. * Side-effects: blacklisting, sets connection state to S_CONN_OK, tcp stats. @@ -272,12 +291,20 @@ int tcp_read_data(int fd, struct tcp_connection *c, strerror(errno), errno, ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, 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); + } + 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); + } LM_DBG("EOF on %p, FD %d ([%s]:%u -> [%s]:%u)\n", c, fd, ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);

1 0

git:master:fa6465f9: core: added event callback field for tcp closed connection
by Daniel-Constantin Mierla 04 Jan '16

04 Jan '16

Module: kamailio Branch: master Commit: fa6465f92adf372c3307211a05688a2482d89353 URL: https://github.com/kamailio/kamailio/commit/fa6465f92adf372c3307211a05688a2… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-04T23:04:37+01:00 core: added event callback field for tcp closed connection --- Modified: events.c Modified: events.h --- Diff: https://github.com/kamailio/kamailio/commit/fa6465f92adf372c3307211a05688a2… Patch: https://github.com/kamailio/kamailio/commit/fa6465f92adf372c3307211a05688a2… --- diff --git a/events.c b/events.c index 5312e7a..bb1373a 100644 --- a/events.c +++ b/events.c @@ -165,6 +165,11 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.rcv_nosip = f; else return -1; break; + case SREV_TCP_CLOSED: + if(_sr_events_list.tcp_closed==0) + _sr_events_list.tcp_closed = f; + else return -1; + break; default: return -1; } @@ -284,6 +289,12 @@ int sr_event_exec(int type, void *data) ret = _sr_events_list.rcv_nosip(data); return ret; } else return 1; + case SREV_TCP_CLOSED: + if(unlikely(_sr_events_list.tcp_closed!=0)) + { + ret = _sr_events_list.tcp_closed(data); + return ret; + } else return 1; default: return -1; } @@ -319,6 +330,8 @@ int sr_event_enabled(int type) return (_sr_events_list.stun_in!=0)?1:0; case SREV_RCV_NOSIP: return (_sr_events_list.rcv_nosip!=0)?1:0; + case SREV_TCP_CLOSED: + return (_sr_events_list.tcp_closed!=0)?1:0; } return 0; } diff --git a/events.h b/events.h index 8218453..2946d94 100644 --- a/events.h +++ b/events.h @@ -34,6 +34,7 @@ #define SREV_TCP_WS_FRAME_IN 10 #define SREV_TCP_WS_FRAME_OUT 11 #define SREV_STUN_IN 12 +#define SREV_TCP_CLOSED 13 #define SREV_CB_LIST_SIZE 3 @@ -52,6 +53,7 @@ typedef struct sr_event_cb { sr_event_cb_f tcp_ws_frame_out; sr_event_cb_f stun_in; sr_event_cb_f rcv_nosip; + sr_event_cb_f tcp_closed; } sr_event_cb_t; void sr_event_cb_init(void);

1 0

git:master:6fe2b87e: core: fixed debug message warning
by Daniel-Constantin Mierla 04 Jan '16

04 Jan '16

Module: kamailio Branch: master Commit: 6fe2b87e1a6dff2a4351d83e91bd0de809530241 URL: https://github.com/kamailio/kamailio/commit/6fe2b87e1a6dff2a4351d83e91bd0de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-01-04T22:56:55+01:00 core: fixed debug message warning --- Modified: socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/6fe2b87e1a6dff2a4351d83e91bd0de… Patch: https://github.com/kamailio/kamailio/commit/6fe2b87e1a6dff2a4351d83e91bd0de… --- diff --git a/socket_info.c b/socket_info.c index e2d9147..d06fdcf 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1221,7 +1221,9 @@ int add_interfaces(char* if_name, int family, unsigned short port, ret = -1; break; } - LM_DBG("If: %8s Fam: %8x Flg: %16lx Adr: %s\n", ifa->ifa_name, ifa->ifa_addr->sa_family, ifa->ifa_flags, tmp); + LM_DBG("If: %8s Fam: %8x Flg: %16lx Adr: %s\n", + ifa->ifa_name, ifa->ifa_addr->sa_family, + (unsigned long)ifa->ifa_flags, tmp); ret = 0; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016