sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

git:master:214c762c: carrierroute: docs - note about config file ownership

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 214c762c46d5cd5892d2ddc06a25193a01164e8b URL: https://github.com/kamailio/kamailio/commit/214c762c46d5cd5892d2ddc06a25193… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-29T08:25:11+02:00 carrierroute: docs - note about config file ownership - GH #2369 --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/214c762c46d5cd5892d2ddc06a25193… Patch: https://github.com/kamailio/kamailio/commit/214c762c46d5cd5892d2ddc06a25193… --- diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index 21fb73f42e..dee8d006f5 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -206,7 +206,8 @@ modparam("carrierroute", "config_source", "file") <section> <title><varname>config_file</varname> (string)</title> <para> - Specifies the path to the config file. + Specifies the path to the config file. The file has to be owned by + the user and group used to run &kamailio;. </para> <para> <emphasis>

4 years, 5 months

git:master:31c7493d: carrierroute: more details on error message checking file permissions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 31c7493d0d822239a76df4b504b2c319de09c19c URL: https://github.com/kamailio/kamailio/commit/31c7493d0d822239a76df4b504b2c31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-29T08:20:33+02:00 carrierroute: more details on error message checking file permissions - GH #2369 --- Modified: src/modules/carrierroute/carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/31c7493d0d822239a76df4b504b2c31… Patch: https://github.com/kamailio/kamailio/commit/31c7493d0d822239a76df4b504b2c31… --- diff --git a/src/modules/carrierroute/carrierroute.c b/src/modules/carrierroute/carrierroute.c index 7d557c9852..79f8f2e2dc 100644 --- a/src/modules/carrierroute/carrierroute.c +++ b/src/modules/carrierroute/carrierroute.c @@ -216,7 +216,8 @@ static int mod_init(void) { if( !( fs.st_mode & S_IWOTH) && !((fs.st_mode & S_IWGRP) && (fs.st_gid == gid)) && !((fs.st_mode & S_IWUSR) && (fs.st_uid == uid))) { - LM_ERR("config file %s not writable\n", config_file); + LM_ERR("config file %s not writable or not owned by uid: %d and gid: %d\n", + config_file, uid, gid); return -1; } }

4 years, 5 months

git:master:bcae4ab3: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: bcae4ab3274b502921fbf0525455c1474e7a63a4 URL: https://github.com/kamailio/kamailio/commit/bcae4ab3274b502921fbf0525455c14… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-29T08:01:13+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/bcae4ab3274b502921fbf0525455c14… Patch: https://github.com/kamailio/kamailio/commit/bcae4ab3274b502921fbf0525455c14…

4 years, 5 months

[kamailio/kamailio] dipatcher: dockbook and config formatting (#2375)

by sergey-safarov

#### 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I have - fixed DocBook validator warnings; - space formatting; - simplified route[WITHINDLG] You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2375 -- Commit Summary -- * dispatcher: docbook space formating * dispatcher: docbook - fixed "Document root element "chapter", must match DOCTYPE root "book"." * dispatcher: docbook - fixed "The content of the parent element type is element only." * dispatcher: docbook - fixed "The content of the parent element type is element only." * dispatcher: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type' * dispatcher: docbook - space formating * dispatcher: docbook - space formating * dispatcher: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".' * dispatcher: docbook - ident formating using Oxygen 13 * dispatcher: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type' * dispatcher: docbook - ident formating using Oxygen 13 * dispatcher: cfg - more simple nesing for route[WITHINDLG] * dispatcher: cfg - simplified WITHINDLG * dispatcher: cfg - simplified WITHINDLG -- File Changes -- M src/modules/dispatcher/doc/dispatcher.cfg (57) M src/modules/dispatcher/doc/dispatcher.xml (179) M src/modules/dispatcher/doc/dispatcher_admin.xml (1250) M src/modules/dispatcher/doc/dispatcher_faq.xml (143) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2375.patch https://github.com/kamailio/kamailio/pull/2375.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/2375

4 years, 5 months

git:master:ae828e8c: Merge pull request #2375 from sergey-safarov/dipatcher-frmating

by GitHub

Module: kamailio Branch: master Commit: ae828e8c671206f15afd913492833f994ca73435 URL: https://github.com/kamailio/kamailio/commit/ae828e8c671206f15afd913492833f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-06-29T07:48:13+02:00 Merge pull request #2375 from sergey-safarov/dipatcher-frmating dipatcher: dockbook and config formatting --- Modified: src/modules/dispatcher/doc/dispatcher.cfg Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml Modified: src/modules/dispatcher/doc/dispatcher_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/ae828e8c671206f15afd913492833f9… Patch: https://github.com/kamailio/kamailio/commit/ae828e8c671206f15afd913492833f9…

4 years, 5 months

git:master:bef306b9: dispatcher: cfg - simplified WITHINDLG

by Sergey Safarov

Module: kamailio Branch: master Commit: bef306b97e62dfdb5297a1589541a69e68bbcae0 URL: https://github.com/kamailio/kamailio/commit/bef306b97e62dfdb5297a1589541a69… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-25T22:49:02+03:00 dispatcher: cfg - simplified WITHINDLG route[PRESENCE] contains exit command, so we removed extra exit Also some formatings --- Modified: src/modules/dispatcher/doc/dispatcher.cfg --- Diff: https://github.com/kamailio/kamailio/commit/bef306b97e62dfdb5297a1589541a69… Patch: https://github.com/kamailio/kamailio/commit/bef306b97e62dfdb5297a1589541a69… --- diff --git a/src/modules/dispatcher/doc/dispatcher.cfg b/src/modules/dispatcher/doc/dispatcher.cfg index ef72be49d9..f745210e84 100644 --- a/src/modules/dispatcher/doc/dispatcher.cfg +++ b/src/modules/dispatcher/doc/dispatcher.cfg @@ -226,8 +226,8 @@ route[WITHINDLG] { if (is_method("SUBSCRIBE") && uri == myself) { # in-dialog subscribe requests route(PRESENCE); - exit; } + if ( is_method("ACK") ) { if ( t_check_trans() ) { # non loose-route, but stateful ACK; @@ -239,6 +239,7 @@ route[WITHINDLG] { exit; } } + sl_send_reply("404","Not here"); exit; }

4 years, 5 months

git:master:73a523ba: dispatcher: cfg - simplified WITHINDLG

by Sergey Safarov

Module: kamailio Branch: master Commit: 73a523ba02cc4f4d25636a03344c45a5af7ac295 URL: https://github.com/kamailio/kamailio/commit/73a523ba02cc4f4d25636a03344c45a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-25T22:46:35+03:00 dispatcher: cfg - simplified WITHINDLG route[RELAY] contains exit command, so we can simplify construction --- Modified: src/modules/dispatcher/doc/dispatcher.cfg --- Diff: https://github.com/kamailio/kamailio/commit/73a523ba02cc4f4d25636a03344c45a… Patch: https://github.com/kamailio/kamailio/commit/73a523ba02cc4f4d25636a03344c45a… --- diff --git a/src/modules/dispatcher/doc/dispatcher.cfg b/src/modules/dispatcher/doc/dispatcher.cfg index f79e9c762d..ef72be49d9 100644 --- a/src/modules/dispatcher/doc/dispatcher.cfg +++ b/src/modules/dispatcher/doc/dispatcher.cfg @@ -221,25 +221,25 @@ route[WITHINDLG] { setflag(FLT_ACCFAILED); # ... even if the transaction fails } route(RELAY); - } else { - if (is_method("SUBSCRIBE") && uri == myself) { - # in-dialog subscribe requests - route(PRESENCE); + } + + if (is_method("SUBSCRIBE") && uri == myself) { + # in-dialog subscribe requests + route(PRESENCE); + exit; + } + if ( is_method("ACK") ) { + if ( t_check_trans() ) { + # non loose-route, but stateful ACK; + # must be ACK after a 487 or e.g. 404 from upstream server + t_relay(); + exit; + } else { + # ACK without matching transaction ... ignore and discard. exit; } - if ( is_method("ACK") ) { - if ( t_check_trans() ) { - # non loose-route, but stateful ACK; - # must be ACK after a 487 or e.g. 404 from upstream server - t_relay(); - exit; - } else { - # ACK without matching transaction ... ignore and discard. - exit; - } - } - sl_send_reply("404","Not here"); } + sl_send_reply("404","Not here"); exit; }

4 years, 5 months

git:master:df73f600: dispatcher: cfg - more simple nesing for route[WITHINDLG]

by Sergey Safarov

Module: kamailio Branch: master Commit: df73f60011497a7346c122cd4328e9564862a448 URL: https://github.com/kamailio/kamailio/commit/df73f60011497a7346c122cd4328e95… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-25T22:39:14+03:00 dispatcher: cfg - more simple nesing for route[WITHINDLG] --- Modified: src/modules/dispatcher/doc/dispatcher.cfg --- Diff: https://github.com/kamailio/kamailio/commit/df73f60011497a7346c122cd4328e95… Patch: https://github.com/kamailio/kamailio/commit/df73f60011497a7346c122cd4328e95… --- diff --git a/src/modules/dispatcher/doc/dispatcher.cfg b/src/modules/dispatcher/doc/dispatcher.cfg index 98492ec5c2..f79e9c762d 100644 --- a/src/modules/dispatcher/doc/dispatcher.cfg +++ b/src/modules/dispatcher/doc/dispatcher.cfg @@ -209,36 +209,38 @@ route[REQINIT] { # Handle requests within SIP dialogs route[WITHINDLG] { - if (has_totag()) { - # sequential request withing a dialog should - # take the path determined by record-routing - if (loose_route()) { - if (is_method("BYE")) { - setflag(FLT_ACC); # do accounting ... - setflag(FLT_ACCFAILED); # ... even if the transaction fails - } - route(RELAY); - } else { - if (is_method("SUBSCRIBE") && uri == myself) { - # in-dialog subscribe requests - route(PRESENCE); + if (!has_totag()) { + return; + } + + # sequential request withing a dialog should + # take the path determined by record-routing + if (loose_route()) { + if (is_method("BYE")) { + setflag(FLT_ACC); # do accounting ... + setflag(FLT_ACCFAILED); # ... even if the transaction fails + } + route(RELAY); + } else { + if (is_method("SUBSCRIBE") && uri == myself) { + # in-dialog subscribe requests + route(PRESENCE); + exit; + } + if ( is_method("ACK") ) { + if ( t_check_trans() ) { + # non loose-route, but stateful ACK; + # must be ACK after a 487 or e.g. 404 from upstream server + t_relay(); + exit; + } else { + # ACK without matching transaction ... ignore and discard. exit; } - if ( is_method("ACK") ) { - if ( t_check_trans() ) { - # non loose-route, but stateful ACK; - # must be ACK after a 487 or e.g. 404 from upstream server - t_relay(); - exit; - } else { - # ACK without matching transaction ... ignore and discard. - exit; - } - } - sl_send_reply("404","Not here"); } - exit; + sl_send_reply("404","Not here"); } + exit; } # Handle SIP registrations

4 years, 5 months

git:master:948e0476: dispatcher: docbook - ident formating using Oxygen 13

by Sergey Safarov

Module: kamailio Branch: master Commit: 948e04761029c17841b86a2a133f042b69f264ac URL: https://github.com/kamailio/kamailio/commit/948e04761029c17841b86a2a133f042… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-25T22:34:14+03:00 dispatcher: docbook - ident formating using Oxygen 13 --- Modified: src/modules/dispatcher/doc/dispatcher.xml --- Diff: https://github.com/kamailio/kamailio/commit/948e04761029c17841b86a2a133f042… Patch: https://github.com/kamailio/kamailio/commit/948e04761029c17841b86a2a133f042…

4 years, 5 months

git:master:76e1d0ea: dispatcher: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type'

by Sergey Safarov

Module: kamailio Branch: master Commit: 76e1d0ea1789dc122a04bb82be9b90cb43c64450 URL: https://github.com/kamailio/kamailio/commit/76e1d0ea1789dc122a04bb82be9b90c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-25T22:26:48+03:00 dispatcher: docbook - fixed 'Attribute "xmlns:xi" must be declared for element type' --- Modified: src/modules/dispatcher/doc/dispatcher.xml --- Diff: https://github.com/kamailio/kamailio/commit/76e1d0ea1789dc122a04bb82be9b90c… Patch: https://github.com/kamailio/kamailio/commit/76e1d0ea1789dc122a04bb82be9b90c… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index b64151dd44..e61ee6e294 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -6,6 +6,9 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; +<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > +%xinclude; + ]> <book xmlns:xi="http://www.w3.org/2001/XInclude">

4 years, 5 months

← Newer
1
...
9
10
11
12
13
14
15
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020