sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
491 discussions

git:master:7f8df73a: dmq: check proto in cmp_dmq_node()
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 7f8df73a1723ce30911b00e09c7506cab1e41ad7 URL: https://github.com/kamailio/kamailio/commit/7f8df73a1723ce30911b00e09c7506c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T17:56:20+01:00 dmq: check proto in cmp_dmq_node() --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/7f8df73a1723ce30911b00e09c7506c… Patch: https://github.com/kamailio/kamailio/commit/7f8df73a1723ce30911b00e09c7506c… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index edc42e1f27..fe23890742 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -87,7 +87,8 @@ int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode) return -1; } return STR_EQ(node->uri.host, cmpnode->uri.host) - && STR_EQ(node->uri.port, cmpnode->uri.port); + && STR_EQ(node->uri.port, cmpnode->uri.port) + && (node->uri.proto, cmpnode->uri.proto); } /**

1 0

git:master:7558e50c: dmq: build_node_str() makes uri with transport if not udp
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 7558e50c551c172079d44a7a95774575aa5e5eea URL: https://github.com/kamailio/kamailio/commit/7558e50c551c172079d44a7a9577457… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T17:22:00+01:00 dmq: build_node_str() makes uri with transport if not udp --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/7558e50c551c172079d44a7a9577457… Patch: https://github.com/kamailio/kamailio/commit/7558e50c551c172079d44a7a9577457… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 2eb3b1c373..edc42e1f27 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -397,8 +397,10 @@ int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status) */ int build_node_str(dmq_node_t *node, char *buf, int buflen) { - /* sip:host:port;status=[status] */ + /* sip:host:port;protocol=abcd;status=[status] */ int len = 0; + str sproto = STR_NULL; + if(buflen < node->orig_uri.len + 32) { LM_ERR("no more space left for node string\n"); return -1; @@ -411,6 +413,18 @@ int build_node_str(dmq_node_t *node, char *buf, int buflen) len += 1; memcpy(buf + len, node->uri.port.s, node->uri.port.len); len += node->uri.port.len; + if(node->uri.proto!=PROTO_NONE && node->uri.proto!=PROTO_UDP + && node->uri.proto!=PROTO_OTHER) { + if(get_valid_proto_string(node->uri.proto, 1, 0, &sproto)<0) { + LM_WARN("unknown transport protocol - fall back to udp\n"); + sproto.s = "udp"; + sproto.len = 3; + } + memcpy(buf + len, TRANSPORT_PARAM, TRANSPORT_PARAM_LEN); + len += TRANSPORT_PARAM_LEN; + memcpy(buf + len, sproto.s, sproto.len); + len += sproto.len; + } memcpy(buf + len, ";", 1); len += 1; memcpy(buf + len, "status=", 7);

1 0

[kamailio/kamailio] siputils: fix undefined symbol ruri_mark_new (#2681)
by Stefan Mititelu 17 Mar '21

17 Mar '21

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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 - [X] 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 - [X] 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/2681 -- Commit Summary -- * siputils: fix undefined symbol ruri_mark_new -- File Changes -- M src/modules/siputils/contact_ops.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2681.patch https://github.com/kamailio/kamailio/pull/2681.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/2681

2 4

git:5.3:993da649: siputils: fix undefined symbol ruri_mark_new
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: 5.3 Commit: 993da649f5f6d7467bf641598e60dce35992b361 URL: https://github.com/kamailio/kamailio/commit/993da649f5f6d7467bf641598e60dce… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T13:32:47+01:00 siputils: fix undefined symbol ruri_mark_new --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/993da649f5f6d7467bf641598e60dce… Patch: https://github.com/kamailio/kamailio/commit/993da649f5f6d7467bf641598e60dce… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 20c76efdd6..55c83d8cca 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -36,6 +36,7 @@ #include "../../core/parser/hf.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/contact/parse_contact.h" +#include "../../core/dset.h" #include "../../core/ut.h" #include <stdio.h>

1 0

[kamailio/kamailio] smsops: fix parsing of validity period (#2680)
by alexyosifov 17 Mar '21

17 Mar '21

- Validity period is present only for SUBMIT msg type and it is an optional parameter. For now supports only Relative VP format.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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 - [x] 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/2680 -- Commit Summary -- * smsops: fix parsing of validity period -- File Changes -- M src/modules/smsops/smsops_impl.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2680.patch https://github.com/kamailio/kamailio/pull/2680.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/2680

2 2

git:master:c4b1d0ab: smsops: fix parsing of validity period
by Daniel-Constantin Mierla 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: c4b1d0ab700ea03869114d08daa78ab6a6a56b96 URL: https://github.com/kamailio/kamailio/commit/c4b1d0ab700ea03869114d08daa78ab… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-17T13:31:33+01:00 smsops: fix parsing of validity period - Validity period is present only for SUBMIT msg type and it is an optional parameter. For now supports only Relative VP format. --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/c4b1d0ab700ea03869114d08daa78ab… Patch: https://github.com/kamailio/kamailio/commit/c4b1d0ab700ea03869114d08daa78ab… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index e956656d1a..6205c89928 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -173,6 +173,10 @@ void freeRP_DATA(sms_rp_data_t * rpdata) { #define BITMASK_HIGH_4BITS 0xF0 #define BITMASK_LOW_4BITS 0x0F #define BITMASK_TP_UDHI 0x40 +#define BITMASK_TP_VPF 0x18 +#define BITMASK_TP_VPF_RELATIVE 0x10 +#define BITMASK_TP_VPF_ENHANCED 0x08 +#define BITMASK_TP_VPF_ABSOLUTE 0x18 // Encode SMS-Message by merging 7 bit ASCII characters into 8 bit octets. static int ascii_to_gsm(str sms, char * output_buffer, int buffer_size) { @@ -525,7 +529,27 @@ int decode_3gpp_sms(struct sip_msg *msg) { } rp_data->pdu.pid = (unsigned char)body.s[p++]; rp_data->pdu.coding = (unsigned char)body.s[p++]; - rp_data->pdu.validity = (unsigned char)body.s[p++]; + + // 3GPP TS 03.40 9.2.2.2 SMS SUBMIT type + // https://en.wikipedia.org/wiki/GSM_03.40 + if(rp_data->pdu.msg_type == SUBMIT){ + // 3GPP TS 03.40 9.2.3.3 TP Validity Period Format (TP VPF) + switch (rp_data->pdu.flags & BITMASK_TP_VPF){ + case BITMASK_TP_VPF_RELATIVE: // 3GPP TS 03.40 9.2.3.12.1 TP-VP (Relative format) + rp_data->pdu.validity = (unsigned char)body.s[p++]; + break; + case BITMASK_TP_VPF_ENHANCED: // 3GPP TS 03.40 9.2.3.12.2 TP-VP (Absolute format) + p += 7; + LM_WARN("3GPP TS 03.40 9.2.3.12.2 TP-VP (Absolute format) is not supported\n"); + break; + case BITMASK_TP_VPF_ABSOLUTE: // 3GPP TS 03.40 9.2.3.12.3 TP-VP (Enhanced format) + p += 7; + LM_WARN("3GPP TS 03.40 9.2.3.12.3 TP-VP (Enhanced format) is not supported\n"); + break; + default: + break; + } + } //TP-User-Data-Length and TP-User-Data len = (unsigned char)body.s[p++];

1 0

git:master:8cab8c2d: modules: readme files regenerated - lrkproxy ... [skip ci]
by Kamailio Dev 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 8cab8c2daa0c3f906406741db14df3861bb32cb4 URL: https://github.com/kamailio/kamailio/commit/8cab8c2daa0c3f906406741db14df38… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-17T11:01:17+01:00 modules: readme files regenerated - lrkproxy ... [skip ci] --- Modified: src/modules/lrkproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/8cab8c2daa0c3f906406741db14df38… Patch: https://github.com/kamailio/kamailio/commit/8cab8c2daa0c3f906406741db14df38… --- diff --git a/src/modules/lrkproxy/README b/src/modules/lrkproxy/README index d6b03a6642..b43dd8b16a 100644 --- a/src/modules/lrkproxy/README +++ b/src/modules/lrkproxy/README @@ -97,7 +97,7 @@ Chapter 1. Admin Guide 2.1. LRKP_Controlling Layer (LRKP_CL) - The first layer develope as User-Space application that allows + The first layer is developed as User-Space application that allows User-Space to directly access and manipulate cache data buffer and packet buffer in Kernel-Space. This layer gets all information about creating new sessions, active sessions and teardown sessions which is @@ -106,8 +106,8 @@ Chapter 1. Admin Guide 2.2. LRKP_Transport Stateful Layer (LRKP_TSL) - The second layer develope in Kernel-Space as a main decision point for - RTP admission controller and Quickpath selector to where a received + The second layer is developed in Kernel-Space as a main decision point + for RTP admission controller and Quickpath selector to where a received packet should be forwarded with power of packet mangling framework in the network stack.

1 0

git:master:81f8833c: lrkproxy: update doc/ folder
by mojtaba 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 81f8833ccbb80e1a4975c2ffaf56dd55fc0d3b54 URL: https://github.com/kamailio/kamailio/commit/81f8833ccbb80e1a4975c2ffaf56dd5… Author: mojtaba <mespio(a)gmail.com> Committer: mojtaba <mespio(a)gmail.com> Date: 2021-03-17T13:30:28+03:30 lrkproxy: update doc/ folder --- Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81f8833ccbb80e1a4975c2ffaf56dd5… Patch: https://github.com/kamailio/kamailio/commit/81f8833ccbb80e1a4975c2ffaf56dd5… --- diff --git a/src/modules/lrkproxy/doc/lrkproxy_admin.xml b/src/modules/lrkproxy/doc/lrkproxy_admin.xml index 1f9eacc534..c826047040 100644 --- a/src/modules/lrkproxy/doc/lrkproxy_admin.xml +++ b/src/modules/lrkproxy/doc/lrkproxy_admin.xml @@ -35,7 +35,7 @@ <section> <title>LRKP_Controlling Layer (LRKP_CL)</title> <para> - The first layer develope as User-Space + The first layer is developed as User-Space application that allows User-Space to directly access and manipulate cache data buffer and packet buffer in Kernel-Space. This layer @@ -49,7 +49,7 @@ <section> <title>LRKP_Transport Stateful Layer (LRKP_TSL)</title> <para> - The second layer develope in Kernel-Space as + The second layer is developed in Kernel-Space as a main decision point for RTP admission controller and Quickpath selector to where a received packet should be forwarded with power of packet mangling

1 0

git:master:91c5626d: lrkproxy: update doc/ folder for README
by mojtaba 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: 91c5626d7119cd9c78028d9b3bf968ecd7db5952 URL: https://github.com/kamailio/kamailio/commit/91c5626d7119cd9c78028d9b3bf968e… Author: mojtaba <mespio(a)gmail.com> Committer: mojtaba <mespio(a)gmail.com> Date: 2021-03-17T12:49:04+03:30 lrkproxy: update doc/ folder for README --- Modified: src/modules/lrkproxy/doc/lrkproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/91c5626d7119cd9c78028d9b3bf968e… Patch: https://github.com/kamailio/kamailio/commit/91c5626d7119cd9c78028d9b3bf968e… --- diff --git a/src/modules/lrkproxy/doc/lrkproxy_admin.xml b/src/modules/lrkproxy/doc/lrkproxy_admin.xml index 57cc2faab3..1f9eacc534 100644 --- a/src/modules/lrkproxy/doc/lrkproxy_admin.xml +++ b/src/modules/lrkproxy/doc/lrkproxy_admin.xml @@ -17,14 +17,16 @@ <section> <title>Overview</title> <para> - This is a module that enables media streams to be relayed via an - lrkproxy. This module works with py_lrkproxy engine in: + This is a module that enables media streams to be relayed via + pylrkproxy engine that exist in: https://github.com/mojtabaesfandiari/pylrkproxy - This module does relaying audio streams between peers in + It does relaying audio streams between peers in PREROUTING netfilter-hooking section in kernel-space linux. The LRKProxy architecture is composed of two different layers. These layers are independent of each other. + For more information about LRKProxy architecture, please visit our paper in ieeexplore: + https://ieeexplore.ieee.org/document/9303608 </para> </section> @@ -33,12 +35,12 @@ <section> <title>LRKP_Controlling Layer (LRKP_CL)</title> <para> - The first layer is developed as User-Space + The first layer develope as User-Space application that allows User-Space to directly access and manipulate cache data buffer and packet buffer in Kernel-Space. This layer gets all information about creating new sessions, - active sessions and tear-down sessions which is + active sessions and teardown sessions which is gotten from SDP body during signaling plan and relay them to the LRKP-Transport Stateful Layer (LRKP- TSL). @@ -47,7 +49,7 @@ <section> <title>LRKP_Transport Stateful Layer (LRKP_TSL)</title> <para> - The second layer is developed in Kernel-Space as + The second layer develope in Kernel-Space as a main decision point for RTP admission controller and Quickpath selector to where a received packet should be forwarded with power of packet mangling

2 1

git:master:a1ac1f38: modules: readme files regenerated - lrkproxy ... [skip ci]
by Kamailio Dev 17 Mar '21

17 Mar '21

Module: kamailio Branch: master Commit: a1ac1f385097c7ddc15ecab6a3f076d36a1b7728 URL: https://github.com/kamailio/kamailio/commit/a1ac1f385097c7ddc15ecab6a3f076d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-17T10:31:27+01:00 modules: readme files regenerated - lrkproxy ... [skip ci] --- Modified: src/modules/lrkproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/a1ac1f385097c7ddc15ecab6a3f076d… Patch: https://github.com/kamailio/kamailio/commit/a1ac1f385097c7ddc15ecab6a3f076d…

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021