sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:4.4:ad00a617: sipcapture: fix captid extraction from hep header for v3

by grumvalski

Module: kamailio Branch: 4.4 Commit: ad00a617dec57073a1e9facc64cf3a64904c6592 URL: https://github.com/kamailio/kamailio/commit/ad00a617dec57073a1e9facc64cf3a6… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2016-12-01T14:15:34+01:00 sipcapture: fix captid extraction from hep header for v3 (cherry picked from commit 969f4600193139d95b5f876378e0c92d4eab9a7a) --- Modified: modules/sipcapture/hep.c Modified: modules/sipcapture/hep.h Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/ad00a617dec57073a1e9facc64cf3a6… Patch: https://github.com/kamailio/kamailio/commit/ad00a617dec57073a1e9facc64cf3a6…

7 years, 4 months

git:4.4:6291792e: sipcapture: perform ntohs on src and dst port when payload is not SIP

by grumvalski

Module: kamailio Branch: 4.4 Commit: 6291792ecaee0bfb1855bf6ba4560e4d6af09f3e URL: https://github.com/kamailio/kamailio/commit/6291792ecaee0bfb1855bf6ba4560e4… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2016-12-01T14:04:45+01:00 sipcapture: perform ntohs on src and dst port when payload is not SIP (cherry picked from commit 1fbca28c3a6e90ca478d152e116aca5e64780e9e) --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/6291792ecaee0bfb1855bf6ba4560e4… Patch: https://github.com/kamailio/kamailio/commit/6291792ecaee0bfb1855bf6ba4560e4… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 57f1c05..7b2f4b7 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2285,11 +2285,11 @@ int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_re /*source ip*/ sco.source_ip.s = ipstr_src; sco.source_ip.len = strlen(ipstr_src); - sco.source_port = hg->src_port->data; + sco.source_port = ntohs(hg->src_port->data); sco.destination_ip.s = ipstr_dst; sco.destination_ip.len = strlen(ipstr_dst); - sco.destination_port = hg->dst_port->data; + sco.destination_port = ntohs(hg->dst_port->data); if(heptime && heptime->tv_sec != 0) { sco.tmstamp = (unsigned long long)heptime->tv_sec*1000000+heptime->tv_usec; /* micro ts */

7 years, 4 months

[kamailio/kamailio] Sipcapture fixes (#874)

by Federico Cabiddu

Two fixes in this PR. The first is to perform the ntohs also on hep messaging carrying payload other than SIP. The scond is to take in count the definition of captid chunk in HEPv3 (uint32 BE) different from the one for HEPv2 (uint16 LE). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/874 -- Commit Summary -- * sipcapture: perform ntohs on src and dst port when payload is not SIP * sipcapture: fix captid extraction from hep header for v3 -- File Changes -- M modules/sipcapture/hep.c (18) M modules/sipcapture/hep.h (6) M modules/sipcapture/sipcapture.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/874.patch https://github.com/kamailio/kamailio/pull/874.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/874

7 years, 4 months

git:master:97492c52: Merge pull request #874 from grumvalski/sipcapture-fixes

by GitHub

Module: kamailio Branch: master Commit: 97492c5284b4fa5ec3eab123272abbdca67e3447 URL: https://github.com/kamailio/kamailio/commit/97492c5284b4fa5ec3eab123272abbd… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-12-01T13:55:30+01:00 Merge pull request #874 from grumvalski/sipcapture-fixes Sipcapture fixes --- Modified: modules/sipcapture/hep.c Modified: modules/sipcapture/hep.h Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/97492c5284b4fa5ec3eab123272abbd… Patch: https://github.com/kamailio/kamailio/commit/97492c5284b4fa5ec3eab123272abbd…

7 years, 4 months

git:master:969f4600: sipcapture: fix captid extraction from hep header for v3

by grumvalski

Module: kamailio Branch: master Commit: 969f4600193139d95b5f876378e0c92d4eab9a7a URL: https://github.com/kamailio/kamailio/commit/969f4600193139d95b5f876378e0c92… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2016-11-30T18:23:46+01:00 sipcapture: fix captid extraction from hep header for v3 --- Modified: modules/sipcapture/hep.c Modified: modules/sipcapture/hep.h Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/969f4600193139d95b5f876378e0c92… Patch: https://github.com/kamailio/kamailio/commit/969f4600193139d95b5f876378e0c92…

7 years, 4 months

git:master:1fbca28c: sipcapture: perform ntohs on src and dst port when payload is not SIP

by grumvalski

Module: kamailio Branch: master Commit: 1fbca28c3a6e90ca478d152e116aca5e64780e9e URL: https://github.com/kamailio/kamailio/commit/1fbca28c3a6e90ca478d152e116aca5… Author: Federico Cabiddu <fcabiddu(a)libon.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2016-11-30T18:23:46+01:00 sipcapture: perform ntohs on src and dst port when payload is not SIP --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/1fbca28c3a6e90ca478d152e116aca5… Patch: https://github.com/kamailio/kamailio/commit/1fbca28c3a6e90ca478d152e116aca5… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 19ffbe6..84bc6ed 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2372,11 +2372,11 @@ int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_re /*source ip*/ sco.source_ip.s = ipstr_src; sco.source_ip.len = strlen(ipstr_src); - sco.source_port = hg->src_port->data; + sco.source_port = ntohs(hg->src_port->data); sco.destination_ip.s = ipstr_dst; sco.destination_ip.len = strlen(ipstr_dst); - sco.destination_port = hg->dst_port->data; + sco.destination_port = ntohs(hg->dst_port->data); if(heptime && heptime->tv_sec != 0) { sco.tmstamp = (unsigned long long)heptime->tv_sec*1000000+heptime->tv_usec; /* micro ts */

7 years, 4 months

git:master:0527dea7: modules: readme files regenerated - acc_radius ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 0527dea7022551f45990d5be88731c014a3d050a URL: https://github.com/kamailio/kamailio/commit/0527dea7022551f45990d5be88731c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-01T13:17:09+01:00 modules: readme files regenerated - acc_radius ... --- Modified: modules/acc_radius/README Modified: modules/http_async_client/README Modified: modules/ims_qos/README Modified: modules/ims_usrloc_pcscf/README Modified: modules/nsq/README Modified: modules/rtpengine/README Modified: modules/sdpops/README Modified: modules/ss7ops/README --- Diff: https://github.com/kamailio/kamailio/commit/0527dea7022551f45990d5be88731c0… Patch: https://github.com/kamailio/kamailio/commit/0527dea7022551f45990d5be88731c0…

7 years, 4 months

git:master:25946c10: tm: converted log messages to use macros with prefix

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 25946c1094f495090d0c20c5e4ce84010555bcef URL: https://github.com/kamailio/kamailio/commit/25946c1094f495090d0c20c5e4ce840… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-01T13:13:13+01:00 tm: converted log messages to use macros with prefix - coherent indentation and whitespacing for msg builder code --- Modified: modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/25946c1094f495090d0c20c5e4ce840… Patch: https://github.com/kamailio/kamailio/commit/25946c1094f495090d0c20c5e4ce840…

7 years, 4 months

git:master:49d43d78: ss7ops: fix the dobook markdown and properly named the sections

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 49d43d789eb0cecdfd60c5c43a0cf478e101cd47 URL: https://github.com/kamailio/kamailio/commit/49d43d789eb0cecdfd60c5c43a0cf47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-01T12:37:39+01:00 ss7ops: fix the dobook markdown and properly named the sections --- Modified: modules/ss7ops/doc/ss7ops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/49d43d789eb0cecdfd60c5c43a0cf47… Patch: https://github.com/kamailio/kamailio/commit/49d43d789eb0cecdfd60c5c43a0cf47… --- diff --git a/modules/ss7ops/doc/ss7ops_admin.xml b/modules/ss7ops/doc/ss7ops_admin.xml index f38ee6c..fc28573 100644 --- a/modules/ss7ops/doc/ss7ops_admin.xml +++ b/modules/ss7ops/doc/ss7ops_admin.xml @@ -35,26 +35,37 @@ </itemizedlist> </para> </section> - </section> <section> - <title>Parameters</title> - <section id="ss7ops.p.isup_to_json"> - <title><varname>isup_to_json</varname> (integer)</title> + <title>Functions</title> + <section id="ss7ops.f.isup_to_json"> + <function moreinfo="none">isup_to_json(proto)</function> + <title><varname>isup_to_json</varname></title> + <para> + Pass the HEP protocol type as parameter (e.g. 8 for M2UA) and the + contained ISUP payload will be converted to a JSON string. The result + can be accessed using the $isup(1) variable. + </para> <para> - Pass the HEP type as parameter (e.g. 8 for M2UA) and the contained - ISUP payload will be converted to a JSON string. It can be consumed - using the $isup(1) parameter. + <example> + <title><function>isup_to_json</function> usage</title> + <programlisting format="linespecific"> +... +isup_to_json(8); +... +</programlisting> + </example> </para> </section> </section> <section> - <title>Functions</title> + <title>Variables</title> <section id="ss7ops.f.isup"> - <title><varname>isup</varname> (integer)</title> + <title><varname>isup(id)</varname></title> <para> - If set to 1, return the JSON representation as string for the last + If id is set to 1, return the JSON representation as string for the last message that was parsed. </para> </section> + </section> </chapter>

7 years, 4 months

git:master:4991821d: ss7ops: safety check before freeing allocated isup json buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4991821daf9053cdd68957b18bfa23b8e906a00e URL: https://github.com/kamailio/kamailio/commit/4991821daf9053cdd68957b18bfa23b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-01T12:37:06+01:00 ss7ops: safety check before freeing allocated isup json buffer --- Modified: modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4991821daf9053cdd68957b18bfa23b… Patch: https://github.com/kamailio/kamailio/commit/4991821daf9053cdd68957b18bfa23b… --- diff --git a/modules/ss7ops/ss7ops_mod.c b/modules/ss7ops/ss7ops_mod.c index 26aaeb6..efeb816 100644 --- a/modules/ss7ops/ss7ops_mod.c +++ b/modules/ss7ops/ss7ops_mod.c @@ -61,7 +61,7 @@ struct mtp_level_3_hdr { * ss7 module - helper module to convert M2UA/ISUP to JSON * */ -static const char *isup_last; +static const char *isup_last = NULL; static int w_isup_to_json(struct sip_msg* _m, char* param1, char* param2); static int pv_get_isup(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); @@ -259,7 +259,7 @@ static int w_isup_to_json(struct sip_msg *_m, char *param1, char *param2) int opc, dpc, mtp_type, int_len, rc; size_t len; - free((char *) isup_last); + if(isup_last) free((char *) isup_last); isup_last = NULL; data = fetch_payload(_m, "$var(payload)", &int_len);

7 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016