sr-dev September 2022

sr-dev@lists.kamailio.org

16 participants
275 discussions

[kamailio/kamailio] [WIP] presence_reginfo: Add option for aggregating reginfo presentities (PR #3240)

by Matteo

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 Right now the `presence_reginfo` module does not perform any aggregation on presentities from the same AoR. While this is generally ok for new notifies driven by new publishes, when a new subscription is received only the most recent presentity is notified. This PR adds a new parameter, disabled by default to preserve compatibility, which merges all presentities for the same AoR into a single document. For example, two registrations from the same AoR will create the following document: ```<?xml version="1.0"?> <reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="23" state="full"> <registration aor="sip:user2@example.com" id="0x7f9b6bbf9cf8" state="active"> <contact id="0x7f9b6bbf3ea8" state="active" event="created" expires="300" callid="23439394725296-103541137625012(a)192.168.10.130" cseq="38" received="" path="&lt;sip:172.23.42.1;lr;received=sip:uac.public.ip:60015;r2=on&gt;,&lt;sip:kamailio.public.ip;lr;received=sip:uac.public.ip:60015;r2=on&gt;" user_agent="MyUA 1.2.3.4"> <uri>sip:user2@192.168.10.130:5060</uri> </contact> </registration> <registration aor="sip:user2@example.com" id="0x7f46836f63b8" state="active"> <contact id="0x7f46836f64e0" state="active" event="refreshed" expires="300" callid="15796302815379-26687127665413(a)192.168.10.130" cseq="38" received="" path="&lt;sip:172.23.42.1;lr;received=sip:uac.public.ip:5099;r2=on&gt;,&lt;sip:kamailio.public.ip;lr;received=sip:uac.public.ip:5099;r2=on&gt;" user_agent="MyUA 1.2.3.4"> <uri>sip:user2@192.168.10.130:5099</uri> </contact> </registration> </reginfo> ``` Example of a body with two registrations with different bodies: ``` <?xml version="1.0"?> <reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="21" state="full"> <registration aor="sip:user2@example.com" id="0x7f9b6bc55540" state="terminated"/> <registration aor="sip:user2@example.com" id="0x7f46836f63b8" state="active"> <contact id="0x7f46836f64e0" state="active" event="refreshed" expires="300" callid="15796302815379-26687127665413(a)192.168.10.130" cseq="36" received="" path="&lt;sip:172.23.42.1;lr;received=sip:uac.public.ip:5099;r2=on&gt;,&lt;sip:kamailio.public.ip;lr;received=sip:uac.public.ip:5099;r2=on&gt;" user_agent="MyUA 1.2.3.4"> <uri>sip:user2@192.168.10.130:5099</uri> </contact> </registration> </reginfo> ``` What is maybe missing: if the aor and id are the same on different presentities (is possible ?) we should not put it twice in the same body, because aor+id identify an unique registration. Most of the code has been adapted from `presence_dialoginfo` so I have preserved the original authors, too. Since is a bit complex PR (for me, at least) I'm begging for a in deep review ;) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3240 -- Commit Summary -- * [presence_reginfo] Add option for aggregating presentities -- File Changes -- M src/modules/presence_reginfo/Makefile (19) M src/modules/presence_reginfo/add_events.c (17) M src/modules/presence_reginfo/doc/presence_reginfo_admin.xml (21) A src/modules/presence_reginfo/notify_body.c (322) A src/modules/presence_reginfo/notify_body.h (43) M src/modules/presence_reginfo/presence_reginfo.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3240.patch https://github.com/kamailio/kamailio/pull/3240.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3240 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3240(a)github.com>

2 years, 2 months

git:master:91cf0ce5: presence_reginfo: Add option for aggregating presentities

by Henning Westerholt

Module: kamailio Branch: master Commit: 91cf0ce599b41fd6482e3206217fc9b6e7821a66 URL: https://github.com/kamailio/kamailio/commit/91cf0ce599b41fd6482e3206217fc9b… Author: Matteo Brancaleoni <matteo.brancaleoni(a)voismart.it> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-27T16:11:32+02:00 presence_reginfo: Add option for aggregating presentities --- Added: src/modules/presence_reginfo/notify_body.c Added: src/modules/presence_reginfo/notify_body.h Modified: src/modules/presence_reginfo/Makefile Modified: src/modules/presence_reginfo/add_events.c Modified: src/modules/presence_reginfo/doc/presence_reginfo_admin.xml Modified: src/modules/presence_reginfo/presence_reginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/91cf0ce599b41fd6482e3206217fc9b… Patch: https://github.com/kamailio/kamailio/commit/91cf0ce599b41fd6482e3206217fc9b…

2 years, 2 months

git: new commits in branch 5.6

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/47131b03e882576f80ae7cd80804e39… Author: Matthias Urlichs <matthias(a)urlichs.de> Date: 2022-09-27T11:51:22+02:00 modules/python3: return NULL on error. - PyErr_SetString is a void function. It doesn't return NULL. (cherry picked from commit b7911b63d7a27a4f29acc4bca3101f7857930084) - URL: https://github.com/kamailio/kamailio/commit/f8b08d32713063403819600559477c7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-09-27T11:51:36+02:00 ratelimit: export functions to kemi (cherry picked from commit 678d93a742ba294bbe571c975814e01fdd795371) - URL: https://github.com/kamailio/kamailio/commit/f30bed90a892d3ec367d5244d089e75… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-09-27T11:51:42+02:00 siputils: export is_gruu() to kemi (cherry picked from commit a33b41ba804bc944b0e1c4ecf17fdc3ca68d4da0) - URL: https://github.com/kamailio/kamailio/commit/cd167423e063dd5e1b1b33aca07c9a2… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-09-27T11:51:48+02:00 dialplan: export dp_translate to kemi (cherry picked from commit 2f67daa9ce945cb57b8429101569203d4b891d1c) - URL: https://github.com/kamailio/kamailio/commit/ca84452027e8b66957b14420df94b9d… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-09-27T11:52:03+02:00 dialplan: Fix typos Fix typos in kemi exports (cherry picked from commit 2e8bfcef4f3f90214df0c1fe4d40d359265f060a) - URL: https://github.com/kamailio/kamailio/commit/2ee8fad13416c5c447effe9263b3cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:52:14+02:00 dialplan: rename exports to kemi - function names have to be unique (cherry picked from commit f89bab70ef9cc842f37799c7c414f40d8ac581ab) - URL: https://github.com/kamailio/kamailio/commit/86a73afc57b6aedb08662175604d340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:52:22+02:00 dialplan: removed unnecessary define (cherry picked from commit 220750f79737b13b6aad0c38d6dd8ea3e28d5ca5) - URL: https://github.com/kamailio/kamailio/commit/88e98ed7810d198703c006a8dec7508… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:52:53+02:00 dialplan: prefixed some global variables to avoid naming conflicts (cherry picked from commit e43083e32df03b629f0eab9d567bd41d6cb749ff) - URL: https://github.com/kamailio/kamailio/commit/3033b7681b4240fd64c9f1ff446b529… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:53:59+02:00 websocket: clean up ws structures without an active tcp connection - GH #3236 (cherry picked from commit abe60832de46796a1395a75a67753c1a12a1ec0a) - URL: https://github.com/kamailio/kamailio/commit/aa645fbebf35183e1c30662f9ed7f48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:54:09+02:00 websocket: debug message for rpc command when finding no tcp connection (cherry picked from commit 4434e83db1d4b668dabbe915fe36719ede165915) - URL: https://github.com/kamailio/kamailio/commit/7d3bf6dc12db22d26f119c3479de05b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:54:40+02:00 dmq_usrloc: safety checks for sock field - GH #3243 (cherry picked from commit 518296523db0c1735c3234d77d6af312f5c9babb) - URL: https://github.com/kamailio/kamailio/commit/e336519e133419d61967b1cb931fb04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:54:51+02:00 acc: more meaningful array index names for building cdr attributes (cherry picked from commit c5f71a45c7c55af0cf4a6aa482d8a57018af7900) - URL: https://github.com/kamailio/kamailio/commit/d223f608282f04844bc492c6ced9a3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:54:58+02:00 acc: clone dlg core attributes - GH #3243 (cherry picked from commit d616dc46b5373b1474bf855afde4c5687d2a2d09) - URL: https://github.com/kamailio/kamailio/commit/ad68b6737b478c1cbdd5ca838078e42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:55:08+02:00 acc_json: update to free cdr core attrs (cherry picked from commit f7b35f05f31bd7cc01aea4572c79ba48d84d8123) - URL: https://github.com/kamailio/kamailio/commit/b2ef87bcd84d4d4f7b0f6bf14d5e647… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-27T11:55:53+02:00 kex: add additional safety checks for printing, based on PR #3250 from bensly-shanmugam (cherry picked from commit e241f7b8a07b24fba6d6ecf2c344a39d2b2b5859) - URL: https://github.com/kamailio/kamailio/commit/feeacb2338c874b7f65353790112848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:56:05+02:00 acc_json: moved global vars declaration to .c file - made them static (cherry picked from commit 023af516f4ede3742f2e1836474978b596a4a3a8) - URL: https://github.com/kamailio/kamailio/commit/d3dd1ea6dfbba83148d005234a0dbe9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:56:14+02:00 acc_json: use the variable for the time key (cherry picked from commit 3e2b5d9ed6a0f18199359444c5ae33a1d6b94eb2) - URL: https://github.com/kamailio/kamailio/commit/408b15d756cfaba592c3540b1199229… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T11:56:21+02:00 acc_json: code formatting updates (cherry picked from commit bcb3970d7a89ab27b43f86aee5b93a473a8b790b) - URL: https://github.com/kamailio/kamailio/commit/ddd4bc1b1481c1ea7c8d5339efd9969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:03:49+02:00 dialog: internal api functions to get dlg variable reference or value (cherry picked from commit a7cecdcbc3c1d53fce22a33a3768da2a1907d64e) - URL: https://github.com/kamailio/kamailio/commit/547f8f0dc27a1365ab822dd2f9f2d32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:04:14+02:00 dialog: init output dlg var value param eariler (cherry picked from commit ce3cd42631ac06a6a20892bd308901c6acd58f7a) - URL: https://github.com/kamailio/kamailio/commit/c1196024c8373d8112e7b088f202446… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:04:21+02:00 acc: use get_dlg_varval() to get values for dialog variables (cherry picked from commit fb7c497893f05587bda1c37e09d73a7ebb522715) - URL: https://github.com/kamailio/kamailio/commit/458ba44f3805fbca4656071b43e820c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:04:27+02:00 uac: use dlg api functions get_dlg_varval() and get_dlg_varref() (cherry picked from commit cd4e2259526bc4642259201ee96b00624f300437) - URL: https://github.com/kamailio/kamailio/commit/02ef4a197372615355875c1ef0a3494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:04:53+02:00 dialog: update check on dialog var key length (cherry picked from commit a7571233bc7dee0381e8ed7e44408f63fa45c156) - URL: https://github.com/kamailio/kamailio/commit/c4bebdca67335b0a23588039665bc9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:06+02:00 dialog: api function get pkg-allocated duplicate of dlg var value (cherry picked from commit 13512f48e03a2ef99847edf639582aaf3b4dfeb3) - URL: https://github.com/kamailio/kamailio/commit/ed86cd4030aa479545c23b31e16c376… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:13+02:00 dialog: updated comments for api functions to get dlg var value (cherry picked from commit 8548aaa8a798b939e041821848b2f05b963451d8) - URL: https://github.com/kamailio/kamailio/commit/bd87a18abefb818fd033be14db35642… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:19+02:00 dialog: api function to get the status if dlg var is set or not (cherry picked from commit c2c3211cd31405188891abd16ef770c26a8ddd44) - URL: https://github.com/kamailio/kamailio/commit/c77fe2578428acdf08144f9e9bc7e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:24+02:00 dialog: updated ki_dlg_var_is_null() to use safer api function (cherry picked from commit abdb02d3d2eec9fb45646f68996da3526c92ef58) - URL: https://github.com/kamailio/kamailio/commit/d5003c0905d112cb7f0d852301681c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:32+02:00 dialog: export new itermodule api functions - get duplicate var value and status (cherry picked from commit 320af48dffaa3c9b2c266ad9f68233e3cf48f9f0) - URL: https://github.com/kamailio/kamailio/commit/a138996a58a0e1f8202b61888019ab9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:05:40+02:00 uac: use get_dlg_varstatus() to check if var exists (cherry picked from commit 86a357c278c45a8d7b580e79ac074115871065fb) - URL: https://github.com/kamailio/kamailio/commit/bfc5c2aacb272e91da80096ef27fbe6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-27T12:11:11+02:00 pua_dialoginfo: use dlg api function get_dlg_varref() - manual update to the new dlg api function replacing the old get_dlg_var()

2 years, 2 months

git:5.6:8404ba8c: pv: use the function for header name parsing that does not require the colon termination

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 8404ba8c869f5d1e44bdf0111d97f249f68d90b5 URL: https://github.com/kamailio/kamailio/commit/8404ba8c869f5d1e44bdf0111d97f24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T20:49:46+02:00 pv: use the function for header name parsing that does not require the colon termination (cherry picked from commit 1fbdc35c3d29da048cb06bfe0268c503c5015c3c) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/8404ba8c869f5d1e44bdf0111d97f24… Patch: https://github.com/kamailio/kamailio/commit/8404ba8c869f5d1e44bdf0111d97f24… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1410d80b43..2441b49324 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2139,7 +2139,7 @@ int pv_get_hdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_null(msg, param, res); @@ -2188,7 +2188,7 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, hcount); } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0); @@ -2256,7 +2256,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0); @@ -2500,7 +2500,7 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, 0); } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0);

2 years, 2 months

git:master:1fbdc35c: pv: use the function for header name parsing that does not require the colon termination

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1fbdc35c3d29da048cb06bfe0268c503c5015c3c URL: https://github.com/kamailio/kamailio/commit/1fbdc35c3d29da048cb06bfe0268c50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T20:37:31+02:00 pv: use the function for header name parsing that does not require the colon termination --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/1fbdc35c3d29da048cb06bfe0268c50… Patch: https://github.com/kamailio/kamailio/commit/1fbdc35c3d29da048cb06bfe0268c50… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index ab5bdc4887..27966dbdcd 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2139,7 +2139,7 @@ int pv_get_hdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_null(msg, param, res); @@ -2188,7 +2188,7 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, hcount); } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0); @@ -2256,7 +2256,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_null(msg, param, res); @@ -2500,7 +2500,7 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, 0); } - parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + parse_hname2_str(&tv.rs, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); return pv_get_sintval(msg, param, res, 0);

2 years, 2 months

git:master:86a357c2: uac: use get_dlg_varstatus() to check if var exists

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 86a357c278c45a8d7b580e79ac074115871065fb URL: https://github.com/kamailio/kamailio/commit/86a357c278c45a8d7b580e79ac07411… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T15:58:15+02:00 uac: use get_dlg_varstatus() to check if var exists --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/86a357c278c45a8d7b580e79ac07411… Patch: https://github.com/kamailio/kamailio/commit/86a357c278c45a8d7b580e79ac07411… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 513623ba26..36827aeb3e 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -391,7 +391,7 @@ int replace_uri( struct sip_msg *msg, str *display, str *uri, if (dlg) { dlgvar_names = (uac_flag==FL_USE_UAC_FROM)?from_dlgvar:to_dlgvar; - if(dlg_api.get_dlg_varref(dlg, &dlgvar_names[0])) { + if(dlg_api.get_dlg_varstatus(dlg, &dlgvar_names[0])) { LM_INFO("Already called uac_replace for this dialog\n"); /* delete the from_new dlg var */

2 years, 2 months

git:master:320af48d: dialog: export new itermodule api functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 320af48dffaa3c9b2c266ad9f68233e3cf48f9f0 URL: https://github.com/kamailio/kamailio/commit/320af48dffaa3c9b2c266ad9f68233e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T15:30:51+02:00 dialog: export new itermodule api functions - get duplicate var value and status --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_load.h --- Diff: https://github.com/kamailio/kamailio/commit/320af48dffaa3c9b2c266ad9f68233e… Patch: https://github.com/kamailio/kamailio/commit/320af48dffaa3c9b2c266ad9f68233e… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 2a7fd39948..7fa6bd57c6 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -483,6 +483,8 @@ int load_dlg( struct dlg_binds *dlgb ) dlgb->set_dlg_var = set_dlg_variable; dlgb->get_dlg_varref = get_dlg_varref; dlgb->get_dlg_varval = get_dlg_varval; + dlgb->get_dlg_vardup = get_dlg_vardup; + dlgb->get_dlg_varstatus = get_dlg_varstatus; dlgb->get_dlg = dlg_get_msg_dialog; dlgb->release_dlg = dlg_release; return 1; diff --git a/src/modules/dialog/dlg_load.h b/src/modules/dialog/dlg_load.h index 16fb568ef3..69d78e1ee2 100644 --- a/src/modules/dialog/dlg_load.h +++ b/src/modules/dialog/dlg_load.h @@ -43,14 +43,15 @@ typedef struct dlg_cell *(*get_dlg_f)(struct sip_msg *msg); typedef void (*release_dlg_f)(struct dlg_cell *dlg); struct dlg_binds { - register_dlgcb_f register_dlgcb; - terminate_dlg_f terminate_dlg; - set_dlg_variable_f set_dlg_var; - get_dlg_varref_f get_dlg_varref; - get_dlg_varval_f get_dlg_varval; - get_dlg_vardup_f get_dlg_vardup; - get_dlg_f get_dlg; - release_dlg_f release_dlg; + register_dlgcb_f register_dlgcb; + terminate_dlg_f terminate_dlg; + set_dlg_variable_f set_dlg_var; + get_dlg_varref_f get_dlg_varref; + get_dlg_varval_f get_dlg_varval; + get_dlg_vardup_f get_dlg_vardup; + get_dlg_varstatus_f get_dlg_varstatus; + get_dlg_f get_dlg; + release_dlg_f release_dlg; };

2 years, 2 months

git:master:abdb02d3: dialog: updated ki_dlg_var_is_null() to use safer api function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: abdb02d3d2eec9fb45646f68996da3526c92ef58 URL: https://github.com/kamailio/kamailio/commit/abdb02d3d2eec9fb45646f68996da35… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T12:51:50+02:00 dialog: updated ki_dlg_var_is_null() to use safer api function --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/abdb02d3d2eec9fb45646f68996da35… Patch: https://github.com/kamailio/kamailio/commit/abdb02d3d2eec9fb45646f68996da35… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index d4d2df07fa..2a7fd39948 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2518,14 +2518,14 @@ static int ki_dlg_var_rm(sip_msg_t *msg, str *name) static int ki_dlg_var_is_null(sip_msg_t *msg, str *name) { dlg_cell_t *dlg; - str *pval; + int ret; dlg = dlg_get_msg_dialog(msg); if(dlg==NULL) { return 1; } - pval = get_dlg_varref(dlg, name); - if(pval==NULL || pval->s==NULL) { + ret = get_dlg_varstatus(dlg, name); + if(ret==1) { return 1; } return -1;

2 years, 2 months

git:master:c2c3211c: dialog: api function to get the status if dlg var is set or not

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c2c3211cd31405188891abd16ef770c26a8ddd44 URL: https://github.com/kamailio/kamailio/commit/c2c3211cd31405188891abd16ef770c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T12:30:06+02:00 dialog: api function to get the status if dlg var is set or not --- Modified: src/modules/dialog/dlg_cb.h Modified: src/modules/dialog/dlg_var.c Modified: src/modules/dialog/dlg_var.h --- Diff: https://github.com/kamailio/kamailio/commit/c2c3211cd31405188891abd16ef770c… Patch: https://github.com/kamailio/kamailio/commit/c2c3211cd31405188891abd16ef770c… --- diff --git a/src/modules/dialog/dlg_cb.h b/src/modules/dialog/dlg_cb.h index 86a85bb2e1..a685816306 100644 --- a/src/modules/dialog/dlg_cb.h +++ b/src/modules/dialog/dlg_cb.h @@ -63,6 +63,9 @@ typedef int (*get_dlg_varval_f)( struct dlg_cell* dlg, /* method to get a variable value pkg-allocated duplicate from a dialog */ typedef int (*get_dlg_vardup_f)( struct dlg_cell* dlg, str* key, str* val); +/* method to get if a variable value is set or not from a dialog */ +typedef int (*get_dlg_varstatus_f)( struct dlg_cell* dlg, + str* key); #define CONFIRMED_DIALOG_STATE 1 diff --git a/src/modules/dialog/dlg_var.c b/src/modules/dialog/dlg_var.c index 8edde80f1b..473736b437 100644 --- a/src/modules/dialog/dlg_var.c +++ b/src/modules/dialog/dlg_var.c @@ -376,6 +376,31 @@ int get_dlg_vardup(struct dlg_cell *dlg, str *key, str *val) return -2; } +/** + * return the status if the dlg variable value is set or not + * - 1 - variable is set + * - 0 - variable is not set + */ +int get_dlg_varstatus(struct dlg_cell *dlg, str *key) +{ + str* var = NULL; + int ret = 0; + + if( !dlg || !key || key->len<=0) { + LM_ERR("BUG - bad parameters\n"); + return 0; + } + + dlg_lock(d_table, &(d_table->entries[dlg->h_entry])); + var = get_dlg_variable_unsafe(dlg, key); + if(var && var->s) { + ret = 1; + } + dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); + + return ret; +} + int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval) { str* var = NULL; diff --git a/src/modules/dialog/dlg_var.h b/src/modules/dialog/dlg_var.h index 52f2a01a60..292e9f701b 100644 --- a/src/modules/dialog/dlg_var.h +++ b/src/modules/dialog/dlg_var.h @@ -62,6 +62,7 @@ typedef struct dlg_var { str* get_dlg_varref(dlg_cell_t *dlg, str *key); int get_dlg_varval(dlg_cell_t *dlg, str *key, str *val); int get_dlg_vardup(dlg_cell_t *dlg, str *key, str *val); +int get_dlg_varstatus(dlg_cell_t *dlg, str *key); int set_dlg_variable(dlg_cell_t *dlg, str *key, str *val); int get_dlg_variable_uintval(struct dlg_cell *dlg, str *key, unsigned int *uval);

2 years, 2 months

git:master:8548aaa8: dialog: updated comments for api functions to get dlg var value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8548aaa8a798b939e041821848b2f05b963451d8 URL: https://github.com/kamailio/kamailio/commit/8548aaa8a798b939e041821848b2f05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-26T12:04:29+02:00 dialog: updated comments for api functions to get dlg var value --- Modified: src/modules/dialog/dlg_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/8548aaa8a798b939e041821848b2f05… Patch: https://github.com/kamailio/kamailio/commit/8548aaa8a798b939e041821848b2f05… --- diff --git a/src/modules/dialog/dlg_cb.h b/src/modules/dialog/dlg_cb.h index 91064ee9e0..86a85bb2e1 100644 --- a/src/modules/dialog/dlg_cb.h +++ b/src/modules/dialog/dlg_cb.h @@ -54,13 +54,13 @@ typedef int (*register_dlgcb_f)(struct dlg_cell* dlg, int cb_types, typedef int (*set_dlg_variable_f)( struct dlg_cell* dlg, str* key, str* val); -/* method to get a variable from a dialog */ +/* method to get a variable value reference from a dialog */ typedef str* (*get_dlg_varref_f)( struct dlg_cell* dlg, str* key); -/* method to get a variable from a dialog */ +/* method to get a variable value static-buffer duplicate from a dialog */ typedef int (*get_dlg_varval_f)( struct dlg_cell* dlg, str* key, str* val); -/* method to get a variable value duplicate from a dialog */ +/* method to get a variable value pkg-allocated duplicate from a dialog */ typedef int (*get_dlg_vardup_f)( struct dlg_cell* dlg, str* key, str* val);

2 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
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 2022