sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
302 discussions

Roadmap to Kamailio v5.1
by Daniel-Constantin Mierla 16 Oct '17

16 Oct '17

Hello, being discussed at the previous IRC devel meeting before the summer, it's time to plan the preparation for next major release, respectively Kamailio 5.1 series. As an initial proposal, a timeline can be: - Mon, Oct 16, 2017 - freeze the development - in 3-4 weeks after that, create the branch 5.1 - 2-3 weeks after, do the release of v5.1.0 That means more or less by end of November we will have first version of 5.1 series. There are still 4 weeks of development, hopefully enough to get ongoing work finished. I know from github tracker that there are people working on redis support for usrloc. I will focus on exporting more functions to kemi, right now should be around 60%, by freeze should be more than 80% (likely that means all of what most of people use these days, because there are some modules that I guess are not much used). Maybe one or two modules will be pushed as well from my side. I think we should also do an IRC devel meeting to try to sync better on this. Maybe by mid of next week, I will send another email shortly. Should anyone have more details to add or adjust the proposal, do not hesitate to reply to mailing list! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 2

git:master:14a3bd9e: sipdump: write proto and af for each sip message
by Daniel-Constantin Mierla 15 Oct '17

15 Oct '17

Module: kamailio Branch: master Commit: 14a3bd9eae7f3cb6af9d4b6e4250ab6c468c8b9f URL: https://github.com/kamailio/kamailio/commit/14a3bd9eae7f3cb6af9d4b6e4250ab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-15T10:01:25+02:00 sipdump: write proto and af for each sip message --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/14a3bd9eae7f3cb6af9d4b6e4250ab6… Patch: https://github.com/kamailio/kamailio/commit/14a3bd9eae7f3cb6af9d4b6e4250ab6… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 5971322971..cb8651e0b0 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -152,7 +152,6 @@ typedef struct sipdump_info { str buf; str af; str proto; - str subproto; str src_ip; int src_port; str dst_ip; @@ -177,6 +176,7 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) "process: %d\n" "time: %lu.%06lu\n" "date: %s" + "proto: %.*s %.*s\n" "srcip: %.*s\n" "srcport: %d\n" "dstip: %.*s\n" @@ -189,6 +189,7 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) process_no, (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec, asctime(ti), + sdi->proto.len, sdi->proto.s, sdi->af.len, sdi->af.s, sdi->src_ip.len, sdi->src_ip.s, sdi->src_port, sdi->dst_ip.len, sdi->dst_ip.s, sdi->dst_port, sdi->buf.len, sdi->buf.s @@ -229,6 +230,16 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) sdi.dst_port = (int)msg->rcv.bind_address->port_no; } + sdi.af.len = 4; + if(msg->rcv.bind_address->address.af==AF_INET6) { + sdi.af.s = "ipv6"; + } else { + sdi.af.s = "ipv4"; + } + sdi.proto.s = "none"; + sdi.proto.len = 4; + get_valid_proto_string(msg->rcv.proto, 0, 0, &sdi.proto); + if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1; @@ -288,6 +299,15 @@ int sipdump_msg_received(sr_event_param_t *evp) sdi.dst_ip = evp->rcv->bind_address->address_str; sdi.dst_port = (int)evp->rcv->bind_address->port_no; } + sdi.af.len = 4; + if(evp->rcv->bind_address->address.af==AF_INET6) { + sdi.af.s = "ipv6"; + } else { + sdi.af.s = "ipv4"; + } + sdi.proto.s = "none"; + sdi.proto.len = 4; + get_valid_proto_string(evp->rcv->proto, 0, 0, &sdi.proto); if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1; @@ -326,6 +346,16 @@ int sipdump_msg_sent(sr_event_param_t *evp) sdi.dst_ip.s = dstip_buf; sdi.dst_port = (int)su_getport(&evp->dst->to); + sdi.af.len = 4; + if(evp->dst->send_sock->address.af==AF_INET6) { + sdi.af.s = "ipv6"; + } else { + sdi.af.s = "ipv4"; + } + sdi.proto.s = "none"; + sdi.proto.len = 4; + get_valid_proto_string(evp->dst->proto, 0, 0, &sdi.proto); + if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1;

1 0

git:master:868208c0: sipdump: log src and dst ip and port
by Daniel-Constantin Mierla 14 Oct '17

14 Oct '17

Module: kamailio Branch: master Commit: 868208c0bd26bd9d8f72e548075606c4f3c82f33 URL: https://github.com/kamailio/kamailio/commit/868208c0bd26bd9d8f72e548075606c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-14T11:16:00+02:00 sipdump: log src and dst ip and port --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/868208c0bd26bd9d8f72e548075606c… Patch: https://github.com/kamailio/kamailio/commit/868208c0bd26bd9d8f72e548075606c… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index e7ba0a69a5..5971322971 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -150,8 +150,9 @@ static char _sipdump_wbuf[SIPDUMP_WBUF_SIZE]; typedef struct sipdump_info { str tag; str buf; - int af; - int proto; + str af; + str proto; + str subproto; str src_ip; int src_port; str dst_ip; @@ -176,6 +177,10 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) "process: %d\n" "time: %lu.%06lu\n" "date: %s" + "srcip: %.*s\n" + "srcport: %d\n" + "dstip: %.*s\n" + "dstport: %d\n" "~~~~~~~~~~~~~~~~~~~~\n" "%.*s" "||||||||||||||||||||\n", @@ -184,6 +189,8 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) process_no, (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec, asctime(ti), + sdi->src_ip.len, sdi->src_ip.s, sdi->src_port, + sdi->dst_ip.len, sdi->dst_ip.s, sdi->dst_port, sdi->buf.len, sdi->buf.s ); obuf->s = _sipdump_wbuf; @@ -198,6 +205,7 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) { str wdata; sipdump_info_t sdi; + char srcip_buf[IP_ADDR_MAX_STRZ_SIZE]; if(!sipdump_enabled()) return 1; @@ -207,6 +215,19 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) sdi.buf.s = msg->buf; sdi.buf.len = msg->len; sdi.tag = *stag; + sdi.src_ip.len = ip_addr2sbufz(&msg->rcv.src_ip, srcip_buf, + IP_ADDR_MAX_STRZ_SIZE); + sdi.src_ip.s = srcip_buf; + sdi.src_port = msg->rcv.src_port; + if(msg->rcv.bind_address==NULL + || msg->rcv.bind_address->address_str.s==NULL) { + sdi.dst_ip.len = 7; + sdi.dst_ip.s = "0.0.0.0"; + sdi.dst_port = 0; + } else { + sdi.dst_ip = msg->rcv.bind_address->address_str; + sdi.dst_port = (int)msg->rcv.bind_address->port_no; + } if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); @@ -244,7 +265,8 @@ int sipdump_msg_received(sr_event_param_t *evp) { str wdata; sipdump_info_t sdi; - + char srcip_buf[IP_ADDR_MAX_STRZ_SIZE]; + if(!sipdump_enabled()) return 0; @@ -253,7 +275,19 @@ int sipdump_msg_received(sr_event_param_t *evp) sdi.buf = *((str*)evp->data); sdi.tag.s = "rcv"; sdi.tag.len = 3; - + sdi.src_ip.len = ip_addr2sbufz(&evp->rcv->src_ip, srcip_buf, + IP_ADDR_MAX_STRZ_SIZE); + sdi.src_ip.s = srcip_buf; + sdi.src_port = evp->rcv->src_port; + if(evp->rcv->bind_address==NULL + || evp->rcv->bind_address->address_str.s==NULL) { + sdi.dst_ip.len = 7; + sdi.dst_ip.s = "0.0.0.0"; + sdi.dst_port = 0; + } else { + sdi.dst_ip = evp->rcv->bind_address->address_str; + sdi.dst_port = (int)evp->rcv->bind_address->port_no; + } if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1; @@ -273,7 +307,9 @@ int sipdump_msg_sent(sr_event_param_t *evp) { str wdata; sipdump_info_t sdi; - + ip_addr_t ip; + char dstip_buf[IP_ADDR_MAX_STRZ_SIZE]; + if(!sipdump_enabled()) return 0; @@ -283,6 +319,13 @@ int sipdump_msg_sent(sr_event_param_t *evp) sdi.tag.s = "snd"; sdi.tag.len = 3; + sdi.src_ip = evp->dst->send_sock->address_str; + sdi.src_port = (int)evp->dst->send_sock->port_no; + su2ip_addr(&ip, &evp->dst->to); + sdi.dst_ip.len = ip_addr2sbufz(&ip, dstip_buf, IP_ADDR_MAX_STRZ_SIZE); + sdi.dst_ip.s = dstip_buf; + sdi.dst_port = (int)su_getport(&evp->dst->to); + if(sipdump_buffer_write(&sdi, &wdata)<0) { LM_ERR("failed to write to buffer\n"); return -1;

1 0

git:master:3565caf3: core: set receive infor for sr event SREV_NET_DATA_IN
by Daniel-Constantin Mierla 14 Oct '17

14 Oct '17

Module: kamailio Branch: master Commit: 3565caf3b0f2ac28f7d2993213e4d3ef6a21a2fb URL: https://github.com/kamailio/kamailio/commit/3565caf3b0f2ac28f7d2993213e4d3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-14T10:43:45+02:00 core: set receive infor for sr event SREV_NET_DATA_IN --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/3565caf3b0f2ac28f7d2993213e4d3e… Patch: https://github.com/kamailio/kamailio/commit/3565caf3b0f2ac28f7d2993213e4d3e… --- diff --git a/src/core/receive.c b/src/core/receive.c index 28c2c7971a..bb9342a414 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -149,6 +149,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) inb.s = buf; inb.len = len; evp.data = (void*)&inb; + evp.rcv = rcv_info; sr_event_exec(SREV_NET_DATA_IN, &evp); len = inb.len;

1 0

git:master:344df709: core: added field for receive info inside sr_event_param_t
by Daniel-Constantin Mierla 14 Oct '17

14 Oct '17

Module: kamailio Branch: master Commit: 344df7099435dcc76bf052cf2a020b3512ad153b URL: https://github.com/kamailio/kamailio/commit/344df7099435dcc76bf052cf2a020b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-14T10:42:52+02:00 core: added field for receive info inside sr_event_param_t --- Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/344df7099435dcc76bf052cf2a020b3… Patch: https://github.com/kamailio/kamailio/commit/344df7099435dcc76bf052cf2a020b3… --- diff --git a/src/core/events.h b/src/core/events.h index f2f63bc016..191fe85cc8 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -42,6 +42,7 @@ typedef struct sr_event_param { void *data; + receive_info_t* rcv; dest_info_t *dst; } sr_event_param_t;

1 0

git:master:62d9eb79: core: compacted typedefs for ip addr structs
by Daniel-Constantin Mierla 14 Oct '17

14 Oct '17

Module: kamailio Branch: master Commit: 62d9eb79b9c461df8a21eba928a31f8bd4d85c48 URL: https://github.com/kamailio/kamailio/commit/62d9eb79b9c461df8a21eba928a31f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-14T10:41:32+02:00 core: compacted typedefs for ip addr structs --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/62d9eb79b9c461df8a21eba928a31f8… Patch: https://github.com/kamailio/kamailio/commit/62d9eb79b9c461df8a21eba928a31f8…

1 0

[kamailio/kamailio] sipcapture: fix HEP3 capture-id >= 2^16 (#1272)
by Bastian Triller 13 Oct '17

13 Oct '17

(cherry picked from commit dbd57c3eac30e1de54d98eb2ba8f608a17f7adbf)   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1272 -- Commit Summary -- * sipcapture: fix HEP3 capture-id >= 2^16 -- File Changes -- M modules/sipcapture/sipcapture.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1272.patch https://github.com/kamailio/kamailio/pull/1272.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/1272

2 2

git:4.4:3794ecf8: Merge pull request #1272 from btriller/fix-hep3-capture-id-backport-4.4
by GitHub 13 Oct '17

13 Oct '17

Module: kamailio Branch: 4.4 Commit: 3794ecf832925e71dd6834c711388801aa60c274 URL: https://github.com/kamailio/kamailio/commit/3794ecf832925e71dd6834c71138880… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-13T20:10:17+02:00 Merge pull request #1272 from btriller/fix-hep3-capture-id-backport-4.4 sipcapture: fix HEP3 capture-id >= 2^16 --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/3794ecf832925e71dd6834c71138880… Patch: https://github.com/kamailio/kamailio/commit/3794ecf832925e71dd6834c71138880… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index fb999360a5..e80158b82e 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -257,7 +257,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timehdr* heptime; +struct hep_timeinfo* heptime; /*! \brief * Exported functions @@ -1112,7 +1112,7 @@ static int child_init(int rank) } - heptime = (struct hep_timehdr*)pkg_malloc(sizeof(struct hep_timehdr)); + heptime = (struct hep_timeinfo*)pkg_malloc(sizeof(struct hep_timeinfo)); if(heptime==NULL) { LM_ERR("no more pkg memory left\n"); return -1;

1 0

git:4.4:0367cdcd: sipcapture: fix HEP3 capture-id >= 2^16
by Bastian Triller 13 Oct '17

13 Oct '17

Module: kamailio Branch: 4.4 Commit: 0367cdcd094566657cc8ec1b22790d1f927993cd URL: https://github.com/kamailio/kamailio/commit/0367cdcd094566657cc8ec1b22790d1… Author: Bastian Triller <btriller(a)broadsoft.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2017-10-13T16:53:08+02:00 sipcapture: fix HEP3 capture-id >= 2^16 (cherry picked from commit dbd57c3eac30e1de54d98eb2ba8f608a17f7adbf) --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/0367cdcd094566657cc8ec1b22790d1… Patch: https://github.com/kamailio/kamailio/commit/0367cdcd094566657cc8ec1b22790d1… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index fb999360a5..e80158b82e 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -257,7 +257,7 @@ enum hash_source source = hs_error; //unsigned int rr_idx = 0; -struct hep_timehdr* heptime; +struct hep_timeinfo* heptime; /*! \brief * Exported functions @@ -1112,7 +1112,7 @@ static int child_init(int rank) } - heptime = (struct hep_timehdr*)pkg_malloc(sizeof(struct hep_timehdr)); + heptime = (struct hep_timeinfo*)pkg_malloc(sizeof(struct hep_timeinfo)); if(heptime==NULL) { LM_ERR("no more pkg memory left\n"); return -1;

1 0

git:master:98609436: sipdump: implemented sipdump.enable rpc command
by Daniel-Constantin Mierla 13 Oct '17

13 Oct '17

Module: kamailio Branch: master Commit: 986094362b8ff384cc0378a7028425ea092609aa URL: https://github.com/kamailio/kamailio/commit/986094362b8ff384cc0378a7028425e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-13T12:33:30+02:00 sipdump: implemented sipdump.enable rpc command --- Modified: src/modules/sipdump/sipdump_mod.c Modified: src/modules/sipdump/sipdump_write.c Modified: src/modules/sipdump/sipdump_write.h --- Diff: https://github.com/kamailio/kamailio/commit/986094362b8ff384cc0378a7028425e… Patch: https://github.com/kamailio/kamailio/commit/986094362b8ff384cc0378a7028425e… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 48a77ada76..e7ba0a69a5 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -94,6 +94,11 @@ struct module_exports exports = { */ static int mod_init(void) { + if(sipdump_rpc_init()<0) { + LM_ERR("failed to register rpc commands\n"); + return -1; + } + if(sipdump_file_init(&sipdump_folder, &sipdump_fprefix) < 0) { LM_ERR("cannot initialize storage file\n"); return -1; diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 7d76715c7d..8d8c890721 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -27,6 +27,8 @@ #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/rpc.h" +#include "../../core/rpc_lookup.h" #include "sipdump_write.h" @@ -226,3 +228,63 @@ void sipdump_timer_exec(unsigned int ticks, void *param) shm_free(sdd); } } + +static const char *sipdump_rpc_enable_doc[2] = { + "Command to control sipdump enable value", 0}; + + +/* +* RPC command to control sipdump enable +*/ +static void sipdump_rpc_enable(rpc_t *rpc, void *ctx) +{ + int enval = -1; + int oval = 0; + int nval = 0; + + void *th; + + if(rpc->scan(ctx, "*d", &enval) != 1) { + enval = -1; + } + + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + + if(_sipdump_list) { + oval = _sipdump_list->enable; + if(enval==0 || enval==1) { + _sipdump_list->enable = enval; + nval = enval; + } else { + nval = oval; + } + } + + if(rpc->struct_add(th, "dd", "oldval", oval, "newval", nval) < 0) { + rpc->fault(ctx, 500, "Internal error reply structure"); + return; + } +} + +/* clang-format off */ +rpc_export_t sipdump_rpc_cmds[] = { + {"sipdump.enable", sipdump_rpc_enable, + sipdump_rpc_enable_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ + +/** + * register RPC commands + */ +int sipdump_rpc_init(void) +{ + if(rpc_register_array(sipdump_rpc_cmds) != 0) { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +} \ No newline at end of file diff --git a/src/modules/sipdump/sipdump_write.h b/src/modules/sipdump/sipdump_write.h index e9d5de4131..611fd10fd9 100644 --- a/src/modules/sipdump/sipdump_write.h +++ b/src/modules/sipdump/sipdump_write.h @@ -51,4 +51,6 @@ int sipdump_file_init(str *folder, str *fprefix); int sipdump_enabled(void); +int sipdump_rpc_init(void); + #endif

2 3

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017