sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
419 discussions

git:master:992dcdab: core: stop start if ifdef check fails
by Victor Seva 03 Jan '20

03 Jan '20

Module: kamailio Branch: master Commit: 992dcdabbb42394ad694354cf283a3beb7b66878 URL: https://github.com/kamailio/kamailio/commit/992dcdabbb42394ad694354cf283a3b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-01-03T09:43:23+01:00 core: stop start if ifdef check fails Related #2057 --- Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/992dcdabbb42394ad694354cf283a3b… Patch: https://github.com/kamailio/kamailio/commit/992dcdabbb42394ad694354cf283a3b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 584a491ba2..115707aa00 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -216,19 +216,27 @@ void pp_ifdef_level_update(int val) /** * */ -void pp_ifdef_level_check(void) +int pp_ifdef_level_check(void) +{ + if(_pp_ifdef_level!=0) { + return -1; + } else { + LM_DBG("same number of pairing preprocessor directives" + " #!IF[N]DEF - #!ENDIF\n"); + } + return 0; +} + +void pp_ifdef_level_error(void) { if(_pp_ifdef_level!=0) { if (_pp_ifdef_level > 0) { - LM_WARN("different number of preprocessor directives:" + LM_ERR("different number of preprocessor directives:" " %d more #!if[n]def as #!endif\n", _pp_ifdef_level); } else { - LM_WARN("different number of preprocessor directives:" + LM_ERR("different number of preprocessor directives:" " %d more #!endif as #!if[n]def\n", (_pp_ifdef_level)*-1); } - } else { - LM_DBG("same number of pairing preprocessor directives" - " #!IF[N]DEF - #!ENDIF\n"); } } diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 8485059918..6fbd8a3521 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -44,7 +44,8 @@ int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); void pp_ifdef_level_update(int val); -void pp_ifdef_level_check(void); +int pp_ifdef_level_check(void); +void pp_ifdef_level_error(void); void pp_define_core(void); diff --git a/src/main.c b/src/main.c index 0bc2e650dc..1c62c6d130 100644 --- a/src/main.c +++ b/src/main.c @@ -2299,10 +2299,10 @@ int main(int argc, char** argv) yyin=cfg_stream; debug_save = default_core_cfg.debug; - if ((yyparse()!=0)||(cfg_errors)){ + if ((yyparse()!=0)||(cfg_errors)||(pp_ifdef_level_check()<0)){ fprintf(stderr, "ERROR: bad config file (%d errors)\n", cfg_errors); if (debug_flag) default_core_cfg.debug = debug_save; - pp_ifdef_level_check(); + pp_ifdef_level_error(); goto error; } @@ -2310,7 +2310,6 @@ int main(int argc, char** argv) fprintf(stderr, "%d config warnings\n", cfg_warnings); } if (debug_flag) default_core_cfg.debug = debug_save; - pp_ifdef_level_check(); print_rls(); if(init_dst_set()<0) {

1 0

git:master:198dcde0: modules: readme files regenerated - dmq_usrloc ... [skip ci]
by Kamailio Dev 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: 198dcde016514de3701e0cf1018a7427ee490f04 URL: https://github.com/kamailio/kamailio/commit/198dcde016514de3701e0cf1018a742… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-02T21:46:10+01:00 modules: readme files regenerated - dmq_usrloc ... [skip ci] --- Modified: src/modules/dmq_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/198dcde016514de3701e0cf1018a742… Patch: https://github.com/kamailio/kamailio/commit/198dcde016514de3701e0cf1018a742… --- diff --git a/src/modules/dmq_usrloc/README b/src/modules/dmq_usrloc/README index 3a05cbddfd..a2b9410f87 100644 --- a/src/modules/dmq_usrloc/README +++ b/src/modules/dmq_usrloc/README @@ -42,6 +42,7 @@ Julien Chavanton 3.5. batch_msg_size (int) 3.6. batch_msg_contacts (int) 3.7. usrloc_domain (string) + 3.8. replicate_socket_info (int) List of Examples @@ -52,6 +53,7 @@ Julien Chavanton 1.5. Set batch_msg_size parameter 1.6. Set batch_msg_contacts parameter 1.7. Set usrloc_domain parameter + 1.8. Set replicate_socket_info parameter Chapter 1. Admin Guide @@ -71,6 +73,7 @@ Chapter 1. Admin Guide 3.5. batch_msg_size (int) 3.6. batch_msg_contacts (int) 3.7. usrloc_domain (string) + 3.8. replicate_socket_info (int) 1. Overview @@ -96,6 +99,7 @@ Chapter 1. Admin Guide 3.5. batch_msg_size (int) 3.6. batch_msg_contacts (int) 3.7. usrloc_domain (string) + 3.8. replicate_socket_info (int) 3.1. enable (int) @@ -201,3 +205,17 @@ modparam("dmq_usrloc", "batch_usleep", 500000) # one batch every 500ms ... modparam("dmq_usrloc", "usrloc_domain", "my_domain") ... + +3.8. replicate_socket_info (int) + + The parameter controls whether the socket replication is active or not. + This is important for anycast scenarios. The value can be: + * 0 - disabled + * 1 - enabled + + Default value is 0. + + Example 1.8. Set replicate_socket_info parameter +... +modparam("dmq_usrloc", "replicate_socket_info", 0) +...

1 0

[kamailio/kamailio] dmq_usrloc: replicate_socket_info using dmq (#2175)
by Nuno M Reis 02 Jan '20

02 Jan '20

- replicate_socket_info using dmq through a new modparam - useful for anycast scenarios You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2175 -- Commit Summary -- * dmq_usrloc: replicate_socket_info using dmq -- File Changes -- M src/modules/dmq_usrloc/dmq_usrloc.c (2) M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (33) M src/modules/dmq_usrloc/usrloc_sync.c (30) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2175.patch https://github.com/kamailio/kamailio/pull/2175.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/2175

3 3

git:master:a830504f: dmq_usrloc: replicate_socket_info using dmq
by Nuno M Reis 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: a830504f76850dff71653fb684b9c5495e895b32 URL: https://github.com/kamailio/kamailio/commit/a830504f76850dff71653fb684b9c54… Author: Nuno M Reis <nreis(a)gocontact.pt> Committer: Nuno M Reis <nreis(a)gocontact.pt> Date: 2019-12-09T18:57:37Z dmq_usrloc: replicate_socket_info using dmq - replicate_socket_info using dmq through a new modparam - useful for anycast scenarios --- Modified: src/modules/dmq_usrloc/dmq_usrloc.c Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/a830504f76850dff71653fb684b9c54… Patch: https://github.com/kamailio/kamailio/commit/a830504f76850dff71653fb684b9c54…

1 0

git:master:c60e6aac: Merge pull request #2175 from nmreis/PR_replicate_socket_info
by GitHub 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: c60e6aacb99a8e03e954edbf148cabc5573f9082 URL: https://github.com/kamailio/kamailio/commit/c60e6aacb99a8e03e954edbf148cabc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-01-02T21:42:21+01:00 Merge pull request #2175 from nmreis/PR_replicate_socket_info dmq_usrloc: replicate_socket_info using dmq --- Modified: src/modules/dmq_usrloc/dmq_usrloc.c Modified: src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/c60e6aacb99a8e03e954edbf148cabc… Patch: https://github.com/kamailio/kamailio/commit/c60e6aacb99a8e03e954edbf148cabc…

1 0

git:master:2b118d4e: modules: readme files regenerated - rtpproxy ... [skip ci]
by Kamailio Dev 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: 2b118d4e1bf9f70c7d2b5a3e63fe7a5ecf68b697 URL: https://github.com/kamailio/kamailio/commit/2b118d4e1bf9f70c7d2b5a3e63fe7a5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-02T16:16:20+01:00 modules: readme files regenerated - rtpproxy ... [skip ci] --- Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/2b118d4e1bf9f70c7d2b5a3e63fe7a5… Patch: https://github.com/kamailio/kamailio/commit/2b118d4e1bf9f70c7d2b5a3e63fe7a5… --- diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README index ea6fe92e3a..93cb48b609 100644 --- a/src/modules/rtpproxy/README +++ b/src/modules/rtpproxy/README @@ -791,6 +791,7 @@ Chapter 2. Frequently Asked Questions 2.2. Where can I find more about Kamailio? 2.3. Where can I post a question about this module? 2.4. How can I report a bug? + 2.5. Does rtpproxy support MSRP protocol? 2.1. @@ -826,3 +827,9 @@ Chapter 2. Frequently Asked Questions Please follow the guidelines provided at: https://github.com/kamailio/kamailio/issues. + + 2.5. + + Does rtpproxy support MSRP protocol? + + Module do not support message media of MSRP protocol.

1 0

[kamailio/kamailio] src/modules/rtpproxy: Updated FAQ about MSRP support (#2185)
by sergey-safarov 02 Jan '20

02 Jan '20

#### 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: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Updated FAQ about MSRP support You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2185 -- Commit Summary -- * src/modules/rtpproxy: Updated FAQ about MSRP support -- File Changes -- M src/modules/rtpproxy/doc/rtpproxy_faq.xml (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2185.patch https://github.com/kamailio/kamailio/pull/2185.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/2185

2 1

git:master:347a3d13: src/modules/rtpproxy: Updated FAQ about MSRP support
by Sergey Safarov 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: 347a3d1399389335102869b9253ec07fed521613 URL: https://github.com/kamailio/kamailio/commit/347a3d1399389335102869b9253ec07… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-12-25T15:13:29+03:00 src/modules/rtpproxy: Updated FAQ about MSRP support --- Modified: src/modules/rtpproxy/doc/rtpproxy_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/347a3d1399389335102869b9253ec07… Patch: https://github.com/kamailio/kamailio/commit/347a3d1399389335102869b9253ec07… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_faq.xml b/src/modules/rtpproxy/doc/rtpproxy_faq.xml index 7b7e2256bd..b9aefb0f7d 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_faq.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_faq.xml @@ -70,6 +70,16 @@ </para> </answer> </qandaentry> + <qandaentry> + <question> + <para>Does rtpproxy support MSRP protocol?</para> + </question> + <answer> + <para> + Module do not support message media of MSRP protocol. + </para> + </answer> + </qandaentry> </qandaset> </chapter>

1 0

git:master:873f0218: Merge pull request #2185 from sergey-safarov/doc-rtpproxy
by GitHub 02 Jan '20

02 Jan '20

Module: kamailio Branch: master Commit: 873f0218023a1b66921a1a407ffe4416ada92208 URL: https://github.com/kamailio/kamailio/commit/873f0218023a1b66921a1a407ffe441… Author: Olle E. Johansson <oej(a)edvina.net> Committer: GitHub <noreply(a)github.com> Date: 2020-01-02T16:10:44+01:00 Merge pull request #2185 from sergey-safarov/doc-rtpproxy src/modules/rtpproxy: Updated FAQ about MSRP support --- Modified: src/modules/rtpproxy/doc/rtpproxy_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/873f0218023a1b66921a1a407ffe441… Patch: https://github.com/kamailio/kamailio/commit/873f0218023a1b66921a1a407ffe441… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_faq.xml b/src/modules/rtpproxy/doc/rtpproxy_faq.xml index 7b7e2256bd..b9aefb0f7d 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_faq.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_faq.xml @@ -70,6 +70,16 @@ </para> </answer> </qandaentry> + <qandaentry> + <question> + <para>Does rtpproxy support MSRP protocol?</para> + </question> + <answer> + <para> + Module do not support message media of MSRP protocol. + </para> + </answer> + </qandaentry> </qandaset> </chapter>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020