sr-dev September 2019

sr-dev@lists.kamailio.org

24 participants
368 discussions

git:master:9e29e262: lib: database URL supports IPv6 address as hostname
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 9e29e262f0107cedbf2e2d61d045b05c5a5fc410 URL: https://github.com/kamailio/kamailio/commit/9e29e262f0107cedbf2e2d61d045b05… Author: Alexey Vasilyev <alexei.vasilyev(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:51:59+02:00 lib: database URL supports IPv6 address as hostname - changed parsing of db_url to accept IPv6 address for hostname --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/9e29e262f0107cedbf2e2d61d045b05… Patch: https://github.com/kamailio/kamailio/commit/9e29e262f0107cedbf2e2d61d045b05… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 35bf228a8f..74788ff9bd 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -102,12 +102,13 @@ static int parse_db_url(struct db_id* id, const str* url) ST_USER_HOST, /* Username or hostname */ ST_PASS_PORT, /* Password or port part */ ST_HOST, /* Hostname part */ + ST_HOST6, /* Hostname part IPv6 */ ST_PORT, /* Port part */ ST_DB /* Database part */ }; enum state st; - unsigned int len, i, j, a, foundanother; + unsigned int len, i, j, a, foundanother, ipv6_flag=0; const char* begin; char* prev_token; @@ -190,6 +191,11 @@ static int parse_db_url(struct db_id* id, const str* url) begin = url->s + i + 1; break; + case '[': + st = ST_HOST6; + begin = url->s + i + 1; + break; + case '/': if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; @@ -226,19 +232,33 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_HOST: switch(url->s[i]) { + case '[': + st = ST_HOST6; + begin = url->s + i + 1; + break; + case ':': st = ST_PORT; - if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; + if (dupl_string(&id->host, begin, url->s + i - ipv6_flag) < 0) goto err; begin = url->s + i + 1; break; case '/': - if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; + if (dupl_string(&id->host, begin, url->s + i - ipv6_flag) < 0) goto err; if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; + case ST_HOST6: + switch(url->s[i]) { + case ']': + ipv6_flag = 1; + st = ST_HOST; + break; + } + break; + case ST_PORT: switch(url->s[i]) { case '/':

1 0

git:master:68df10a2: Revert "github: small additition related to file line endings and windows editors"
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 68df10a2e8cb47d9e788a8bbc38e1f7be91cea78 URL: https://github.com/kamailio/kamailio/commit/68df10a2e8cb47d9e788a8bbc38e1f7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:35:49+02:00 Revert "github: small additition related to file line endings and windows editors" - This reverts commit d80bccc3b85256fe0d440cc47c90fc1020ae1d8d. - not needed anymore, git should take care of this automatically now --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/68df10a2e8cb47d9e788a8bbc38e1f7… Patch: https://github.com/kamailio/kamailio/commit/68df10a2e8cb47d9e788a8bbc38e1f7… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 28c16586a7..ea6ba9cdd8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -65,8 +65,6 @@ and commit history, there are several *rules* required for each contribution. * code **should** be formatted with **clang-format** or to match the style of the component that the commit applies to. The `.clang-format` file is part of Kamailio source code tree, in the root folder. - * code **should** be use Linux style line endings and not Windows style - (CRLF). If you use a Windows editor, please configure it this way. ### Commit Message Rules ###

1 0

git:master:1b85430f: lost: added generic P-A-I body parsing
by wkampich 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 1b85430f6c783ad73ad29596dbd77a54773b5030 URL: https://github.com/kamailio/kamailio/commit/1b85430f6c783ad73ad29596dbd77a5… Author: wkampich <wolfgang.kampichler(a)gmail.com> Committer: wkampich <wolfgang.kampichler(a)gmail.com> Date: 2019-09-06T16:24:02+02:00 lost: added generic P-A-I body parsing - the P-A-I body parsing function now uses parse_to() to allow display name and uri params in the P-A-I body. - besides: code refactoring and clean up log output. --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/1b85430f6c783ad73ad29596dbd77a5… Patch: https://github.com/kamailio/kamailio/commit/1b85430f6c783ad73ad29596dbd77a5…

2 2

git:master:6ca88a4d: git: add .gitattributes file to normalize line endings for new added text files
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 6ca88a4df74c095dac919efae6f74190fc44999b URL: https://github.com/kamailio/kamailio/commit/6ca88a4df74c095dac919efae6f7419… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:29:18+02:00 git: add .gitattributes file to normalize line endings for new added text files --- Added: .gitattributes --- Diff: https://github.com/kamailio/kamailio/commit/6ca88a4df74c095dac919efae6f7419… Patch: https://github.com/kamailio/kamailio/commit/6ca88a4df74c095dac919efae6f7419… --- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..4b13bce0f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,31 @@ +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +# +# scripts +*.sh text +*.py text +*.pl text +# source code +*.c text +*.h text +*.cpp +# documentation +*.xml text +*.xsl text +*.xslt text +README text +Changelog text +*.md text +# build and packaging +Makefile* text +*.init text +*.service text +*.spec text +*.sysconfig text +*.default text +*.tmpfiles text +*.lintian-overrides text +*.in text +changelog text +control text +copyright text

1 0

git:master:162c32a3: sca: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 162c32a32971b0a2e1681eefd9f9ab20f482cc01 URL: https://github.com/kamailio/kamailio/commit/162c32a32971b0a2e1681eefd9f9ab2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:29:09+02:00 sca: end of line normalization to linux line ending format --- Modified: src/modules/sca/sca_util.c --- Diff: https://github.com/kamailio/kamailio/commit/162c32a32971b0a2e1681eefd9f9ab2… Patch: https://github.com/kamailio/kamailio/commit/162c32a32971b0a2e1681eefd9f9ab2…

1 0

git:master:73207ad1: lost: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 73207ad1038aa50c502bb29bca24913f11e49c3a URL: https://github.com/kamailio/kamailio/commit/73207ad1038aa50c502bb29bca24913… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:28:45+02:00 lost: end of line normalization to linux line ending format --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/pidf.h Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/73207ad1038aa50c502bb29bca24913… Patch: https://github.com/kamailio/kamailio/commit/73207ad1038aa50c502bb29bca24913…

1 0

git:master:da7ce6eb: janssonrpcc: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: da7ce6eba4f7ec2716dcb5f9084e0830fa2ac716 URL: https://github.com/kamailio/kamailio/commit/da7ce6eba4f7ec2716dcb5f9084e083… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:28:22+02:00 janssonrpcc: end of line normalization to linux line ending format --- Modified: src/modules/janssonrpcc/unit_tests/Makefile Modified: src/modules/janssonrpcc/unit_tests/seatest/seatest.c Modified: src/modules/janssonrpcc/unit_tests/seatest/seatest.h --- Diff: https://github.com/kamailio/kamailio/commit/da7ce6eba4f7ec2716dcb5f9084e083… Patch: https://github.com/kamailio/kamailio/commit/da7ce6eba4f7ec2716dcb5f9084e083…

1 0

git:master:904af9ae: ims_registrar_scscf: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 904af9ae6c317c095bb37ed741c7a7daf0ecddaf URL: https://github.com/kamailio/kamailio/commit/904af9ae6c317c095bb37ed741c7a7d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:28:04+02:00 ims_registrar_scscf: end of line normalization to linux line ending format --- Modified: src/modules/ims_registrar_scscf/CxDataType_Rel7.xsd --- Diff: https://github.com/kamailio/kamailio/commit/904af9ae6c317c095bb37ed741c7a7d… Patch: https://github.com/kamailio/kamailio/commit/904af9ae6c317c095bb37ed741c7a7d…

1 0

git:master:00f082d1: pkg: end of line normalization to linux line ending format
by Henning Westerholt 09 Sep '19

09 Sep '19

Module: kamailio Branch: master Commit: 00f082d1a8b49241b928a9cc5439b6ef96e12b40 URL: https://github.com/kamailio/kamailio/commit/00f082d1a8b49241b928a9cc5439b6e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-09-09T21:27:30+02:00 pkg: end of line normalization to linux line ending format --- Modified: pkg/kamailio/solaris/kamailio-manifest.xml --- Diff: https://github.com/kamailio/kamailio/commit/00f082d1a8b49241b928a9cc5439b6e… Patch: https://github.com/kamailio/kamailio/commit/00f082d1a8b49241b928a9cc5439b6e… --- diff --git a/pkg/kamailio/solaris/kamailio-manifest.xml b/pkg/kamailio/solaris/kamailio-manifest.xml index 2ac20890d3..81ee3a3c07 100644 --- a/pkg/kamailio/solaris/kamailio-manifest.xml +++ b/pkg/kamailio/solaris/kamailio-manifest.xml @@ -1,43 +1,43 @@ -<?xml version="1.0"?> -<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> - - - -<service_bundle type='manifest' name='kamailio'> - <service name='network/kamailio' type='service' version='1'> - <create_default_instance enabled='false' /> - <single_instance/> - - <dependency name='multi-user' grouping='require_all' restart_on='none' type='service'> - <service_fmri value='svc:/milestone/multi-user' /> - </dependency> - - <dependency name='multi-user-server' grouping='require_all' restart_on='none' type='service'> - <service_fmri value='svc:/milestone/multi-user-server' /> - </dependency> - - <dependency name='cswmysql5' grouping='require_all' restart_on='none' type='service'> -  - <service_fmri value='svc:/network/cswmysql5:default' /> - </dependency> - - <exec_method type='method' name='start' exec='/sbin/kamctl start' timeout_seconds='30' /> - - <exec_method type='method' name='stop' exec='/sbin/kamctl stop' timeout_seconds='60' /> - - <exec_method type='method' name='restart' exec='/sbin/kamctl restart' timeout_seconds='-1' /> - - <stability value='Unstable' /> - <template> - <common_name> - <loctext xml:lang='C'> Kamailio </loctext> - </common_name> - </template> - </service> -</service_bundle> +<?xml version="1.0"?> +<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> + + + +<service_bundle type='manifest' name='kamailio'> + <service name='network/kamailio' type='service' version='1'> + <create_default_instance enabled='false' /> + <single_instance/> + + <dependency name='multi-user' grouping='require_all' restart_on='none' type='service'> + <service_fmri value='svc:/milestone/multi-user' /> + </dependency> + + <dependency name='multi-user-server' grouping='require_all' restart_on='none' type='service'> + <service_fmri value='svc:/milestone/multi-user-server' /> + </dependency> + + <dependency name='cswmysql5' grouping='require_all' restart_on='none' type='service'> +  + <service_fmri value='svc:/network/cswmysql5:default' /> + </dependency> + + <exec_method type='method' name='start' exec='/sbin/kamctl start' timeout_seconds='30' /> + + <exec_method type='method' name='stop' exec='/sbin/kamctl stop' timeout_seconds='60' /> + + <exec_method type='method' name='restart' exec='/sbin/kamctl restart' timeout_seconds='-1' /> + + <stability value='Unstable' /> + <template> + <common_name> + <loctext xml:lang='C'> Kamailio </loctext> + </common_name> + </template> + </service> +</service_bundle>

1 0

siptrace warning
by Juha Heinanen 09 Sep '19

09 Sep '19

On masterm, I noticed that I have started to get a warning from siptrace mod_init() even when there is nothing to warn about: Sep 7 15:21:45 salmon /usr/bin/sip-proxy[30966]: WARNING: siptrace [siptrace.c:338]: mod_init(): can't load dlg api. Will not install dialog callbacks. -- Juha

3 5

← Newer
1
...
27
28
29
30
31
32
33
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2019