sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:2c5c6d98: modules: readme files regenerated - htable ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 2c5c6d9859d7be06af33cca44b003a3092bf1096 URL: https://github.com/kamailio/kamailio/commit/2c5c6d9859d7be06af33cca44b003a3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-24T09:01:42+01:00 modules: readme files regenerated - htable ... --- Modified: src/modules/htable/README Modified: src/modules/mtree/README --- Diff: https://github.com/kamailio/kamailio/commit/2c5c6d9859d7be06af33cca44b003a3… Patch: https://github.com/kamailio/kamailio/commit/2c5c6d9859d7be06af33cca44b003a3…

8 years

git:master:0fb39b3d: htable: removed mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0fb39b3d6081dbb61d7d519d1033e630fd19e366 URL: https://github.com/kamailio/kamailio/commit/0fb39b3d6081dbb61d7d519d1033e63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-24T08:46:27+01:00 htable: removed mi commands --- Modified: src/modules/htable/Makefile Modified: src/modules/htable/doc/htable_admin.xml Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/0fb39b3d6081dbb61d7d519d1033e63… Patch: https://github.com/kamailio/kamailio/commit/0fb39b3d6081dbb61d7d519d1033e63…

8 years

git:master:b16d00ff: mtree: removed mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b16d00ff386d833bb51805c4901f4e62352cdfca URL: https://github.com/kamailio/kamailio/commit/b16d00ff386d833bb51805c4901f4e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-24T08:46:27+01:00 mtree: removed mi commands --- Modified: src/modules/mtree/Makefile Modified: src/modules/mtree/doc/mtree_admin.xml Modified: src/modules/mtree/mtree.c Modified: src/modules/mtree/mtree.h Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b16d00ff386d833bb51805c4901f4e6… Patch: https://github.com/kamailio/kamailio/commit/b16d00ff386d833bb51805c4901f4e6…

8 years

git:master:8b9eec6e: modules: readme files regenerated - dispatcher ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 8b9eec6e215053d0042ba69f6a303842cc39787b URL: https://github.com/kamailio/kamailio/commit/8b9eec6e215053d0042ba69f6a30384… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-23T19:16:13+01:00 modules: readme files regenerated - dispatcher ... --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/8b9eec6e215053d0042ba69f6a30384… Patch: https://github.com/kamailio/kamailio/commit/8b9eec6e215053d0042ba69f6a30384…

8 years

git:master:f3e903fe: dispatcher: removed mi commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f3e903fe579dcfe0d476153c69d2981b63161426 URL: https://github.com/kamailio/kamailio/commit/f3e903fe579dcfe0d476153c69d2981… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-23T19:07:01+01:00 dispatcher: removed mi commands - rpc commands have to be used instead --- Modified: src/modules/dispatcher/Makefile Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f3e903fe579dcfe0d476153c69d2981… Patch: https://github.com/kamailio/kamailio/commit/f3e903fe579dcfe0d476153c69d2981…

8 years

git:master:1460d444: jsonrpcs: print log messages in case of errors inside struct_add

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1460d4448aa0c64569a6f35347f46d7df4dbcd09 URL: https://github.com/kamailio/kamailio/commit/1460d4448aa0c64569a6f35347f46d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-23T15:07:34+01:00 jsonrpcs: print log messages in case of errors inside struct_add --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1460d4448aa0c64569a6f35347f46d7… Patch: https://github.com/kamailio/kamailio/commit/1460d4448aa0c64569a6f35347f46d7… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 8bb2f6c..c9ccea3 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -741,7 +741,10 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) nj = jsonrpc_print_value(ctx, *fmt, &ap); } - if(nj==NULL) goto err; + if(nj==NULL) { + LM_ERR("failed to print the value (%c)\n", *fmt); + goto err; + } if(isobject) { /* add as member to object */ srjson_AddItemToObject(ctx->jrpl, jnode, mname.s, nj); @@ -749,6 +752,7 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) /* wrap member in a new object and add to array */ wj = srjson_CreateObject(ctx->jrpl); if(wj==NULL) { + LM_ERR("failed to create object (%c)\n", *fmt); srjson_Delete(ctx->jrpl, nj); goto err; }

8 years

Merry Christmas to all Kamailians

by Olle E. Johansson

Friends, Trying to calm down and prepare for Christmas with the family. It’s been another great year for Kamailio and I’m proud to be part of the Kamailio development community. We’ve made great releases, had a great conference and overall done good stuff :-) For all of you that celebrate Christmas - a Merry Christmas! To the rest of you: Happy Holidays! A big Thank You to all developers and a special giga-Thank You to Daniel for all the time you spend working with the code, helping out in discussions on the lists and in the bug tracker. And to all of you in the community - Thank You for being part of this! Greetings from a cold Sweden, currently without snow in my area just north of Stockholm. We celebrate on Christmas Eve (tomorrow) so there’s a lot of food being prepared right now and the last minute shopping is just about to start... Keep your Kamailio running! /Olle PS. If you are not currently following the project on Twitter - it’s time! Find us as @kamailioproject

8 years

git:master:9f3c45b8: ss7ops: Enable M2PA encapsulation in addition to M2UA

by Holger Hans Peter Freyther

Module: kamailio Branch: master Commit: 9f3c45b8967510e9c81aeb433c2ec14bcd58295c URL: https://github.com/kamailio/kamailio/commit/9f3c45b8967510e9c81aeb433c2ec14… Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Committer: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: 2016-12-22T15:57:37+01:00 ss7ops: Enable M2PA encapsulation in addition to M2UA Add support for M2PA encapsulation on top of M2UA. It will only handle data messages as these can contain isup. --- Modified: src/modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9f3c45b8967510e9c81aeb433c2ec14… Patch: https://github.com/kamailio/kamailio/commit/9f3c45b8967510e9c81aeb433c2ec14… --- diff --git a/src/modules/ss7ops/ss7ops_mod.c b/src/modules/ss7ops/ss7ops_mod.c index cc9ddfb..ad2e448 100644 --- a/src/modules/ss7ops/ss7ops_mod.c +++ b/src/modules/ss7ops/ss7ops_mod.c @@ -29,12 +29,17 @@ MODULE_VERSION /* hep defines */ #define HEP_M2UA 0x08 +#define HEP_M2PA 0x0d /* M2UA messages */ #define M2UA_MSG 6 #define M2UA_DATA 1 #define M2UA_IE_DATA 0x0300 +/* M2PA messages */ +#define M2PA_CLASS 11 +#define M2PA_DATA 1 + /* MTPl3 */ #define MTP_ISUP 0x05 @@ -188,6 +193,65 @@ static const uint8_t *extract_from_m2ua(const uint8_t *data, size_t *len) return NULL; } +static const uint8_t *extract_from_m2pa(const uint8_t *data, size_t *len) +{ + uint32_t data_len; + + if (*len < 8) { + LM_ERR("M2PA hdr too short %zu\n", *len); + return NULL; + } + + /* check the header */ + if (data[0] != 0x01) { + LM_ERR("M2PA unknown version number %d\n", data[0]); + return NULL; + } + if (data[1] != 0x00) { + LM_ERR("M2PA unknown reserved fields %d\n", data[1]); + return NULL; + } + if (data[2] != M2PA_CLASS) { + LM_ERR("M2PA unhandled message class %d\n", data[2]); + return NULL; + } + if (data[3] != M2PA_DATA) { + LM_ERR("M2PA not data msg but %d\n", data[3]); + return NULL; + } + + /* check the length */ + memcpy(&data_len, &data[4], sizeof(data_len)); + data_len = ntohl(data_len); + if (*len < data_len) { + LM_ERR("M2PA data can't fit %zu vs. %u\n", *len, data_len); + return NULL; + } + + /* skip the header */ + data += 8; + data_len -= 8; + + /* BSN, FSN and then priority */ + if (data_len < 8) { + LM_ERR("M2PA no space for BSN/FSN %u\n", data_len); + return NULL; + } + data += 8; + data_len -= 8; + if (data_len == 0) + return NULL; + else if (data_len < 1) { + LM_ERR("M2PA no space for prio %u\n", data_len); + return NULL; + } + data += 1; + data_len -= 1; + + *len = data_len; + return data; +} + static const uint8_t *extract_from_mtp(const uint8_t *data, size_t *len, int *opc, int *dpc, int *type) { @@ -221,6 +285,9 @@ static const uint8_t *ss7_extract_payload(const uint8_t *data, size_t *len, return extract_from_mtp(extract_from_m2ua(data, len), len, opc, dpc, mtp_type); break; + case HEP_M2PA: + return extract_from_mtp(extract_from_m2pa(data, len), len, opc, + dpc, mtp_type); default: LM_ERR("Unknown HEP type %d/0x%c\n", proto, proto); return NULL;

8 years

git:master:0c3bf642: Merge pull request #900 from zecke/ss7ops-add-m2pa-parsing

by GitHub

Module: kamailio Branch: master Commit: 0c3bf642d89c7a3ceace1faf225ae586eb20e157 URL: https://github.com/kamailio/kamailio/commit/0c3bf642d89c7a3ceace1faf225ae58… Author: Holger Freyther <holger+github(a)freyther.de> Committer: GitHub <noreply(a)github.com> Date: 2016-12-23T09:48:47+01:00 Merge pull request #900 from zecke/ss7ops-add-m2pa-parsing ss7ops: Enable M2PA encapsulation in addition to M2UA --- Modified: src/modules/ss7ops/ss7ops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0c3bf642d89c7a3ceace1faf225ae58… Patch: https://github.com/kamailio/kamailio/commit/0c3bf642d89c7a3ceace1faf225ae58… --- diff --git a/src/modules/ss7ops/ss7ops_mod.c b/src/modules/ss7ops/ss7ops_mod.c index cc9ddfb..ad2e448 100644 --- a/src/modules/ss7ops/ss7ops_mod.c +++ b/src/modules/ss7ops/ss7ops_mod.c @@ -29,12 +29,17 @@ MODULE_VERSION /* hep defines */ #define HEP_M2UA 0x08 +#define HEP_M2PA 0x0d /* M2UA messages */ #define M2UA_MSG 6 #define M2UA_DATA 1 #define M2UA_IE_DATA 0x0300 +/* M2PA messages */ +#define M2PA_CLASS 11 +#define M2PA_DATA 1 + /* MTPl3 */ #define MTP_ISUP 0x05 @@ -188,6 +193,65 @@ static const uint8_t *extract_from_m2ua(const uint8_t *data, size_t *len) return NULL; } +static const uint8_t *extract_from_m2pa(const uint8_t *data, size_t *len) +{ + uint32_t data_len; + + if (*len < 8) { + LM_ERR("M2PA hdr too short %zu\n", *len); + return NULL; + } + + /* check the header */ + if (data[0] != 0x01) { + LM_ERR("M2PA unknown version number %d\n", data[0]); + return NULL; + } + if (data[1] != 0x00) { + LM_ERR("M2PA unknown reserved fields %d\n", data[1]); + return NULL; + } + if (data[2] != M2PA_CLASS) { + LM_ERR("M2PA unhandled message class %d\n", data[2]); + return NULL; + } + if (data[3] != M2PA_DATA) { + LM_ERR("M2PA not data msg but %d\n", data[3]); + return NULL; + } + + /* check the length */ + memcpy(&data_len, &data[4], sizeof(data_len)); + data_len = ntohl(data_len); + if (*len < data_len) { + LM_ERR("M2PA data can't fit %zu vs. %u\n", *len, data_len); + return NULL; + } + + /* skip the header */ + data += 8; + data_len -= 8; + + /* BSN, FSN and then priority */ + if (data_len < 8) { + LM_ERR("M2PA no space for BSN/FSN %u\n", data_len); + return NULL; + } + data += 8; + data_len -= 8; + if (data_len == 0) + return NULL; + else if (data_len < 1) { + LM_ERR("M2PA no space for prio %u\n", data_len); + return NULL; + } + data += 1; + data_len -= 1; + + *len = data_len; + return data; +} + static const uint8_t *extract_from_mtp(const uint8_t *data, size_t *len, int *opc, int *dpc, int *type) { @@ -221,6 +285,9 @@ static const uint8_t *ss7_extract_payload(const uint8_t *data, size_t *len, return extract_from_mtp(extract_from_m2ua(data, len), len, opc, dpc, mtp_type); break; + case HEP_M2PA: + return extract_from_mtp(extract_from_m2pa(data, len), len, opc, + dpc, mtp_type); default: LM_ERR("Unknown HEP type %d/0x%c\n", proto, proto); return NULL;

8 years

[kamailio/kamailio] ss7ops: Enable M2PA encapsulation in addition to M2UA (#900)

by Holger Freyther

Add support for M2PA encapsulation on top of M2UA. It will only handle data messages as these can contain isup. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/900 -- Commit Summary -- * ss7ops: Enable M2PA encapsulation in addition to M2UA -- File Changes -- M src/modules/ss7ops/ss7ops_mod.c (67) -- Patch Links -- https://github.com/kamailio/kamailio/pull/900.patch https://github.com/kamailio/kamailio/pull/900.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/900

8 years

← Newer
1
...
5
6
7
8
9
10
11
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016