#### 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)
- [ ] 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:
<!-- 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
I use dialog module and want to export current active calls with custom labels.
I need to decrement the counter value when a call is terminated.
`prom_counter_dec` add this functionality.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2858
-- Commit Summary --
* xhttp_prom: introduced prom_counter_update
* xhttp_prom: replaced prom_counter_inc by prom_counter_update
* xhttp_prom: added prom_counter_dec function
* xhttp_prom: added rpc_prom_counter_dec
* xhttp_prom: counter_dec published via KEMI interface
* xhttp_prom: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".'
* xhttp_prom: docubook ulink elementdo not alloed inside listitem element
* xhttp_prom: docbook para element not allowed inside another para element
* xhttp_prom: docbook files space formating
* xhttp_prom: added prom_counter_dec docbook description
-- File Changes --
M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (1151)
M src/modules/xhttp_prom/prom_metric.c (29)
M src/modules/xhttp_prom/prom_metric.h (4)
M src/modules/xhttp_prom/xhttp_prom.c (324)
M src/modules/xhttp_prom/xhttp_prom.h (9)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2858.patchhttps://github.com/kamailio/kamailio/pull/2858.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/2858
Module: kamailio
Branch: 5.4
Commit: baed0ff2c8b396e7d062e59aed856605c50e8d96
URL: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2021-09-17T09:31:50+02:00
modules: readme files regenerated - modules ... [skip ci]
---
Modified: src/modules/tls/README
---
Diff: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660…
Patch: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660…
---
diff --git a/src/modules/tls/README b/src/modules/tls/README
index a0e1f48d8d..5951c70f4c 100644
--- a/src/modules/tls/README
+++ b/src/modules/tls/README
@@ -543,17 +543,17 @@ Revoking a certificate and using a CRL
require the certificate file and list of CA certificates per a regular
TLS configuration.
-AWS CloudHSM Example
+Thales Luna Example
--------------------
...
-# Example for AWS CloudHSM (SafeNet Luna)
+# Example for Thales Luna
modparam("tls", "engine", "gem")
-modparam("tls", "engine_config", "/usr/local/etc/kamailio/luna.conf")
-modparam("tls", "engine_algorithms", "ALL)
+modparam("tls", "engine_config", "/usr/local/etc/kamailio/thales.cnf")
+modparam("tls", "engine_algorithms", "EC")
...
-/usr/local/etc/kamailio/luna.cnf is a OpenSSL config format file used to
+/usr/local/etc/kamailio/thales.cnf is a OpenSSL config format file used to
bootstrap the engine, e.g., pass the PIN.
...
@@ -564,11 +564,12 @@ kamailio = openssl_init
engines = engine_section
[ engine_section ]
-# gem is the name of the SafeNet Luna OpenSSL engine
+# gem is the name of the Thales Luna OpenSSL engine
gem = gem_section
[ gem_section ]
-# from SafeNet documentation
+# from Thales documentation
+dynamic_path = /usr/lib64/engines-1.1/gem.so
ENGINE_INIT = 0:20:21:password=1234-ABCD-5678-EFGH
...
- URL: https://github.com/kamailio/kamailio/commit/69819531b532fdec7956c0c28e1ea1a…
Author: Sergey Safarov <s.safarov(a)gmail.com>
Date: 2021-09-17T09:02:59+02:00
core: enables compilation with debug symbols by default for other architectures
- enables compilation with debug symbols by default for other architectures in core
- pull request GH #2811
- closes GH #2789
(cherry picked from commit ed46adad82e7b6569eb42704c5460263d2af75f7)
(cherry picked from commit ba8a06d2988e41b09947d3ae3386a13e3d8415b9)
- URL: https://github.com/kamailio/kamailio/commit/e9272d8d67b9f8f9e04ad511ae01457…
Author: FredWH <wh720(a)139.com>
Date: 2021-09-17T09:03:24+02:00
db_redis: fix broken pipe issue, if redis server with timeout setting.
- issue #2764
(cherry picked from commit 7cec977f8e12bbeb0309d903e02461d1ccbf41a8)
(cherry picked from commit 48eb41654859e6130c82c46400b529f2af9ce908)
- URL: https://github.com/kamailio/kamailio/commit/e5785361cad74949bde08386b857c13…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:04:04+02:00
core: parser sdp - shorten debug message with sdp line
- was printing the rest of the body, print now max 20 chars
(cherry picked from commit 4191a8193025499df64f13d59f5716563e573161)
(cherry picked from commit ede5a8399662903c2aa081b7010603398a598e94)
- URL: https://github.com/kamailio/kamailio/commit/7fd662c98aa14d9b2fb730cfce0f639…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:04:31+02:00
sdpops: refactored sdp_remove_str_codec_id_attrs()
- line oriented matching of codec addributes
- support to remove a=rtcp-fb per codec, GH #2755
(cherry picked from commit 1a15a18eacd5764e9ba6240acbe37e645368f825)
(cherry picked from commit 96f24caed768b1b382b166eea835e555eac5e933)
- URL: https://github.com/kamailio/kamailio/commit/fa2c7c16881b25bb99a33f69b67bda9…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:04:44+02:00
misc/tools/protoshoot: removed svn id and history
(cherry picked from commit e3875c01adf576f179374a926e69e99c0094e5b4)
(cherry picked from commit 105b15422f611ba1dcc59be30f7f4d474b294d03)
- URL: https://github.com/kamailio/kamailio/commit/984af7311243de4ea5358236d43346e…
Author: lazedo <luis.azedo(a)factorlusitano.com>
Date: 2021-09-17T09:05:12+02:00
tm: restore xavps & flags after rebuilding message
(cherry picked from commit 7ee642c58991e594f38247ab0751fadd07ce758c)
(cherry picked from commit ad5f0f522f43a69e0f7f930cac5aefc3f21607df)
- URL: https://github.com/kamailio/kamailio/commit/0f0fd6f7d9997bceafb3a2034a15cab…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:05:28+02:00
core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes
- set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them,
if defined, or to 15 and 45
- cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2)
- cover the requirements of using inet_ntop()
- GH #2823
(cherry picked from commit 22a72f3a7725d56f00e22bdc52d44bd53da7c091)
(cherry picked from commit 680d98caccc0216f43c2b5de83935dbc4853ab9d)
- URL: https://github.com/kamailio/kamailio/commit/4ce1fc01f916a0ee45aff75a18de67f…
Author: Alan Evans <alan(a)kageds.com>
Date: 2021-09-17T09:05:44+02:00
kazoo : fix routing of reply events
success events should be routed to onreply_route[]
failure events should be routed to failure_route[]
(cherry picked from commit fb2eee3e175040fef5e76cbed11430976f62df32)
(cherry picked from commit d8ff1845c34a7f9d8e6911ae3d2055b122eb3b79)
- URL: https://github.com/kamailio/kamailio/commit/f619ef65ce925b7273fc253feb9ca66…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:06:01+02:00
drouting: added dr_ prefix to internal time recurrence functions
- avoids symbol conflicts with the core tmrec.c
- GH #2828
(cherry picked from commit 33ea38f35f9911a26a757dbfa22065eb80a9a24a)
(cherry picked from commit b49f23af03d5e2f0364610739e7ef6e07cfd54a5)
- URL: https://github.com/kamailio/kamailio/commit/9825c3da237394fb2b856e41a593b8e…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:06:13+02:00
cplc: use cpl_ prefix for internal time recurrence functions
- avoid global symbol conflicts with core tmrec.c
- GH #2827
(cherry picked from commit 431544864c97d1848db1c0c42a03251a214f04cd)
(cherry picked from commit 7e3e0a81bf458bd90bc1454c81bf21d64ed9212c)
- URL: https://github.com/kamailio/kamailio/commit/b0a7811ef60d8fee47db4535cdc84c8…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:06:51+02:00
core: check message rcv and snd proto for diff realms lump conditions
- in addition to receive socket and send socket protos, which may be the
same in cases of tcp/tls+ws/wss using same ports
(cherry picked from commit 871f8113612148a49e69218e70ed7f475fb665db)
(cherry picked from commit 52978a0873eb068be31ca0688e64c88e4872efac)
- URL: https://github.com/kamailio/kamailio/commit/565b43d1d0572a8b68188cacf5b8248…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:07:16+02:00
core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps
- besides comparing the protos of rcv and snd sockets
(cherry picked from commit 31377b160df563a222bec5a1bf92590635429240)
(cherry picked from commit de84b32eb42e19f8626947da1c567eea2d0869fb)
- URL: https://github.com/kamailio/kamailio/commit/a564c8d2e88b58948f2e1ea01008ec8…
Author: Anthony Alba <ascanio.alba7(a)gmail.com>
Date: 2021-09-17T09:08:22+02:00
tls: fix OpenSSL engine in child processes
tls_init.c calls OPENSSL_init_ssl(); this initializes the
global engine linked-list and this cannot be reset in the child.
To avoid linked-list corruption we manually instantiate
the engine object required for loading private keys instead of
relying on CONF_modules_load_file().
Updates to doc/.
Addresses #2839
(cherry picked from commit 238ef139bfbe145fb93e5c4b0730de58040d2265)
(cherry picked from commit ad5af6d3acd648e6bd57b923083cc26d3a3d0f57)
- URL: https://github.com/kamailio/kamailio/commit/f3d7a0f52152adf2b3a0da8b44b6154…
Author: Dennis Yurasov <dennis-y(a)yandex-team.ru>
Date: 2021-09-17T09:08:41+02:00
ndb_redis: fix SIGSEGV in redisc_check_auth
- Added the check for NULL pointer. When TCP session to redis reset,
redisCommand function can return NULL pointer.
(cherry picked from commit c32a0be89cc92a0649277774d1e7aebf349b8b49)
(cherry picked from commit 5dbf99eb03aba76905aa926a55aedd3caa0fcd05)
- URL: https://github.com/kamailio/kamailio/commit/c5a3dc8e58b4653ad488a373b5760bc…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:08:52+02:00
dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW
(cherry picked from commit b86d2490f3b96c532cbe07259786757b3ab9fc02)
(cherry picked from commit 0c9d7e3378a4e3ffb1e6a7e48f89b7649aaa6fb2)
- URL: https://github.com/kamailio/kamailio/commit/6061def6d5550c9686f1b76d4d09400…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:09:05+02:00
sca: call unsafe find entry function to avoid infinite recursion
(cherry picked from commit bd92fb59cce183008956ff060911cc14d3dfb160)
(cherry picked from commit b6380374f310a26c8a36f807d97ff0f415204be4)
- URL: https://github.com/kamailio/kamailio/commit/0f9141a4ac722e1c33fbd597ef85c92…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:09:20+02:00
tm: skip body operation on empty string for uac building
(cherry picked from commit 34b61d3f1d6b5a0d4425f8edfa69d707cfa058b7)
(cherry picked from commit d96e3527c20791cb2291aa91685d5bc85606eb56)
- URL: https://github.com/kamailio/kamailio/commit/7e325b0a8cc6a80cd9173f07ac1e9c1…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:09:34+02:00
presence: skip body operations on empty string
(cherry picked from commit c849070371740c01f9f13a889c610de9132349f3)
(cherry picked from commit b0125b66116468b1e5d0dd2ee4eb0eebb4e7ecb4)
- URL: https://github.com/kamailio/kamailio/commit/bbd5a5ce5b2269e6e29f63a8cd73838…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:09:47+02:00
usrloc: set tcp connection id to -1 for records added via rpc
- cope properly with the handle_lost_tcp modparam
(cherry picked from commit a0a97119bef7671f33734399dc9de4562abae39c)
(cherry picked from commit 1685ebd5917e763c347b6d4201b19b72e2ee274e)
- URL: https://github.com/kamailio/kamailio/commit/0ea368063362c090485dddaacf03a6f…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:10:04+02:00
core: print char code on error in parse_addr_spec()
(cherry picked from commit 031fd46980b34a570385f49f168b13af43d84b87)
(cherry picked from commit 86c5d807ceb896dcc554bf8f1b7fb93c68e69a73)
- URL: https://github.com/kamailio/kamailio/commit/28251b9233b5011b36423717c054093…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:10:18+02:00
core: parse content length - consider multi line header format
- safety checks for log message when not parsing the message buffer
(cherry picked from commit baed515e8aed8e5b505ff716eb57d0c60e582632)
(cherry picked from commit c19e43e7bfa7d88b49312f1e83c3aae0756e4ae5)
- URL: https://github.com/kamailio/kamailio/commit/99dd461fb14c2eb3803d7708c229bb4…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:10:39+02:00
core: parser - free local unused param structure
(cherry picked from commit 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7)
(cherry picked from commit 479a6669da3bd03a9bd54ea4612192ee0b31f86a)
- URL: https://github.com/kamailio/kamailio/commit/61d80860ead2adf93ffecb1318048bb…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:10:51+02:00
core: parser - ensure content lenght value does not exceed max int
(cherry picked from commit f769011743feccde0fbca8531ab4e1b3563bf155)
(cherry picked from commit cd4c6ef6022fa6b4453c9e2feb091d3dd7776311)
- URL: https://github.com/kamailio/kamailio/commit/307f429ec4c1512018540cf58885b2c…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:11:02+02:00
core: catch empty string on parsing params
(cherry picked from commit 76e6033ff14fec0f2db0b387803b4c5815a91163)
(cherry picked from commit d40de01737781f12cb2383a2891c8590cfb7deba)
- URL: https://github.com/kamailio/kamailio/commit/f0d7b3a3d6c2aa27e47c87ec58b31c1…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:11:38+02:00
core: parser contact - link structure once finishing current one
(cherry picked from commit d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4)
(cherry picked from commit 9ed8820aaf307a756f1f08ccff4459884f62b9a8)
- URL: https://github.com/kamailio/kamailio/commit/6120013b0821e9420254b083d6eb4f7…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:11:50+02:00
core: parser contact - proper update of length in skip_name()
- stop walking name also for unquoted ;, being special char
- small typo
(cherry picked from commit 20db418f1e35f31d7a90d7cabbd22ae989b7266c)
(cherry picked from commit a0d7837c934df7f4c2223ca7f90f7c439628caf4)
- URL: https://github.com/kamailio/kamailio/commit/a7143e95b407d53714ed0113e243032…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:12:03+02:00
core: log unexpected char in parse_param2()
(cherry picked from commit a2511df29adc83544f047cbbdba7a8ba88272930)
(cherry picked from commit c6bfa8d8ee14ea27158f09f3b0a04015a1252e1a)
- URL: https://github.com/kamailio/kamailio/commit/4f438e01d4e6c6042026e9c5f673e1e…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:12:14+02:00
core: parser - free unlinked local param structure in parse_to_param()
(cherry picked from commit f624e1701088a94465a06f36a2ef27804b16ec0e)
(cherry picked from commit 04c7d84874bf60dabede57adb1fc64ebe2260420)
- URL: https://github.com/kamailio/kamailio/commit/d94bed817ffd389b5e528c124e2a841…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:12:27+02:00
core: parse_to_param() check for end of data on escape or start of value
(cherry picked from commit 17a2eec2a8e47939782c1352ddb0fa4d3e73f9d8)
(cherry picked from commit 92083402b2768b0ab81072feefd94bf754730e7f)
- URL: https://github.com/kamailio/kamailio/commit/816f7b42b8527a2edc621143d2f1fae…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:12:49+02:00
core: parse content - group operation to avoid overflow
(cherry picked from commit 685817088ff9c72c055e72091fa6f923b824c206)
(cherry picked from commit 796e2b203bbe09c6eb30321c579651d96c9b5de5)
- URL: https://github.com/kamailio/kamailio/commit/0daa378326ea967bda8e302ac183463…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:13:03+02:00
core: parse via - safe check for end of buffer
- just in case it is needed to be used for non-zero-terminated strings
(cherry picked from commit 1d3fde1205440296c1d6a54feee5a9d637055bee)
(cherry picked from commit 5a73c4b2363a533f8a9ed67aff3413223815c52c)
- URL: https://github.com/kamailio/kamailio/commit/0616c676ca0e0e6e013ce26a53e951b…
Author: Sergey Safarov <s.safarov(a)gmail.com>
Date: 2021-09-17T09:13:16+02:00
kazoo: fixed crash when json body is NULL
fixes GH #2794
(cherry picked from commit d8955fc350b48d0c4ca359d03cb9954a48998658)
(cherry picked from commit abbf1fde2efd02f24c806a5be296e4648060b0af)
- URL: https://github.com/kamailio/kamailio/commit/d8ef550a4e7181f7fce1a4982c5da10…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:13:27+02:00
core: free params list at end on error state inside parse_addr_spec
(cherry picked from commit f2b133e24e29f9f0ce7ba568a5d4564c7b0f8f31)
(cherry picked from commit b44879a17af848c3acb5524fe1058854c59c95fd)
- URL: https://github.com/kamailio/kamailio/commit/09370e77e42a287246df46728c85a8d…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:13:40+02:00
dispatcher: init attrs value when param not given to rpc add
- GH #2854
(cherry picked from commit 7894fb470e707622b077d565763c9cfb7c654da5)
(cherry picked from commit 55312a08806027850840cf5b1f69ec7469965730)
- URL: https://github.com/kamailio/kamailio/commit/730167bf4e26ba44bf69275730efbf8…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:14:01+02:00
core: parser - print what is left in buffer if no EoH in get_body()
(cherry picked from commit 63ecb827631189d27da6a85d41149985d95fc479)
(cherry picked from commit 4578fb676177e16324c2241820cf5f8042503a37)
- URL: https://github.com/kamailio/kamailio/commit/a5340f49d21cb4dede9c84fe099561d…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2021-09-17T09:14:23+02:00
sqlops: return 1 on success for kemi sql_xquery()
- GH #2856
(cherry picked from commit 32bf3eb2b27fbefe991a4aabc829f21ecc4e8829)
(cherry picked from commit c1f5595eaf0b1f98cb5dcc00ab68c0e57bc4b053)
Hello!
I want to get $fU and $tU from event_route[msrp:frame-in] in order to filter out MSRP messages sent by a specific sender and received by a specific receiver, I know I can get message content from $msrp(buf), the message content is like this:
> MSRP 7a57f552155926c0 SEND
> To-Path: msrp://172.18.0.14:6060/9d8da4a34dc2102959e7;tcp msrp://172.18.0.12:5060/msrp-6142fc2b-84-1;tcp msrp://172.18.0.2:34862/2a67b54ae0750b7d82aa;tcp
> From-Path: msrp://172.18.0.14:6060/c71ae3675e114d08216b;tcp msrp://172.18.0.12:5060/msrp-6142fc2b-83-1;tcp msrp://172.18.0.2:34858/8baea7c52ba8755322fd;tcp
> Byte-Range: 1-197/197
> Failure-Report: yes
> Success-Report: yes
> Message-ID: c792c94039b8a969
> Content-Type: message/cpim
>
> From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>
> To: <sip:bob@ims.mnc001.mcc001.3gppnetwork.org>
> DateTime: 2021-09-16T09:23:49.339805+00:00
>
> MIME-Version: 1.0
> Content-Type: text/plain
>
> hello
> -------7a57f552155926c0$
I want to get alice and bob from the content below:
> From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>
> To: <sip:bob@ims.mnc001.mcc001.3gppnetwork.org>
> DateTime: 2021-09-16T09:23:49.339805+00:00
someone can suggest some method. In other route like request_route we can use $fU and $tU to access them.
Regrads
HANG LI
--
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/2857