The define WITH_HIREDIS_PATH causes the source files to include
"<hiredis/hiredis.h>". But the Makefiles check HIREDISDEFS for the
string "hiredis" and set WITH_HIREDIS_PATH if not found. Which is
exactly the opposite of what is needed. This commit corrects the logic.
Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>
<!-- 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 -->
- [ ] Commit message has the format required by CONTRIBUTING guide
- [ ] Commits are split per component (core, individual modules, libs, utils, ...)
- [ ] 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
- [ ] 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
- [ ] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1816
-- Commit Summary --
* modules: fix hiredis handling
-- File Changes --
M src/modules/db_redis/Makefile (2)
M src/modules/ndb_redis/Makefile (2)
M src/modules/topos_redis/Makefile (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1816.patchhttps://github.com/kamailio/kamailio/pull/1816.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/1816
- URL: https://github.com/kamailio/kamailio/commit/3bf230b75b181dd213b08a7cc133fe1…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:47:45+01:00
lib/srdb1: memset db connection structure earlier in db_bind_mod()
(cherry picked from commit 1b014d65e26a99f9f5d4aea1b27949776f083c2d)
(cherry picked from commit 1133f818461cf2ed6c8bd755543f93b366a02683)
- URL: https://github.com/kamailio/kamailio/commit/26173d8999d31c8847d915cd26d164c…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:47:55+01:00
tm: reply_received() - simplify locking for processing sip response
- leverage the recursive mutex and skip several zones of unlock/lock,
which can lead to races on delayed processing or fast reply
retransmissions
- related to GH #1613 #1744
(cherry picked from commit 39b89a18a8c357151a173ab02dc95dff1f02715d)
(cherry picked from commit cc51d6c7170ad289c8f521a05470a2eacd05f565)
- URL: https://github.com/kamailio/kamailio/commit/3e6f951c070291b0b2e9df6cde3f287…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:48:11+01:00
auth_xkeys: clone value before inserting the lump inside auth_xkeys_add()
(cherry picked from commit 01f5ecbc45c236daea62d6638a02c168720c8479)
(cherry picked from commit 3a2d9921dc8a3c8133e7e3bacfba94468f9bbeb6)
- URL: https://github.com/kamailio/kamailio/commit/67657f5ceef6528fab2371bfea386d3…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:49:16+01:00
dialog: store call-id, r-uri, f-uri and t-uri with 0-ending char
- can simplify matching with standard string comparison and regexp
(cherry picked from commit f1ab32ee4a0bf64017a0b05f2013b81d37d50208)
(cherry picked from commit 2e81abf1262784e390eb31efa95c5f437bd7051e)
- URL: https://github.com/kamailio/kamailio/commit/e3eb15272e5940222ceb40c0119e1f7…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:49:36+01:00
pv: {param.count} accept static string "," as delimiter
(cherry picked from commit 80b3c37557d446bfe9ca5a5f469a42af60648280)
(cherry picked from commit cb98198e595c776ccbf2cd8777e178eb81e85b58)
- URL: https://github.com/kamailio/kamailio/commit/4942d5cecc310f516d20594f58bc7b8…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:49:50+01:00
tm: error log message about new final reply made info
- can happen due to races of packets on the network
(cherry picked from commit 3d43f546ddff613c50068c9d47521a15b42f1c7b)
(cherry picked from commit 9ccbcc089e70001dd94136eadb68d2711669142f)
- URL: https://github.com/kamailio/kamailio/commit/0d62a374cef1f21ca87d2e2d9ca6b25…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:50:09+01:00
regex: init var to avoid compile warning
(cherry picked from commit dfb872b311cd0acd4a40c810f612c8a23e7c9aca)
(cherry picked from commit fc6232f7f9d1c65f436e7ca0db505c6e1114145d)
- URL: https://github.com/kamailio/kamailio/commit/44666e217420dda4bda31ae7ffb46ca…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:50:21+01:00
cplc: init var to avoid compile warning
(cherry picked from commit 0f1b970ae7f47478649b61a8dc43fe42714b2a95)
(cherry picked from commit 2dc84951b8f0e2503ee4c551b8693de36b36ef77)
- URL: https://github.com/kamailio/kamailio/commit/ab850a6ad3373dea409eed96fe87da3…
Author: Balajee <balajee(a)Balajees-MacBook-Air.local>
Date: 2019-01-28T12:50:42+01:00
topoh: fixed unmask route issue, if maksing fails for one of the routes
(cherry picked from commit d57f70127c44fd74c459aefc8d2655978b9cb48b)
(cherry picked from commit 4fe56123b424638a5967832f4ac05d3e63a13577)
- URL: https://github.com/kamailio/kamailio/commit/91763e1661c575db1f0ffb1916188a3…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:50:54+01:00
topoh: aded debug message for knowing the reason of no decoding rr
(cherry picked from commit cee4941daf56985d9734263c4b99c33f9ef3a149)
(cherry picked from commit 3a78d068a3678471efe0a7e7f4ea0e7c9bc18675)
- URL: https://github.com/kamailio/kamailio/commit/206cdd921b3fcce9e89691a3c5b9154…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:51:06+01:00
websocket: use the list with ids for ws connections to do ping-pong
- avoid using pointers to ws connections, they can get closed
(cherry picked from commit b5253b62090feb70f08885fb530d894d0bd6ad90)
(cherry picked from commit e25b66962ba51e2749a093f96e0cdaac8df33a4f)
- URL: https://github.com/kamailio/kamailio/commit/9059f23474bf9ec35e7001f715860ca…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:51:17+01:00
websocket: fetch ws connections based on keepalive process index
- get the ones with id that matches the index when doing modulo over the
number of keepalive process in order to spread the load of doing the
ping-pong
(cherry picked from commit 71517152e7de26d6c47fd037c25dc854aa37734f)
(cherry picked from commit 049473bce13cc6994cbde1080d75bb25565ad5bc)
- URL: https://github.com/kamailio/kamailio/commit/f85e6bada0ebd2597cd016111f96c9f…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:51:30+01:00
websocket: destroy ws connections in dedicated timer process
- avoid races/invalid access when sending data failed and the connection
was removed
- added parameter to control the timer process: interval or running and
delay interval for removing
(cherry picked from commit af09e224dba0c57c23fd58a7f83a24d2ffbaa07c)
(cherry picked from commit 281d6fa15abc3b5f60c9dfc7cab272fca4e50d44)
- URL: https://github.com/kamailio/kamailio/commit/89cc9d794ca867de1b60d2239e990d0…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:51:41+01:00
websocket: docs for timer_interval and rm_delay_interval params
(cherry picked from commit 3a20bb1ad27b8a85ec932975e14bcec12237437b)
(cherry picked from commit bc602ee8662a440d0fec47a5ec6b66021a13d4fa)
- URL: https://github.com/kamailio/kamailio/commit/6d28f85378eed7a7da05079be68139c…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Date: 2019-01-28T12:52:34+01:00
cnxcc: fix compilation warnings
> warning: field precision should have type 'int', but argument has type 'size_t' (aka 'unsigned long') [-Wformat]
(cherry picked from commit 89e89e023d923d2dbec694509b9f958bbed6d3ad)
(cherry picked from commit 92d7bec4b5dddad2d08b6434ab6b561b230ee466)
- URL: https://github.com/kamailio/kamailio/commit/19f585b4a32673ee15a9fe50f2edc12…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:52:44+01:00
dialog: only write debug messages in case cseq or contact fields are empty
(cherry picked from commit ae4087ef615c1de5b67c8406eab8316300282d8b)
(cherry picked from commit 5067fe22cc16af943126ea88a9ddd35281ca8636)
- URL: https://github.com/kamailio/kamailio/commit/16e8c6856cfa0f6af426fc337798435…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:52:54+01:00
websocket: removed static from declaration of ws_rm_delay_interval
- it is used as external in another source file
- GH #1771
(cherry picked from commit d5e40d5f05795f3902e5ae51bf4c57345e945a9c)
(cherry picked from commit 42821df5cf64d71b9b837e2e5c55b2d91392a250)
- URL: https://github.com/kamailio/kamailio/commit/d2459f195398199b3968351d9edabae…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:53:08+01:00
cdp: init pointer to avoid warning on uninitialized use
(cherry picked from commit 7873a653a43070f891dc6cde5c188c81bf5de25d)
(cherry picked from commit 5bb811d8d7c09c7792206831326c8f650eb30f66)
- URL: https://github.com/kamailio/kamailio/commit/d498c3ca48ad2e0538d29e13eb283f4…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:53:28+01:00
auth_db: print db table name when version check fails
(cherry picked from commit a8de371e90ddc8a6921b5bf7464961865804cc06)
(cherry picked from commit f62c3cb67c9c2be10393bdeec684eb3dc9325dd6)
- URL: https://github.com/kamailio/kamailio/commit/6d7a6e1ccebf57cd8be791d44d797c9…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:53:43+01:00
ims_isc: free variable in case of errors
(cherry picked from commit e7d684ad22d17f3aca58dd66c555e43877d9320a)
(cherry picked from commit 83597d2fc2922921e66edeca184b3d59354407cf)
- URL: https://github.com/kamailio/kamailio/commit/aadd286fe15ddd121580f2770c3c29f…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:54:41+01:00
dialog: docs - more info about using the flag and dlg_manage()
(cherry picked from commit e4dfe3587943d69d556b15df3492cf38c3b21a5f)
(cherry picked from commit 3dd154faeead29f54145843d14367c5b28a4fb7b)
- URL: https://github.com/kamailio/kamailio/commit/3720283674cc783bceb64987ec8f27a…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-01-28T12:54:50+01:00
dialog: do not require dlg_flag parameter to be set
- using dlg_manage() should be enough for tracking dialogs
(cherry picked from commit 404f403786478a917637186446bb285e8e32cc59)
(cherry picked from commit 563f1d6af3123485ed25cc58bb3badd68e7793a4)
- URL: https://github.com/kamailio/kamailio/commit/f9e7ea0a35d4115f2437d285a8e27ac…
Author: Victor Seva <linuxmaniac(a)torreviejawireless.org>
Date: 2019-01-28T12:55:04+01:00
tsilo: add check for empty aor
Fix: #1775
(cherry picked from commit 5a5d742eb459249995114eb6a3642f99c6770496)
(cherry picked from commit 23a5c07e924a2feb5f09b727f4ad0faf6c5af349)
Module: kamailio
Branch: master
Commit: a1148307a5155c8a6806ae94c0c982200d052dc5
URL: https://github.com/kamailio/kamailio/commit/a1148307a5155c8a6806ae94c0c9822…
Author: Yasin CANER <caner_yaso(a)hotmail.com>
Committer: GitHub <noreply(a)github.com>
Date: 2019-01-17T10:56:31+03:00
ims_registrar_pcscf : added a condition for subscribiton about sos param
if there is a sos parameter on Contact header on saving state in P-CSCF ,P-CSCF dont subscribe to S-CSCF for reg-events.
3GPP TS 24.229 5.2.10.1
Upon receiving the 200 (OK) response to the REGISTER request that completes the emergency registration, as identified by the presence of the "sos" SIP URI parameter in the Contact header field of the 200 (OK) response, the P-CSCF shall not subscribe to the registration event package for any emergency public user identity specified in the REGISTER request.
---
Modified: src/modules/ims_registrar_pcscf/save.c
---
Diff: https://github.com/kamailio/kamailio/commit/a1148307a5155c8a6806ae94c0c9822…
Patch: https://github.com/kamailio/kamailio/commit/a1148307a5155c8a6806ae94c0c9822…
---
diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c
index 39dfe4d589..0789a52bfb 100644
--- a/src/modules/ims_registrar_pcscf/save.c
+++ b/src/modules/ims_registrar_pcscf/save.c
@@ -387,7 +387,9 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) {
str *service_routes=0;
int num_service_routes = 0;
pv_elem_t *presentity_uri_pv;
-
+ int contact_has_sos=-1;
+ contact_t* chi; //contact header information
+ struct hdr_field* h;
//get request from reply
req = get_request_from_reply(_m);
if (!req) {
@@ -395,11 +397,34 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) {
goto error;
}
expires_hdr = cscf_get_expires_hdr(_m, 0);
- cb = cscf_parse_contacts(_m);
+
+ if((parse_headers(_m, HDR_CONTACT_F, 0) == -1) || !_m->contact) {
+ LM_ERR("cannot get the Contact header from the SIP message in saving action in PCSCF\n");
+ goto error;
+ }
+
+ if(!_m->contact->parsed && parse_contact(_m->contact) < 0) {
+ LM_ERR("Couldn t parse Contact Header \n");
+ goto error;
+ }
+
+ cb = ((contact_body_t *)_m->contact->parsed);
if (!cb || (!cb->contacts && !cb->star)) {
LM_DBG("No contact headers and not *\n");
goto error;
}
+
+ for (h = _m->contact; h; h = h->next) {
+ if (h->type == HDR_CONTACT_T && h->parsed) {
+ for (chi = ((contact_body_t*) h->parsed)->contacts; chi; chi = chi->next) {
+ contact_has_sos = cscf_get_sos_uri_param(chi->uri);
+ if(contact_has_sos!=-1){
+ break;
+ }
+ }
+ }
+ }
+
cscf_get_p_associated_uri(_m, &public_ids, &num_public_ids, 1);
service_routes = cscf_get_service_route(_m, &num_service_routes, 1);
@@ -409,7 +434,7 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags) {
goto error;
}
- if(subscribe_to_reginfo == 1){
+ if(subscribe_to_reginfo == 1 && contact_has_sos < 1){
//use the first p_associated_uri - i.e. the default IMPU
LM_DBG("Subscribe to reg event for primary p_associated_uri");
<!-- 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
- [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
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
if there is a sos parameter on Contact header on saving state in P-CSCF ,P-CSCF dont subscribe to S-CSCF for reg-events.
3GPP TS 24.229 5.2.10.1
Upon receiving the 200 (OK) response to the REGISTER request that completes the emergency registration, as identified by the presence of the "sos" SIP URI parameter in the Contact header field of the 200 (OK) response, the P-CSCF shall not subscribe to the registration event package for any emergency public user identity specified in the REGISTER request.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1812
-- Commit Summary --
* ims_registrar_pcscf : added a condition for subscribiton about sos param
-- File Changes --
M src/modules/ims_registrar_pcscf/save.c (31)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1812.patchhttps://github.com/kamailio/kamailio/pull/1812.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/1812
Module: kamailio
Branch: master
Commit: 60399b423f288c7b28756e480413475793e7ae11
URL: https://github.com/kamailio/kamailio/commit/60399b423f288c7b28756e480413475…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2019-01-28T08:31:37+01:00
modules: readme files regenerated - exec ... [skip ci]
---
Modified: src/modules/exec/README
---
Diff: https://github.com/kamailio/kamailio/commit/60399b423f288c7b28756e480413475…
Patch: https://github.com/kamailio/kamailio/commit/60399b423f288c7b28756e480413475…
---
diff --git a/src/modules/exec/README b/src/modules/exec/README
index 2e9c2bcd2a..b63a8b27a1 100644
--- a/src/modules/exec/README
+++ b/src/modules/exec/README
@@ -35,6 +35,7 @@ Jan Janak
4.1. exec_dset(command)
4.2. exec_msg(command)
4.3. exec_avp(command [, avplist])
+ 4.4. exec_cmd(command)
5. Known Issues
@@ -45,6 +46,7 @@ Jan Janak
1.3. exec_dset usage
1.4. exec_msg usage
1.5. exec_avp usage
+ 1.6. exec_cmd usage
Chapter 1. Admin Guide
@@ -66,6 +68,7 @@ Chapter 1. Admin Guide
4.1. exec_dset(command)
4.2. exec_msg(command)
4.3. exec_avp(command [, avplist])
+ 4.4. exec_cmd(command)
5. Known Issues
@@ -144,6 +147,7 @@ modparam("exec", "time_to_kill", 20)
4.1. exec_dset(command)
4.2. exec_msg(command)
4.3. exec_avp(command [, avplist])
+ 4.4. exec_cmd(command)
4.1. exec_dset(command)
@@ -213,6 +217,27 @@ exec_avp("echo TEST");
exec_avp("echo TEST", "$avp(s:test)");
...
+4.4. exec_cmd(command)
+
+ Executes an external command. It is a lightweight version, which does
+ not pass the SIP message as parameter, does not set the environment
+ variables and it does not use the output of the command.
+
+ Meaning of the parameters is as follows:
+ * command - Command to be executed. It can include pseudo-variables.
+
+ WARNING: if the var you are passing out has a bash special character in
+ it, the var needs to be placed inside quotes, for example:
+ exec_msg("print-contact.sh '$ct'");
+
+ This function can be used from ANY_ROUTE.
+
+ Example 1.6. exec_cmd usage
+...
+exec_cmd("echo TEST > /tmp/test.txt");
+exec_cmd("echo TEST > /tmp/$rU.txt");
+...
+
5. Known Issues
There is currently no guarantee that scripts ever return and stop