sr-dev August 2018

sr-dev@lists.kamailio.org

22 participants
281 discussions

[kamailio/kamailio] Module RTPPROXY param Timeout_Socket not Working (#1597)

by Hamid R. Hashmi

Kamailio didn't start listening on IP mentioned in Module RTPPROXY parameter [Timeout_Socket](https://kamailio.org/docs/modules/5.1.x/modules/rtpproxy.ht…. Below is my configuration file. ``` loadmodule "rtpproxy.so" modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") modparam("rtpproxy", "rtpproxy_tout", 1) modparam("rtpproxy", "rtpproxy_retr", 2) modparam("rtpproxy", "timeout_socket", "tcp:127.0.0.1:7725") ``` when I type a commmand on linux ```$ netstat -nlp``` it only shows SIP listening ports. Kamailio should start listening on ```tcp:1270.0.01:7725``` -- 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/issues/1597

5 years, 8 months

git:master:35aef078: core: Makefiles - catch unavailbility of docbook2man tool

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 35aef078dfbcb92de9591eea2841b3ba0f9682f6 URL: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-31T12:45:24+02:00 core: Makefiles - catch unavailbility of docbook2man tool - print an info message instead of ending up in execution error of Makefile rule trying to generate man pages from xml files - DOCBOOK var renamed to DOCBOOKMAN to be more suggestive for its purpose - related to GH #1624 --- Modified: src/Makefile.modules Modified: src/Makefile.shared Modified: src/Makefile.utils --- Diff: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… Patch: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… --- diff --git a/src/Makefile.modules b/src/Makefile.modules index bbcca26122..8649db2756 100644 --- a/src/Makefile.modules +++ b/src/Makefile.modules @@ -278,16 +278,17 @@ endif #man page build rules ifneq (,$(wildcard $(MOD_NAME).xml)) - +ifneq ($(DOCBOOKMAN),) $(MOD_NAME).7: $(MOD_NAME).xml - $(DOCBOOK) -s ../../../doc/stylesheets/serdoc2man.xsl $< + $(DOCBOOKMAN) -s ../../../doc/stylesheets/serdoc2man.xsl $< man: $(MOD_NAME).7 - else - man: - + @echo "info - no docbook to man tool to convert $(MOD_NAME).xml" +endif +else +man: endif diff --git a/src/Makefile.shared b/src/Makefile.shared index 82a29d2447..9d2d81fe65 100644 --- a/src/Makefile.shared +++ b/src/Makefile.shared @@ -43,8 +43,8 @@ sh_err_fail= try_err=$(1) ; if [ $$? != 0 ]; then echo ERROR: $(1) failed ; fi endif -DOCBOOK = $(shell which docbook2x-man 2>/dev/null) -ifeq ($(DOCBOOK),) - DOCBOOK = $(shell which db2x_docbook2man 2>/dev/null) +DOCBOOKMAN = $(shell which docbook2x-man 2>/dev/null) +ifeq ($(DOCBOOKMAN),) + DOCBOOKMAN = $(shell which db2x_docbook2man 2>/dev/null) endif diff --git a/src/Makefile.utils b/src/Makefile.utils index f7ce508e17..e8a8b8a1a6 100644 --- a/src/Makefile.utils +++ b/src/Makefile.utils @@ -117,16 +117,17 @@ endif #man page build rules ifneq (,$(wildcard $(UTIL_NAME).xml)) - +ifneq ($(DOCBOOKMAN),) $(UTIL_NAME).7: $(UTIL_NAME).xml - $(DOCBOOK) -s ../../doc/stylesheets/serdoc2man.xsl $< + $(DOCBOOKMAN) -s ../../doc/stylesheets/serdoc2man.xsl $< man: $(UTIL_NAME).7 - else - man: - + @echo "info - no docbook to man tool to convert $(UTIL_NAME).xml" +endif +else +man: endif $(man_prefix)/$(man_dir)/man8:

5 years, 8 months

git:master:aede7c48: modules: readme files regenerated - sipjson ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: aede7c4835dd516cea75a5191d1ae6af3460c3c8 URL: https://github.com/kamailio/kamailio/commit/aede7c4835dd516cea75a5191d1ae6a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-31T11:31:46+02:00 modules: readme files regenerated - sipjson ... [skip ci] --- Modified: src/modules/sipjson/README --- Diff: https://github.com/kamailio/kamailio/commit/aede7c4835dd516cea75a5191d1ae6a… Patch: https://github.com/kamailio/kamailio/commit/aede7c4835dd516cea75a5191d1ae6a… --- diff --git a/src/modules/sipjson/README b/src/modules/sipjson/README index add1b53f97..525ae98351 100644 --- a/src/modules/sipjson/README +++ b/src/modules/sipjson/README @@ -93,6 +93,8 @@ Chapter 1. Admin Guide 'opt' parameter cannot be empty, '0' can be given when only default attributes are wanted. + B - (uppercase B) SIP message body + + c - (lowercase c) CSeq attributes + + t - (lowercase t) To header attributes * ovar - name of the output pseduo-variable This function can be used from ANY_ROUTE. @@ -105,6 +107,11 @@ sj_serialize("0B", "$var(json)"); 4. Output Samples The content of the output variable is a JSON. Next are some samples. + Note that the content might change with future development and this + example become outdated, simply print the document when you start + testing your config and match the name of the attribute with the name + of pseudo-variables to understand what values can be there. Unlike + pseudo-variables, the $null values might converted to empty strings. Example 1.2. sj_serialize output ... @@ -129,6 +136,7 @@ ing "ua":"sipsak 0.9.7pre", "ci":"482215126(a)172.17.0.2", "rb":"" + ... } ... # the sip message sent to Kamailio:

5 years, 8 months

git:master:e913fa83: Merge pull request #1628 from rromrrom/crash_on_empty_string

by GitHub

Module: kamailio Branch: master Commit: e913fa83f87b34e236817b8db60341fe5a193a3d URL: https://github.com/kamailio/kamailio/commit/e913fa83f87b34e236817b8db60341f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-08-31T11:24:38+02:00 Merge pull request #1628 from rromrrom/crash_on_empty_string tm: crash on memcpy fix --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/e913fa83f87b34e236817b8db60341f… Patch: https://github.com/kamailio/kamailio/commit/e913fa83f87b34e236817b8db60341f… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 2f5488a309..271932c90c 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -299,6 +299,7 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok) for (i=t->fwded_totags; i; i=i->next) { if (i->tag.len==tag->len + && i->tag.s && memcmp(i->tag.s, tag->s, tag->len) ==0 ){ /* to tag already recorded */ LM_DBG("to-tag retransmission\n");

5 years, 8 months

git:master:db3b9dbd: tm: crash on memcpy fix

by Roman Romanchenko

Module: kamailio Branch: master Commit: db3b9dbd48f7bb74abf08b0e97bcac15015df719 URL: https://github.com/kamailio/kamailio/commit/db3b9dbd48f7bb74abf08b0e97bcac1… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Committer: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2018-08-31T12:02:43+03:00 tm: crash on memcpy fix - in some cases tag is not initialized and lead to crash. Memory pointer check before writing to added. --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/db3b9dbd48f7bb74abf08b0e97bcac1… Patch: https://github.com/kamailio/kamailio/commit/db3b9dbd48f7bb74abf08b0e97bcac1… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 474851aa7c..f53625e833 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -299,6 +299,7 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok) for (i=t->fwded_totags; i; i=i->next) { if (i->tag.len==tag->len + && i->tag.s && memcmp(i->tag.s, tag->s, tag->len) ==0 ){ /* to tag already recorded */ LM_DBG("to-tag retransmission\n");

5 years, 8 months

[kamailio/kamailio] tm: crash on memcpy fix (#1628)

by rromrrom

- in some cases tag is not initialized and lead to crash. Memory pointer check before writing to added.   #### 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 - [ 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/1628 -- Commit Summary -- * tm: crash on memcpy fix -- File Changes -- M src/modules/tm/t_reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1628.patch https://github.com/kamailio/kamailio/pull/1628.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/1628

5 years, 8 months

git:master:6c5fc213: sipjson: docs - updates to serialize options and sample json section

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6c5fc21329bac531b64c1350c10e3d0490aefef6 URL: https://github.com/kamailio/kamailio/commit/6c5fc21329bac531b64c1350c10e3d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-31T11:20:08+02:00 sipjson: docs - updates to serialize options and sample json section --- Modified: src/modules/sipjson/doc/sipjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c5fc21329bac531b64c1350c10e3d0… Patch: https://github.com/kamailio/kamailio/commit/6c5fc21329bac531b64c1350c10e3d0… --- diff --git a/src/modules/sipjson/doc/sipjson_admin.xml b/src/modules/sipjson/doc/sipjson_admin.xml index ccfa868073..f357367086 100644 --- a/src/modules/sipjson/doc/sipjson_admin.xml +++ b/src/modules/sipjson/doc/sipjson_admin.xml @@ -93,6 +93,16 @@ B - (uppercase B) SIP message body </para> </listitem> + <listitem> + <para> + c - (lowercase c) CSeq attributes + </para> + </listitem> + <listitem> + <para> + t - (lowercase t) To header attributes + </para> + </listitem> </itemizedlist> </listitem> <listitem> @@ -120,7 +130,12 @@ sj_serialize("0B", "$var(json)"); <section> <title>Output Samples</title> <para> - The content of the output variable is a JSON. Next are some samples. + The content of the output variable is a JSON. Next are some samples. Note + that the content might change with future development and this example + become outdated, simply print the document when you start testing your + config and match the name of the attribute with the name of pseudo-variables + to understand what values can be there. Unlike pseudo-variables, the + $null values might converted to empty strings. </para> <example> <title><function>sj_serialize</function> output</title> @@ -146,6 +161,7 @@ sj_serialize("0B", "$var(json)"); "ua":"sipsak 0.9.7pre", "ci":"482215126(a)172.17.0.2", "rb":"" + ... } ... # the sip message sent to &kamailio;:

5 years, 8 months

git:master:4b3a7d37: sipjson: added options to serialize To and CSeq attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4b3a7d37ce9d91bcd0367712de5ca1f2668eaebe URL: https://github.com/kamailio/kamailio/commit/4b3a7d37ce9d91bcd0367712de5ca1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-31T11:14:27+02:00 sipjson: added options to serialize To and CSeq attributes - c and t mode options --- Modified: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4b3a7d37ce9d91bcd0367712de5ca1f… Patch: https://github.com/kamailio/kamailio/commit/4b3a7d37ce9d91bcd0367712de5ca1f… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index ca6ea8e8bd..e2798332f0 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -345,6 +345,26 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode) srjson_AddStrStrToObject(jdoc, jr, "rb", 2, s.s, s.len); } break; + case 'c': + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) + || (msg->cseq==NULL)) ) { + s.s = ""; + s.len = 0; + } else { + s = get_cseq(msg)->number; + } + srjson_AddStrStrToObject(jdoc, jr, "cs", 2, s.s, s.len); + break; + case 't': + puri = parse_to_uri(msg); + if(puri==NULL) { + srjson_AddStrStrToObject(jdoc, jr, "tU", 2, "", 0); + srjson_AddStrStrToObject(jdoc, jr, "td", 2, "", 0); + } else { + sj_add_xuri_attr(puri, 1, "tU", 2, jdoc, jr); + sj_add_xuri_attr(puri, 2, "td", 2, jdoc, jr); + } + break; } } return 1;

5 years, 8 months

git:master:957b43dd: tls: docs - some updates to sample tls.cfg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 957b43ddea8dad434736e800a16581d49ccb2478 URL: https://github.com/kamailio/kamailio/commit/957b43ddea8dad434736e800a16581d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-31T10:19:06+02:00 tls: docs - some updates to sample tls.cfg --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/957b43ddea8dad434736e800a16581d… Patch: https://github.com/kamailio/kamailio/commit/957b43ddea8dad434736e800a16581d… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index c1a08f6759..dd25abd4ac 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -33,13 +33,13 @@ require_certificate = yes # This is an example server domain for TLS connections # received from the loopback interface. We allow -# the use of SSLv2 and SSLv3 protocols here, we do +# the use of TLSv1 protocols here, we do # not require that clients present client certificates # but if they present it it must be valid. We also use # a special certificate and CA list for loopback # interface. # -#[server:127.0.0.1:5061] +#[server:5.6.7.8:5061] #method = TLSv1 #verify_certificate = yes #require_certificate = no @@ -48,9 +48,11 @@ require_certificate = yes #verify_depth = 3 #ca_list = local_ca.pem #crl = local_crl.pem +#server_name = kamailio.org +#server_id = kamailio.org -# Special settings for the example.sip (1.2.3.4) public SIP -# server. We do not verify the certificate of the +# Special settings for connecting to the example.sip (1.2.3.4) +# public SIP server. We do not verify the certificate of the # server because it can be expired. The server # implements authentication using SSL client # certificates so configure the client certificate @@ -62,3 +64,5 @@ require_certificate = yes #private_key = /usr/local/etc/kamailio/tls/example_key.pem #ca_list = /usr/local/etc/kamailio/tls/example_ca.pem #crl = /usr/local/etc/kamailio/tls/example_crl.pem +#server_name = example.sip +#server_id = example.sip

5 years, 8 months

git:master:bae838eb: misc/examples/ims/pcscf: Add ifdef guards for ipsec_*() calls

by Tsvetomir Dimitrov

Module: kamailio Branch: master Commit: bae838eb61f9852f6ef70b2c3f0dcaf71d880105 URL: https://github.com/kamailio/kamailio/commit/bae838eb61f9852f6ef70b2c3f0dcaf… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-08-31T09:58:24+03:00 misc/examples/ims/pcscf: Add ifdef guards for ipsec_*() calls --- Modified: misc/examples/ims/pcscf/route/mo.cfg Modified: misc/examples/ims/pcscf/route/register.cfg --- Diff: https://github.com/kamailio/kamailio/commit/bae838eb61f9852f6ef70b2c3f0dcaf… Patch: https://github.com/kamailio/kamailio/commit/bae838eb61f9852f6ef70b2c3f0dcaf… --- diff --git a/misc/examples/ims/pcscf/route/mo.cfg b/misc/examples/ims/pcscf/route/mo.cfg index 235b9f1275..e192249571 100644 --- a/misc/examples/ims/pcscf/route/mo.cfg +++ b/misc/examples/ims/pcscf/route/mo.cfg @@ -95,7 +95,9 @@ onreply_route[MO_reply] { remove_hf("C-Params"); append_hf("Contact: $ct;$hdr(C-Params)\r\n"); } +#!ifdef WITH_IPSEC ipsec_forward("location"); +#!endif # In case of 1xx and 2xx do NAT if(status=~"[12][0-9][0-9]") route(NATMANAGE); diff --git a/misc/examples/ims/pcscf/route/register.cfg b/misc/examples/ims/pcscf/route/register.cfg index b2d1f92638..c10979d84a 100644 --- a/misc/examples/ims/pcscf/route/register.cfg +++ b/misc/examples/ims/pcscf/route/register.cfg @@ -156,13 +156,15 @@ onreply_route[REGISTER_reply] xlog("L_DBG", "REGISTER SUCCESS[$ci] took $var(stat_add)ms\n"); update_stat("register_success", "+1"); update_stat("register_time", "$var(stat_add)"); - ipsec_forward("location"); +#!ifdef WITH_IPSEC + ipsec_forward("location"); } else { if (t_check_status("401")) { ipsec_create("location"); - } - } + } +#!endif + } exit; }

5 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2018