sr-dev September 2017

sr-dev@lists.kamailio.org

26 participants
271 discussions

git:master:d6a374d7: cfgutils: Properly handle 'exit' when from route_if_exists()

by Alex Hermann

Module: kamailio Branch: master Commit: d6a374d707f23afddfc007edfeae40b01836b3c0 URL: https://github.com/kamailio/kamailio/commit/d6a374d707f23afddfc007edfeae40b… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2017-09-22T11:56:53+02:00 cfgutils: Properly handle 'exit' when from route_if_exists() exit is supposed to exit the routing script. route_if_exists() wasn't handling the exit, so script would continue to run after 'exit'. --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/d6a374d707f23afddfc007edfeae40b… Patch: https://github.com/kamailio/kamailio/commit/d6a374d707f23afddfc007edfeae40b… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index d8828ce574..c2fc404c56 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -818,9 +818,13 @@ static int w_route_exists(struct sip_msg *msg, char *route) } backup_rt = get_route_type(); set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); ret = run_top_route(main_rt.rlist[newroute], msg, &ctx); set_route_type(backup_rt); + if (ctx.run_flags & EXIT_R_F) { + return 0; + } return ret; }

7 years, 2 months

git:master:92e404b3: cfgutils: Allow pv in check_route_exists() and route_if_exists()

by Alex Hermann

Module: kamailio Branch: master Commit: 92e404b3676aa57bca531096cddc14d58e06c789 URL: https://github.com/kamailio/kamailio/commit/92e404b3676aa57bca531096cddc14d… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2017-09-22T11:56:53+02:00 cfgutils: Allow pv in check_route_exists() and route_if_exists() These functions are somewhat useless if a dynamic parameter is not allowed. --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/92e404b3676aa57bca531096cddc14d… Patch: https://github.com/kamailio/kamailio/commit/92e404b3676aa57bca531096cddc14d… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index d028a30918..d8828ce574 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -162,9 +162,9 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"core_hash", (cmd_function)w_core_hash, 3, fixup_core_hash, 0, ANY_ROUTE}, - {"check_route_exists", (cmd_function)w_check_route_exists, 1, 0, 0, + {"check_route_exists", (cmd_function)w_check_route_exists, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, - {"route_if_exists", (cmd_function)w_route_exists, 1, 0, 0, + {"route_if_exists", (cmd_function)w_route_exists, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"bind_cfgutils", (cmd_function)bind_cfgutils, 0, 0, 0, 0}, @@ -784,7 +784,14 @@ static int w_cfg_trylock(struct sip_msg *msg, char *key, char *s2) */ static int w_check_route_exists(struct sip_msg *msg, char *route) { - if (route_lookup(&main_rt, route)<0) { + str s; + + if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) + { + LM_ERR("invalid route parameter\n"); + return -1; + } + if (route_lookup(&main_rt, s.s)<0) { /* not found */ return -1; } @@ -797,8 +804,15 @@ static int w_route_exists(struct sip_msg *msg, char *route) { struct run_act_ctx ctx; int newroute, backup_rt, ret; + str s; + + if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) + { + LM_ERR("invalid route parameter\n"); + return -1; + } - newroute = route_lookup(&main_rt, route); + newroute = route_lookup(&main_rt, s.s); if (newroute<0) { return -1; }

7 years, 2 months

git:master:194d1bd1: cfgutils: Add fixup_free functions to (u)sleep functions

by Alex Hermann

Module: kamailio Branch: master Commit: 194d1bd1d1b86a92ee51bb32d88c105eb6130910 URL: https://github.com/kamailio/kamailio/commit/194d1bd1d1b86a92ee51bb32d88c105… Author: Alex Hermann <alex(a)hexla.nl> Committer: Alex Hermann <alex(a)hexla.nl> Date: 2017-09-22T11:56:38+02:00 cfgutils: Add fixup_free functions to (u)sleep functions --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/194d1bd1d1b86a92ee51bb32d88c105… Patch: https://github.com/kamailio/kamailio/commit/194d1bd1d1b86a92ee51bb32d88c105… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index ca7bf77ae3..d028a30918 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -134,9 +134,9 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"rand_event", (cmd_function)rand_event, 0, 0, 0, ANY_ROUTE}, - {"sleep", (cmd_function)m_sleep, 1, fixup_igp_null, 0, + {"sleep", (cmd_function)m_sleep, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, - {"usleep", (cmd_function)m_usleep, 1, fixup_igp_null, 0, + {"usleep", (cmd_function)m_usleep, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"abort", (cmd_function)dbg_abort, 0, 0, 0, ANY_ROUTE},

7 years, 2 months

[kamailio/kamailio] Random fixes (#1242)

by Alex Hermann

#### 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  Small fixes to cfgutils and json modules You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1242 -- Commit Summary -- * cfgutils: Add fixup_free functions to (u)sleep functions * cfgutils: Allow pv in check_route_exists() and route_if_exists() * cfgutils: Properly handle 'exit' when from route_if_exists() * cfgutils: Remove debug statements in sleep functions * json: Add fixup_free function for json_get_field * janssonrcp-c: Fix segfault in mod_destroy -- File Changes -- M src/modules/cfgutils/cfgutils.c (32) M src/modules/janssonrpcc/janssonrpcc_mod.c (6) M src/modules/json/json_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1242.patch https://github.com/kamailio/kamailio/pull/1242.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/1242

7 years, 2 months

git:master:5389f903: Merge pull request #1241 from sergey-safarov/spec_update11

by GitHub

Module: kamailio Branch: master Commit: 5389f903c1fea9d7bcc709e84d81249a36dcb3de URL: https://github.com/kamailio/kamailio/commit/5389f903c1fea9d7bcc709e84d81249… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-09-22T14:26:05+02:00 Merge pull request #1241 from sergey-safarov/spec_update11 pkg/kamailio/obs: Updated obs spec --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/5389f903c1fea9d7bcc709e84d81249… Patch: https://github.com/kamailio/kamailio/commit/5389f903c1fea9d7bcc709e84d81249…

7 years, 2 months

git:master:b2d233ad: pkg/kamailio/obs: Added support of OpenSUSE Tumbleweed

by Sergey Safarov

Module: kamailio Branch: master Commit: b2d233adf6bd3678f0fdcca3cc355a0edfc23944 URL: https://github.com/kamailio/kamailio/commit/b2d233adf6bd3678f0fdcca3cc355a0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-09-22T04:39:04-04:00 pkg/kamailio/obs: Added support of OpenSUSE Tumbleweed --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/b2d233adf6bd3678f0fdcca3cc355a0… Patch: https://github.com/kamailio/kamailio/commit/b2d233adf6bd3678f0fdcca3cc355a0…

7 years, 2 months

git:master:9889eaf0: pkg/kamailio/obs Fixed build of perl module

by Sergey Safarov

Module: kamailio Branch: master Commit: 9889eaf0d05c743352a298f03e095c7445f56ce9 URL: https://github.com/kamailio/kamailio/commit/9889eaf0d05c743352a298f03e095c7… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-09-22T04:28:17-04:00 pkg/kamailio/obs Fixed build of perl module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9889eaf0d05c743352a298f03e095c7… Patch: https://github.com/kamailio/kamailio/commit/9889eaf0d05c743352a298f03e095c7… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f0ab5e7d43..2d4617b0ff 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -13,6 +13,7 @@ %bcond_without json %bcond_without kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -30,6 +31,7 @@ %bcond_without json %bcond_without kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -47,6 +49,7 @@ %bcond_without json %bcond_without kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -64,6 +67,7 @@ %bcond_with json %bcond_with kazoo %bcond_without memcached +%bcond_without perl %bcond_with redis %bcond_without sctp %bcond_without websocket @@ -82,6 +86,7 @@ %bcond_without json %bcond_without kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -99,6 +104,7 @@ %bcond_without json %bcond_with kazoo %bcond_without memcached +%bcond_without perl %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -116,6 +122,7 @@ %bcond_with json %bcond_with kazoo %bcond_with memcached +%bcond_with perl %bcond_with redis %bcond_with sctp %bcond_with websocket @@ -133,6 +140,7 @@ %bcond_with json %bcond_with kazoo %bcond_with memcached +%bcond_without perl %bcond_without redis %bcond_with sctp %bcond_with websocket @@ -531,8 +539,14 @@ Protocol (SIP)" support for Kamailio. %package perl Summary: Perl extensions and database driver for Kamailio Group: System Environment/Daemons -Requires: mod_perl, kamailio = %ver +Requires: kamailio = %ver +%if 0%{?leap_version} +Requires: perl +BuildRequires: perl +%else +Requires: mod_perl BuildRequires: mod_perl-devel +%endif %description perl Perl extensions and database driver for Kamailio.

7 years, 2 months

[kamailio/kamailio] pkg/kamailio/obs: Updated obs spec (#1241)

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, ...) - [ ] 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 - [ ] 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 pkg/kamailio/obs: Added support of OpenSUSE Tumbleweed pkg/kamailio/obs Fixed build of perl module pkg/kamailio: Added links to obs spec file for: - Fedora 25, 26 - RHEL 6, 7 - OpenSUSE Leap You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1241 -- Commit Summary -- * pkg/kamailio: Added links to obs spec file for: * pkg/kamailio/obs Fixed build of perl module * pkg/kamailio/obs: Added support of OpenSUSE Tumbleweed -- File Changes -- A pkg/kamailio/fedora/25 (1) A pkg/kamailio/fedora/26 (1) M pkg/kamailio/obs/kamailio.spec (81) M pkg/kamailio/obs/meta (5) A pkg/kamailio/opensuse/1315 (1) A pkg/kamailio/opensuse/1330 (1) A pkg/kamailio/rhel/6 (1) A pkg/kamailio/rhel/7 (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1241.patch https://github.com/kamailio/kamailio/pull/1241.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/1241

7 years, 2 months

git:master:7326e723: ims_registrar_pcscf: added default license header for new files

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7326e7233890db9877992fda7ce8e969fd59be73 URL: https://github.com/kamailio/kamailio/commit/7326e7233890db9877992fda7ce8e96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-22T09:22:52+02:00 ims_registrar_pcscf: added default license header for new files --- Modified: src/modules/ims_registrar_pcscf/sec_agree.c Modified: src/modules/ims_registrar_pcscf/sec_agree.h --- Diff: https://github.com/kamailio/kamailio/commit/7326e7233890db9877992fda7ce8e96… Patch: https://github.com/kamailio/kamailio/commit/7326e7233890db9877992fda7ce8e96… --- diff --git a/src/modules/ims_registrar_pcscf/sec_agree.c b/src/modules/ims_registrar_pcscf/sec_agree.c index f10c29f37b..18b9a806b6 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.c +++ b/src/modules/ims_registrar_pcscf/sec_agree.c @@ -1,3 +1,24 @@ +/** + * Copyright (C) 2017 kamailio.org + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + #include "sec_agree.h" #include "../../core/str.h" diff --git a/src/modules/ims_registrar_pcscf/sec_agree.h b/src/modules/ims_registrar_pcscf/sec_agree.h index 6485ffe105..75443bdc18 100644 --- a/src/modules/ims_registrar_pcscf/sec_agree.h +++ b/src/modules/ims_registrar_pcscf/sec_agree.h @@ -1,3 +1,24 @@ +/** + * Copyright (C) 2017 kamailio.org + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + #ifndef SEC_AGREE_H #define SEC_AGREE_H

7 years, 2 months

git:master:1fe59709: modules: readme files regenerated - kex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1fe5970917f21e9d69127635e04ba8ae585e2da4 URL: https://github.com/kamailio/kamailio/commit/1fe5970917f21e9d69127635e04ba8a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-09-21T16:46:26+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/1fe5970917f21e9d69127635e04ba8a… Patch: https://github.com/kamailio/kamailio/commit/1fe5970917f21e9d69127635e04ba8a…

7 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2017