#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [x] Tested changes locally
- [x] Related to issue #2300
#### Description
from https://github.com/redis/hiredis#using-replies
> The standard replies that redisCommand are of the type redisReply. The type field in the redisReply should be used to test what kind of reply was received:
>
> - REDIS_REPLY_STATUS:
> The command replied with a status reply. The status string can be accessed using reply->str. The length of this string can be accessed using reply->len.
>
> - REDIS_REPLY_ERROR:
> The command replied with an error. The error string can be accessed identical to REDIS_REPLY_STATUS.
adding checks for the reply type to detect command errors
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2314
-- Commit Summary --
* ndb_redis: redis_cmd() check reply type to detect command errors
-- File Changes --
M src/modules/ndb_redis/redis_client.c (13)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2314.patchhttps://github.com/kamailio/kamailio/pull/2314.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/2314
- This functionality it's just available when using api.h bindings. For exported functions current value ka_ping_interval is used.
- Modified add_destination function to provide this new parameter.
- Now we have one timer per destination, instead of multiple, so we don't need to iterate over all destinations. Timers are cleaned when destinations are removed.
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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
- [ ] Small bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds new functionality)
- [x] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
With this code, you can have a different pinging timeout for each destination, instead of the fixed (default 30 seconds) one.
This change is compatible (not breaking) with .cfg or kemi invocations, but it's breaking developers api.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2313
-- Commit Summary --
* keepalive: custom pinging interval per destination
-- File Changes --
M src/modules/keepalive/api.h (2)
M src/modules/keepalive/doc/keepalive.xml (3)
M src/modules/keepalive/doc/keepalive_devel.xml (9)
M src/modules/keepalive/keepalive.h (9)
M src/modules/keepalive/keepalive_api.c (23)
M src/modules/keepalive/keepalive_core.c (46)
M src/modules/keepalive/keepalive_mod.c (12)
M src/modules/keepalive/keepalive_rpc.c (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2313.patchhttps://github.com/kamailio/kamailio/pull/2313.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/2313
Module: kamailio
Branch: master
Commit: 4cebb16b536c35ec74ecbdf595c5c6dbafe5afa1
URL: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d…
Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net>
Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net>
Date: 2020-05-06T23:10:40+02:00
keepalive: custom pinging interval per destination
- This functionality it's just available when using api.h bindings. For exported functions current value ka_ping_interval is used.
- Modified add_destination function to provide this new parameter.
- Now we have one timer per destination, instead of multiple, so we don't need to iterate over all destinations. Timers are cleaned when destinations are removed.
---
Modified: src/modules/keepalive/api.h
Modified: src/modules/keepalive/doc/keepalive.xml
Modified: src/modules/keepalive/doc/keepalive_devel.xml
Modified: src/modules/keepalive/keepalive.h
Modified: src/modules/keepalive/keepalive_api.c
Modified: src/modules/keepalive/keepalive_core.c
Modified: src/modules/keepalive/keepalive_mod.c
Modified: src/modules/keepalive/keepalive_rpc.c
---
Diff: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d…
Patch: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d…
Module: kamailio
Branch: 5.3
Commit: ac1b7f30b4cdc6d48d77f19421822300bcaa34be
URL: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2020-05-07T08:20:53+02:00
pua: use file name specific include guard
(cherry picked from commit 076649793bfdbdc4f03f96961f23997c87ce4268)
---
Modified: src/modules/pua/hash.h
Modified: src/modules/pua/pua.h
---
Diff: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230…
Patch: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230…
---
diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h
index cc73d3e761..454e4bb853 100644
--- a/src/modules/pua/hash.h
+++ b/src/modules/pua/hash.h
@@ -15,8 +15,8 @@
* 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
+ * 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
*/
diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h
index 57cc379ebe..908f5b0cb3 100644
--- a/src/modules/pua/pua.h
+++ b/src/modules/pua/pua.h
@@ -15,13 +15,13 @@
* 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
+ * 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 PUBLISH_H
-#define PUBLISH_H
+#ifndef _PUA_H_
+#define _PUA_H_
#include "../../core/str.h"
#include "../../lib/srdb1/db.h"