sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
309 discussions

git:master:fa603817: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted

by Victor Seva

Module: kamailio Branch: master Commit: fa6038172c0095287096c7021ca5dadad728cfaa URL: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:16:31+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… Patch: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index bd71eaafc4..ed81edf691 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1777,13 +1777,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1799,10 +1798,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1820,13 +1826,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1905,15 +1906,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1921,7 +1921,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1968,7 +1968,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -2003,7 +2003,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

2 years, 6 months

[kamailio/kamailio] nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted (#2784)

by Dmitry Wagin

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2459, #2768 #### Description There's a small regression after #2497. If SDP didn't have an "a=rtcp" header (RFC1889 behavior), Kamailio had thrown an Error `can't extract 'a=rtcp' IP from the SDP` on every INVITE. After the PR Kamailio does not flood into log. Also refactored #2769. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2784 -- Commit Summary -- * nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted -- File Changes -- M src/modules/nathelper/nathelper.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2784.patch https://github.com/kamailio/kamailio/pull/2784.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/2784

2 years, 6 months

git:master:1a68ddfc: pv: new transformation class {val}

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a68ddfcbe46cfa4d956a1541f17517d9ba94381 URL: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-17T17:16:17+01:00 pv: new transformation class {val} - {val.n0} - return int 0 instead of $null value, or existing value - {val.json} - if value is $null, return empty string; if value is string, then it is escaped for use as json value (without surrounding quotes) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517… Patch: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517…

2 years, 6 months

[kamailio/kamailio] presence: add option to return 200 instead of 202 on subscriptions (PR #2937)

by Laurențiu Nicola

Backport of #2930 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2937 -- Commit Summary -- * presence: add option to return 200 instead of 202 on subscriptions -- File Changes -- M src/modules/presence/doc/presence_admin.xml (25) M src/modules/presence/presence.c (2) M src/modules/presence/presence.h (1) M src/modules/presence/subscribe.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2937.patch https://github.com/kamailio/kamailio/pull/2937.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/2937

2 years, 6 months

git:master:08ce00c4: core: relocate str json escape function to strutils

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 08ce00c43409e9ee7c0797413ce17b68da9a2ed8 URL: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-17T12:49:56+01:00 core: relocate str json escape function to strutils --- Modified: src/core/dprint.c Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6… Patch: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6…

2 years, 6 months

ki_jsonrpcs_dispatch(): invalid json doc

by Patrick Karton

hello , im using kamailio and rtpengine. i use rtpengine with rtp timeout as follows rtpengine --timeout=240 --silent-timeout=600 -b2b-url=http://kamailioip:5060/RPC --xmlrpc-format=2 and in kamailio modparam("jsonrpcs", "pretty_format", 1) modparam("jsonrpcs", "transport", 7) event_route[xhttp:request] { if ($hu =~ "^/RPC") { jsonrpc_dispatch(); xhttp_reply("200", "OK", "text/xml", "<methodResponse><params><param><value><string>OK</string></value></param></params></methodResponse>"); exit; } } rtpengine successfully reaches the rpc endpoint but i have an error on the jsonrpcs module 43(50) ERROR: jsonrpcs [jsonrpcs_mod.c:1275]: ki_jsonrpcs_dispatch(): invalid json doc [[<?xml version="1.0" encoding="UTF-8"?> <methodCall> <methodName>dlg.terminate_dlg</methodName> <params> <param><value><string>1-10(a)172.22.244.139</string></value></param> <param><value><string>10SIPpTag091</string></value></param> <param><value><string>8U173ymKpc1pp</string></value></param> </params> </methodCall> ]] and so the dialog module can not ends the call Kamailio 5.5.2 on debian bullseye rtpengine 10.0.1.8 on debian bullseye Thanks.

2 years, 6 months

git:master:adb4d30a: pv: new variable $rsi - return status code for replies and 0 for requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: adb4d30a985b8f1425934f5bf22295b7ad62c249 URL: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-16T09:10:38+01:00 pv: new variable $rsi - return status code for replies and 0 for requests --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… Patch: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 65108bdc8c..9de6bc49af 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -379,6 +379,9 @@ static pv_export_t mod_pvs[] = { {{"rs", (sizeof("rs")-1)}, /* */ PVT_OTHER, pv_get_status, 0, 0, 0, 0, 0}, + {{"rsi", (sizeof("rsi")-1)}, /* */ + PVT_OTHER, pv_get_statusi, 0, + 0, 0, 0, 0}, {{"rt", (sizeof("rt")-1)}, /* */ PVT_OTHER, pv_get_refer_to, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 352114d259..ac15bfac2b 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -248,6 +248,20 @@ int pv_get_status(struct sip_msg *msg, pv_param_t *param, &msg->first_line.u.reply.status); } +int pv_get_statusi(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type != SIP_REPLY) + return pv_get_sintval(msg, param, res, 0); + + return pv_get_intstrval(msg, param, res, + (int)msg->first_line.u.reply.statuscode, + &msg->first_line.u.reply.status); +} + int pv_get_reason(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 6406d9054a..5e0f6860b5 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -55,6 +55,9 @@ int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, int pv_get_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_statusi(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_reason(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

2 years, 6 months

git:master:03050d70: core: new flag p for json logging

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 03050d7046a7a356cd5fdd31d32003dbac73fb0a URL: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-16T08:40:49+01:00 core: new flag p for json logging - prefix is printed as it is in the root json, expected to be a list of json field starting with comma --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d… Patch: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d…

2 years, 6 months

git:master:7c7f967e: modules: readme files regenerated - presence ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 7c7f967e6c66a119c5aa9e64fbd447b48ecd8875 URL: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-15T19:16:14+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b… Patch: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b…

2 years, 6 months

git:master:33db4765: presence: add option to return 200 instead of 202 on subscriptions

by Henning Westerholt

Module: kamailio Branch: master Commit: 33db47652628b299c96a591ec939ca2ea9f6e268 URL: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2… Author: LaurenÈiu Nicola <lnicola(a)dend.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-11-15T19:04:26+01:00 presence: add option to return 200 instead of 202 on subscriptions RFC6665 mandates 200 return codes, although 202 seems mandated by RFC3265. We add a new parameter, `subs_respond_200`, to control this. --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2… Patch: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2…

2 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021