sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
364 discussions

git:master:06e21915: sanity: reset proxy_require hdr parsed field after freeing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 06e219158131c2397a96bf5d3373c96752d7fd20 URL: https://github.com/kamailio/kamailio/commit/06e219158131c2397a96bf5d3373c96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-15T12:53:59+01:00 sanity: reset proxy_require hdr parsed field after freeing --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/06e219158131c2397a96bf5d3373c96… Patch: https://github.com/kamailio/kamailio/commit/06e219158131c2397a96bf5d3373c96… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 9a791c1..0ab5792 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -704,6 +704,7 @@ int check_proxy_require(struct sip_msg* _msg) { * freed when the message freed. Lets hope nobody needs to access * this header again later on */ free_str_list(_msg->proxy_require->parsed); + _msg->proxy_require->parsed = NULL; } } #ifdef EXTRA_DEBUG

7 years, 10 months

git:master:d31558b3: core: free parsed Required header structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d31558b31fd607f842caa04d85ce8870f6fc1740 URL: https://github.com/kamailio/kamailio/commit/d31558b31fd607f842caa04d85ce887… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-15T12:48:59+01:00 core: free parsed Required header structure --- Modified: src/core/parser/hf.c Modified: src/core/parser/parse_require.c --- Diff: https://github.com/kamailio/kamailio/commit/d31558b31fd607f842caa04d85ce887… Patch: https://github.com/kamailio/kamailio/commit/d31558b31fd607f842caa04d85ce887… --- diff --git a/src/core/parser/hf.c b/src/core/parser/hf.c index 4b82fbe..ba0d5fb 100644 --- a/src/core/parser/hf.c +++ b/src/core/parser/hf.c @@ -154,6 +154,7 @@ void clean_hdr_field(struct hdr_field* const hf) free_subscription_state((subscription_state_t**)h_parsed); break; + case HDR_REQUIRE_T: case HDR_SUPPORTED_T: hdr_free_parsed(h_parsed); break; @@ -172,7 +173,6 @@ void clean_hdr_field(struct hdr_field* const hf) case HDR_CONTENTTYPE_T: case HDR_CONTENTLENGTH_T: case HDR_RETRY_AFTER_T: - case HDR_REQUIRE_T: case HDR_PROXYREQUIRE_T: case HDR_UNSUPPORTED_T: case HDR_ACCEPTLANGUAGE_T: diff --git a/src/core/parser/parse_require.c b/src/core/parser/parse_require.c index a520318..e343e7f 100644 --- a/src/core/parser/parse_require.c +++ b/src/core/parser/parse_require.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2006 Andreas Granig <agranig(a)linguin.org> - * + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -65,7 +65,7 @@ int parse_require( struct sip_msg *msg) require |= rb->option_tags; } - ((struct option_tag_body*)msg->require->parsed)->option_tags_all = + ((struct option_tag_body*)msg->require->parsed)->option_tags_all = require; return 0; }

7 years, 10 months

[kamailio/kamailio] Dialog module: dlg_ctx pv (#991)

by Olle E. Johansson

This pv seems to be not fully documented. When is it used and how? To me it seems like this is used as a template when creating new dialogs (but that's a guess). - when setting the timeout_route I use a string, like "TIMEOUT_ROUTE" and when reading the value, I get an integer value. There's also a few parameters not documented: - "on" - "timeout" - "dir" -- 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/issues/991

7 years, 10 months

git:master:90faa6ee: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 90faa6ee6089b0cd4781e87b76103eb5cfc260ab URL: https://github.com/kamailio/kamailio/commit/90faa6ee6089b0cd4781e87b76103eb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-02-15T09:46:23+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/90faa6ee6089b0cd4781e87b76103eb… Patch: https://github.com/kamailio/kamailio/commit/90faa6ee6089b0cd4781e87b76103eb… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 755b0f7..6593f4c 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1451,11 +1451,11 @@ dlg_refer("caller", "sip:announcement@kamailio.org"); ... modparam("dialog", "default_timeout", 100) ... -route { +request_route { ... if(is_method("INVITE") && !has_totag()) { - $dlg_ctx(timeout_route) = 12; + $dlg_ctx(timeout_route) = "DLGTIMEOUT"; $dlg_ctx(timeout_bye) = 1; } dlg_manage();

7 years, 10 months

git:master:52ee89e4: dialog: small update to doc example using $dlg_ctx(timeout_route)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 52ee89e4713c12aa98d75cd249817c65038712f1 URL: https://github.com/kamailio/kamailio/commit/52ee89e4713c12aa98d75cd249817c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-15T09:37:10+01:00 dialog: small update to doc example using $dlg_ctx(timeout_route) --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/52ee89e4713c12aa98d75cd249817c6… Patch: https://github.com/kamailio/kamailio/commit/52ee89e4713c12aa98d75cd249817c6… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index bb136b7..8290e54 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1768,11 +1768,11 @@ dlg_refer("caller", "sip:announcement@kamailio.org"); ... modparam("dialog", "default_timeout", 100) ... -route { +request_route { ... if(is_method("INVITE") && !has_totag()) { - $dlg_ctx(timeout_route) = 12; + $dlg_ctx(timeout_route) = "DLGTIMEOUT"; $dlg_ctx(timeout_bye) = 1; } dlg_manage();

7 years, 10 months

git:master:3df736fa: dialog: return string route name for $dlg_ctx(timeout_route)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3df736fa1a628ab85e897f831c581b86d4c3df08 URL: https://github.com/kamailio/kamailio/commit/3df736fa1a628ab85e897f831c581b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-15T09:34:57+01:00 dialog: return string route name for $dlg_ctx(timeout_route) - $dlg_ctx(timeout_route_id) returns now the corresponding internal integer id --- Modified: src/modules/dialog/dlg_var.c --- Diff: https://github.com/kamailio/kamailio/commit/3df736fa1a628ab85e897f831c581b8… Patch: https://github.com/kamailio/kamailio/commit/3df736fa1a628ab85e897f831c581b8… --- diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 33f48c5..c7d1ad1 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -455,8 +455,11 @@ int pv_get_dlg_ctx(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, (unsigned int)_dlg_ctx.to_bye); case 4: - return pv_get_uintval(msg, param, res, - (unsigned int)_dlg_ctx.to_route); + if(_dlg_ctx.to_route>0) { + return pv_get_strzval(msg, param, res, + _dlg_ctx.to_route_name); + } + return pv_get_null(msg, param, res); case 5: _dlg_ctx.set = (_dlg_ctx.iuid.h_id==0)?0:1; return pv_get_uintval(msg, param, res, @@ -464,6 +467,9 @@ int pv_get_dlg_ctx(struct sip_msg *msg, pv_param_t *param, case 6: return pv_get_uintval(msg, param, res, (unsigned int)_dlg_ctx.dir); + case 7: + return pv_get_uintval(msg, param, res, + (unsigned int)_dlg_ctx.to_route); default: return pv_get_uintval(msg, param, res, (unsigned int)_dlg_ctx.on); @@ -525,29 +531,29 @@ int pv_parse_dlg_ctx_name(pv_spec_p sp, str *in) switch(in->len) { - case 2: + case 2: if(strncmp(in->s, "on", 2)==0) sp->pvp.pvn.u.isname.name.n = 0; else goto error; break; - case 3: + case 3: if(strncmp(in->s, "set", 3)==0) sp->pvp.pvn.u.isname.name.n = 5; else if(strncmp(in->s, "dir", 3)==0) sp->pvp.pvn.u.isname.name.n = 6; else goto error; break; - case 5: + case 5: if(strncmp(in->s, "flags", 6)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "timeout", 7)==0) sp->pvp.pvn.u.isname.name.n = 2; else goto error; break; - case 11: + case 11: if(strncmp(in->s, "timeout_bye", 11)==0) sp->pvp.pvn.u.isname.name.n = 3; else goto error; @@ -557,6 +563,11 @@ int pv_parse_dlg_ctx_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else goto error; break; + case 16: + if(strncmp(in->s, "timeout_route_id", 16)==0) + sp->pvp.pvn.u.isname.name.n = 7; + else goto error; + break; default: goto error; }

7 years, 10 months

[kamailio/kamailio] tm: deep cloning of the request for fake environment (#971)

by Victor Seva

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/971 -- Commit Summary -- * tm: deep cloning of the request for fake environment -- File Changes -- M src/modules/tm/t_append_branches.c (23) M src/modules/tm/t_reply.c (104) M src/modules/tm/t_reply.h (6) M src/modules/tm/t_suspend.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/971.patch https://github.com/kamailio/kamailio/pull/971.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/971

7 years, 10 months

git:master:56df10c5: Merge pull request #988 from sergey-safarov/spec_update6

by GitHub

Module: kamailio Branch: master Commit: 56df10c585b3354826b164fb84b34c2120d2bf8e URL: https://github.com/kamailio/kamailio/commit/56df10c585b3354826b164fb84b34c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-02-15T07:27:07+01:00 Merge pull request #988 from sergey-safarov/spec_update6 pkg/kamailio/centos: Set of improvements --- Modified: pkg/kamailio/centos/7/kamailio.service Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/56df10c585b3354826b164fb84b34c2… Patch: https://github.com/kamailio/kamailio/commit/56df10c585b3354826b164fb84b34c2… --- diff --git a/pkg/kamailio/centos/7/kamailio.service b/pkg/kamailio/centos/7/kamailio.service index 66945f4..40b4b99 100644 --- a/pkg/kamailio/centos/7/kamailio.service +++ b/pkg/kamailio/centos/7/kamailio.service @@ -4,14 +4,22 @@ After=network.target [Service] Type=forking +WorkingDirectory=/run/kamailio Environment='CFGFILE=/etc/kamailio/kamailio.cfg' +Environment='SHM_MEMORY=64' +Environment='PKG_MEMORY=8' EnvironmentFile=/etc/sysconfig/kamailio # PIDFile requires a full absolute path -PIDFile=/var/run/kamailio.pid +PIDFile=/run/kamailio/kamailio.pid # ExecStart requires a full absolute path -ExecStart=/usr/sbin/kamailio -P /var/run/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP -ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid +ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY +ExecStopPost=/usr/bin/rm -f /run/kamailio/kamailio.pid Restart=on-abort +User=kamailio +Group=daemon +; For each TCP or TLS endpoint connection is requred file descriptor +LimitNOFILE=99999 + [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 3281184..4458ad1 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -222,8 +222,8 @@ json string handling and RPC modules for Kamailio. %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons -Requires: libuuid, kamailio = %ver -BuildRequires: rabbitmq-c-devel, json-c-devel, libuuid-devel +Requires: libuuid, rabbitmq-c, json-c, libevent, kamailio = %ver +BuildRequires: libuuid-devel, rabbitmq-c-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio. @@ -593,6 +593,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if "%{?_unitdir}" == "" # On RedHat 6 like +install -d %{buildroot}%{_rundir}/kamailio mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/kamailio @@ -622,7 +623,12 @@ rm -rf "$RPM_BUILD_ROOT" %post +%if "%{?_unitdir}" == "" /sbin/chkconfig --add kamailio +%else +%tmpfiles_create kamailio.conf +/usr/bin/systemctl -q enable kamailio.service +%endif

7 years, 10 months

git:master:43a924bc: pkg/kamailio/centos: Fixed requirements of root permission to start daemon

by Sergey Safarov

Module: kamailio Branch: master Commit: 43a924bc8776ac8fa58a4c3bf3f8ed9c5486ab05 URL: https://github.com/kamailio/kamailio/commit/43a924bc8776ac8fa58a4c3bf3f8ed9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-02-13T09:32:00-05:00 pkg/kamailio/centos: Fixed requirements of root permission to start daemon --- Modified: pkg/kamailio/centos/7/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/43a924bc8776ac8fa58a4c3bf3f8ed9… Patch: https://github.com/kamailio/kamailio/commit/43a924bc8776ac8fa58a4c3bf3f8ed9… --- diff --git a/pkg/kamailio/centos/7/kamailio.service b/pkg/kamailio/centos/7/kamailio.service index 66945f4..40b4b99 100644 --- a/pkg/kamailio/centos/7/kamailio.service +++ b/pkg/kamailio/centos/7/kamailio.service @@ -4,14 +4,22 @@ After=network.target [Service] Type=forking +WorkingDirectory=/run/kamailio Environment='CFGFILE=/etc/kamailio/kamailio.cfg' +Environment='SHM_MEMORY=64' +Environment='PKG_MEMORY=8' EnvironmentFile=/etc/sysconfig/kamailio # PIDFile requires a full absolute path -PIDFile=/var/run/kamailio.pid +PIDFile=/run/kamailio/kamailio.pid # ExecStart requires a full absolute path -ExecStart=/usr/sbin/kamailio -P /var/run/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP -ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid +ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY +ExecStopPost=/usr/bin/rm -f /run/kamailio/kamailio.pid Restart=on-abort +User=kamailio +Group=daemon +; For each TCP or TLS endpoint connection is requred file descriptor +LimitNOFILE=99999 + [Install] WantedBy=multi-user.target

7 years, 10 months

git:master:0efa0e31: pkg/kamailio/centos: Added tmpfiles initialization

by Sergey Safarov

Module: kamailio Branch: master Commit: 0efa0e315e7c70caf69bd7453adc22695c10c0f8 URL: https://github.com/kamailio/kamailio/commit/0efa0e315e7c70caf69bd7453adc226… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-02-13T09:21:40-05:00 pkg/kamailio/centos: Added tmpfiles initialization --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0efa0e315e7c70caf69bd7453adc226… Patch: https://github.com/kamailio/kamailio/commit/0efa0e315e7c70caf69bd7453adc226… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 2ccc95e..4458ad1 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -593,6 +593,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if "%{?_unitdir}" == "" # On RedHat 6 like +install -d %{buildroot}%{_rundir}/kamailio mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/kamailio @@ -622,7 +623,12 @@ rm -rf "$RPM_BUILD_ROOT" %post +%if "%{?_unitdir}" == "" /sbin/chkconfig --add kamailio +%else +%tmpfiles_create kamailio.conf +/usr/bin/systemctl -q enable kamailio.service +%endif

7 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2017