sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:master:f7ac76e5: core: etc - sample m4 templates for config moved to misc/examples/mixed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f7ac76e5d6522160469628025e685f9572daa6a6 URL: https://github.com/kamailio/kamailio/commit/f7ac76e5d6522160469628025e685f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-07T15:35:42+01:00 core: etc - sample m4 templates for config moved to misc/examples/mixed --- Added: misc/examples/mixed/rules.m4 Added: misc/examples/mixed/sip-router.cfg.m4 Removed: etc/rules.m4 Removed: etc/sip-router.cfg.m4 --- Diff: https://github.com/kamailio/kamailio/commit/f7ac76e5d6522160469628025e685f9… Patch: https://github.com/kamailio/kamailio/commit/f7ac76e5d6522160469628025e685f9… --- diff --git a/etc/rules.m4 b/misc/examples/mixed/rules.m4 similarity index 100% rename from etc/rules.m4 rename to misc/examples/mixed/rules.m4 diff --git a/etc/sip-router.cfg.m4 b/misc/examples/mixed/sip-router.cfg.m4 similarity index 100% rename from etc/sip-router.cfg.m4 rename to misc/examples/mixed/sip-router.cfg.m4

7 years, 1 month

git:master:ab691444: core: etc - basic and advanced configs relocated to misc/examples/pkg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ab691444295243265bbbaea6312dbea345055825 URL: https://github.com/kamailio/kamailio/commit/ab691444295243265bbbaea6312dbea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-07T15:33:37+01:00 core: etc - basic and advanced configs relocated to misc/examples/pkg - they are not installed by default anymore - use 'make install-cfg-extras' to get them installed in the target etc folder --- Added: misc/examples/pkg/kamailio-basic.cfg Added: misc/examples/pkg/kamailio-oob.cfg Added: misc/examples/pkg/sip-router-basic.cfg Added: misc/examples/pkg/sip-router-oob.cfg Modified: src/Makefile Removed: etc/kamailio-basic.cfg Removed: etc/kamailio-oob.cfg Removed: etc/sip-router-basic.cfg Removed: etc/sip-router-oob.cfg --- Diff: https://github.com/kamailio/kamailio/commit/ab691444295243265bbbaea6312dbea… Patch: https://github.com/kamailio/kamailio/commit/ab691444295243265bbbaea6312dbea…

7 years, 1 month

[kamailio/kamailio] tsilo: fix internal data structures (#1302)

by vitalikvoip

- avoid crash by fixing "first" and "last" pointers of of the ts_entry_t after ts_urecord_t deletion   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  tsilo module didn't reset "**first**" and "**last**" pointers of a doubly linked list of **ts_urecord_t** objects. It worked correctly only when there were no hash collisions and each ts_entry slot had only one **ts_urecord_t** object. To faster reproduce the problem one can set **modparam("tsilo", "hash_size", 2)** and run a light load test (5...10 simultaneous call setups). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1302 -- Commit Summary -- * tsilo: fix internal data structures -- File Changes -- M src/modules/tsilo/ts_hash.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1302.patch https://github.com/kamailio/kamailio/pull/1302.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/1302

7 years, 1 month

git:master:b61994af: auth_radius: fixed sample dictionary file install

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b61994af4c3765e18fa1b200289d65f64530f815 URL: https://github.com/kamailio/kamailio/commit/b61994af4c3765e18fa1b200289d65f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-07T13:15:46+01:00 auth_radius: fixed sample dictionary file install - avoid overwriting previous versions of the dictionary --- Modified: src/modules/auth_radius/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b61994af4c3765e18fa1b200289d65f… Patch: https://github.com/kamailio/kamailio/commit/b61994af4c3765e18fa1b200289d65f… --- diff --git a/src/modules/auth_radius/Makefile b/src/modules/auth_radius/Makefile index 0e616eede1..983fe62c2c 100644 --- a/src/modules/auth_radius/Makefile +++ b/src/modules/auth_radius/Makefile @@ -21,8 +21,8 @@ install-cfg: @$(call try_err, $(INSTALL_TOUCH) \ "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME).sample" ) @$(call try_err, $(INSTALL_CFG) \ - "cfg/dictionary.$(CFG_NAME).sample" \ - "$(cfg_prefix)/$(cfg_dir)" ) + "cfg/dictionary.$(CFG_NAME)" \ + "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME).sample" ) @if [ -z "${skip_cfg_install}" -a \ ! -f "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME)" ]; then \ mv -f "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME).sample" \

7 years, 1 month

git:master:c46d26b5: core: etc - moved sample tls ca folder to misc/tls-ca

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c46d26b513fc293494b75fecfaa6dac4d2085897 URL: https://github.com/kamailio/kamailio/commit/c46d26b513fc293494b75fecfaa6dac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-07T13:20:46+01:00 core: etc - moved sample tls ca folder to misc/tls-ca --- Added: misc/tls-ca/README Added: misc/tls-ca/ca.conf Added: misc/tls-ca/request.conf Added: misc/tls-ca/rootCA/cacert.pem Added: misc/tls-ca/rootCA/certs/01.pem Added: misc/tls-ca/rootCA/index.txt Added: misc/tls-ca/rootCA/private/cakey.pem Added: misc/tls-ca/rootCA/serial Added: misc/tls-ca/user.conf Added: misc/tls-ca/user/user-calist.pem Added: misc/tls-ca/user/user-cert.pem Added: misc/tls-ca/user/user-cert_req.pem Added: misc/tls-ca/user/user-privkey.pem Removed: etc/tls/README Removed: etc/tls/ca.conf Removed: etc/tls/request.conf Removed: etc/tls/rootCA/cacert.pem Removed: etc/tls/rootCA/certs/01.pem Removed: etc/tls/rootCA/index.txt Removed: etc/tls/rootCA/private/cakey.pem Removed: etc/tls/rootCA/serial Removed: etc/tls/user.conf Removed: etc/tls/user/user-calist.pem Removed: etc/tls/user/user-cert.pem Removed: etc/tls/user/user-cert_req.pem Removed: etc/tls/user/user-privkey.pem --- Diff: https://github.com/kamailio/kamailio/commit/c46d26b513fc293494b75fecfaa6dac… Patch: https://github.com/kamailio/kamailio/commit/c46d26b513fc293494b75fecfaa6dac… --- diff --git a/etc/tls/README b/misc/tls-ca/README similarity index 100% rename from etc/tls/README rename to misc/tls-ca/README diff --git a/etc/tls/ca.conf b/misc/tls-ca/ca.conf similarity index 100% rename from etc/tls/ca.conf rename to misc/tls-ca/ca.conf diff --git a/etc/tls/request.conf b/misc/tls-ca/request.conf similarity index 100% rename from etc/tls/request.conf rename to misc/tls-ca/request.conf diff --git a/etc/tls/rootCA/cacert.pem b/misc/tls-ca/rootCA/cacert.pem similarity index 100% rename from etc/tls/rootCA/cacert.pem rename to misc/tls-ca/rootCA/cacert.pem diff --git a/etc/tls/rootCA/certs/01.pem b/misc/tls-ca/rootCA/certs/01.pem similarity index 100% rename from etc/tls/rootCA/certs/01.pem rename to misc/tls-ca/rootCA/certs/01.pem diff --git a/etc/tls/rootCA/index.txt b/misc/tls-ca/rootCA/index.txt similarity index 100% rename from etc/tls/rootCA/index.txt rename to misc/tls-ca/rootCA/index.txt diff --git a/etc/tls/rootCA/private/cakey.pem b/misc/tls-ca/rootCA/private/cakey.pem similarity index 100% rename from etc/tls/rootCA/private/cakey.pem rename to misc/tls-ca/rootCA/private/cakey.pem diff --git a/etc/tls/rootCA/serial b/misc/tls-ca/rootCA/serial similarity index 100% rename from etc/tls/rootCA/serial rename to misc/tls-ca/rootCA/serial diff --git a/etc/tls/user.conf b/misc/tls-ca/user.conf similarity index 100% rename from etc/tls/user.conf rename to misc/tls-ca/user.conf diff --git a/etc/tls/user/user-calist.pem b/misc/tls-ca/user/user-calist.pem similarity index 100% rename from etc/tls/user/user-calist.pem rename to misc/tls-ca/user/user-calist.pem diff --git a/etc/tls/user/user-cert.pem b/misc/tls-ca/user/user-cert.pem similarity index 100% rename from etc/tls/user/user-cert.pem rename to misc/tls-ca/user/user-cert.pem diff --git a/etc/tls/user/user-cert_req.pem b/misc/tls-ca/user/user-cert_req.pem similarity index 100% rename from etc/tls/user/user-cert_req.pem rename to misc/tls-ca/user/user-cert_req.pem diff --git a/etc/tls/user/user-privkey.pem b/misc/tls-ca/user/user-privkey.pem similarity index 100% rename from etc/tls/user/user-privkey.pem rename to misc/tls-ca/user/user-privkey.pem

7 years, 1 month

git:master:d7d37df3: core: etc - moved reasons files to misc/reasons

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7d37df391fa2e0731667352b0afd7317f46b737 URL: https://github.com/kamailio/kamailio/commit/d7d37df391fa2e0731667352b0afd73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-07T13:18:15+01:00 core: etc - moved reasons files to misc/reasons --- Added: misc/reasons/reasons-cs_CZ.iso-8859-2.txt Added: misc/reasons/reasons-en_US.ascii.txt Removed: etc/reasons-cs_CZ.iso-8859-2.txt Removed: etc/reasons-en_US.ascii.txt --- Diff: https://github.com/kamailio/kamailio/commit/d7d37df391fa2e0731667352b0afd73… Patch: https://github.com/kamailio/kamailio/commit/d7d37df391fa2e0731667352b0afd73… --- diff --git a/etc/reasons-cs_CZ.iso-8859-2.txt b/misc/reasons/reasons-cs_CZ.iso-8859-2.txt similarity index 100% rename from etc/reasons-cs_CZ.iso-8859-2.txt rename to misc/reasons/reasons-cs_CZ.iso-8859-2.txt diff --git a/etc/reasons-en_US.ascii.txt b/misc/reasons/reasons-en_US.ascii.txt similarity index 100% rename from etc/reasons-en_US.ascii.txt rename to misc/reasons/reasons-en_US.ascii.txt

7 years, 1 month

git:master:7464ce3c: core: moved radius dictionary files from etc to auth_radius module

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7464ce3c9c9c742dbb06501190b17cbcad6b45b9 URL: https://github.com/kamailio/kamailio/commit/7464ce3c9c9c742dbb06501190b17cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-07T13:16:34+01:00 core: moved radius dictionary files from etc to auth_radius module --- Added: src/modules/auth_radius/cfg/dictionary.kamailio Added: src/modules/auth_radius/cfg/dictionary.sip-router Modified: src/Makefile Modified: src/modules/auth_radius/Makefile Removed: etc/dictionary.kamailio Removed: etc/dictionary.sip-router --- Diff: https://github.com/kamailio/kamailio/commit/7464ce3c9c9c742dbb06501190b17cb… Patch: https://github.com/kamailio/kamailio/commit/7464ce3c9c9c742dbb06501190b17cb… --- diff --git a/src/Makefile b/src/Makefile index dd68f0bf7c..542afa76a3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -766,9 +766,6 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi ; \ fi ; \ : ; done; true - @# radius dictionary - @$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) - @$(INSTALL_CFG) ../etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) @echo "config files installed" install-cfg-pkg: $(cfg_prefix)/$(cfg_dir) diff --git a/src/modules/auth_radius/Makefile b/src/modules/auth_radius/Makefile index 94a102230e..0e616eede1 100644 --- a/src/modules/auth_radius/Makefile +++ b/src/modules/auth_radius/Makefile @@ -13,3 +13,18 @@ NAME=auth_radius.so DEFS+=-DKAMAILIO_MOD_INTERFACE include ../../Makefile.modules + +install-cfg: + @if ! [ -d $(cfg_prefix)/$(cfg_dir) ]; then \ + mkdir -p "$(cfg_prefix)/$(cfg_dir)" ; \ + fi + @$(call try_err, $(INSTALL_TOUCH) \ + "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME).sample" ) + @$(call try_err, $(INSTALL_CFG) \ + "cfg/dictionary.$(CFG_NAME).sample" \ + "$(cfg_prefix)/$(cfg_dir)" ) + @if [ -z "${skip_cfg_install}" -a \ + ! -f "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME)" ]; then \ + mv -f "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME).sample" \ + "$(cfg_prefix)/$(cfg_dir)dictionary.$(CFG_NAME)" ; \ + fi diff --git a/etc/dictionary.kamailio b/src/modules/auth_radius/cfg/dictionary.kamailio similarity index 100% rename from etc/dictionary.kamailio rename to src/modules/auth_radius/cfg/dictionary.kamailio diff --git a/etc/dictionary.sip-router b/src/modules/auth_radius/cfg/dictionary.sip-router similarity index 100% rename from etc/dictionary.sip-router rename to src/modules/auth_radius/cfg/dictionary.sip-router

7 years, 1 month

git:5.0:889ff593: tsilo: fix internal data structures

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 889ff59366b1c550eb35bb222dcc5dd57881357d URL: https://github.com/kamailio/kamailio/commit/889ff59366b1c550eb35bb222dcc5dd… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-11-07T13:09:08+01:00 tsilo: fix internal data structures - avoid crash by fixing "first" and "last" pointers of of the ts_entry_t after ts_urecord_t deletion (cherry picked from commit cf26bbe33307067141dc1abb21fb7c53cb0e5ecc) --- Modified: src/modules/tsilo/ts_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/889ff59366b1c550eb35bb222dcc5dd… Patch: https://github.com/kamailio/kamailio/commit/889ff59366b1c550eb35bb222dcc5dd… --- diff --git a/src/modules/tsilo/ts_hash.c b/src/modules/tsilo/ts_hash.c index 01d79940eb..fec10431ca 100644 --- a/src/modules/tsilo/ts_hash.c +++ b/src/modules/tsilo/ts_hash.c @@ -280,10 +280,10 @@ void remove_ts_urecord(ts_urecord_t* _r) if (_r->next) _r->next->prev = _r->prev; - /* it was the last urecord */ - if (entry->n == 1) { - entry->first = entry->last = NULL; - } + if (entry->first == _r) + entry->first = _r->next; + if (entry->last == _r) + entry->last = _r->prev; update_stat(stored_ruris, -1);

7 years, 1 month

git:master:acdfa070: Merge pull request #1302 from vitalikvoip/tsilo_fix

by GitHub

Module: kamailio Branch: master Commit: acdfa070da60f6e8f1d5c9c82a394bcc0a5db041 URL: https://github.com/kamailio/kamailio/commit/acdfa070da60f6e8f1d5c9c82a394bc… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-07T13:08:10+01:00 Merge pull request #1302 from vitalikvoip/tsilo_fix tsilo: fix internal data structures --- Modified: src/modules/tsilo/ts_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/acdfa070da60f6e8f1d5c9c82a394bc… Patch: https://github.com/kamailio/kamailio/commit/acdfa070da60f6e8f1d5c9c82a394bc… --- diff --git a/src/modules/tsilo/ts_hash.c b/src/modules/tsilo/ts_hash.c index 01d79940eb..fec10431ca 100644 --- a/src/modules/tsilo/ts_hash.c +++ b/src/modules/tsilo/ts_hash.c @@ -280,10 +280,10 @@ void remove_ts_urecord(ts_urecord_t* _r) if (_r->next) _r->next->prev = _r->prev; - /* it was the last urecord */ - if (entry->n == 1) { - entry->first = entry->last = NULL; - } + if (entry->first == _r) + entry->first = _r->next; + if (entry->last == _r) + entry->last = _r->prev; update_stat(stored_ruris, -1);

7 years, 1 month

git:master:cf26bbe3: tsilo: fix internal data structures

by Vitaliy Aleksandrov

Module: kamailio Branch: master Commit: cf26bbe33307067141dc1abb21fb7c53cb0e5ecc URL: https://github.com/kamailio/kamailio/commit/cf26bbe33307067141dc1abb21fb7c5… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Date: 2017-11-07T11:51:26+02:00 tsilo: fix internal data structures - avoid crash by fixing "first" and "last" pointers of of the ts_entry_t after ts_urecord_t deletion --- Modified: src/modules/tsilo/ts_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/cf26bbe33307067141dc1abb21fb7c5… Patch: https://github.com/kamailio/kamailio/commit/cf26bbe33307067141dc1abb21fb7c5… --- diff --git a/src/modules/tsilo/ts_hash.c b/src/modules/tsilo/ts_hash.c index 01d79940eb..fec10431ca 100644 --- a/src/modules/tsilo/ts_hash.c +++ b/src/modules/tsilo/ts_hash.c @@ -280,10 +280,10 @@ void remove_ts_urecord(ts_urecord_t* _r) if (_r->next) _r->next->prev = _r->prev; - /* it was the last urecord */ - if (entry->n == 1) { - entry->first = entry->last = NULL; - } + if (entry->first == _r) + entry->first = _r->next; + if (entry->last == _r) + entry->last = _r->prev; update_stat(stored_ruris, -1);

7 years, 1 month

← Newer
1
...
38
39
40
41
42
43
44
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017