sr-dev July 2023

sr-dev@lists.kamailio.org

15 participants
240 discussions

git:5.5:b9fd39ea: pkg/kamailio/deb: version set 5.5.7

by Victor Seva

Module: kamailio Branch: 5.5 Commit: b9fd39ea259b32fd950080045e0edd0969a9a29d URL: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-19T09:09:41+02:00 pkg/kamailio/deb: version set 5.5.7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0… Patch: https://github.com/kamailio/kamailio/commit/b9fd39ea259b32fd950080045e0edd0…

1 year, 3 months

Releasing Kamailio v5.5.7

by Daniel-Constantin Mierla

Hello, I am planning to release v5.5.7 our of branch 5.5 this week, most likely on Wednesday, July 19, 2023. It will mark the end of official packaging for release series 5.5.x, currently the latest two stable branches are 5.6 and 5.7. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - www.kamailioworld.com

1 year, 3 months

git:master:c35088bf: geoip2: docs - section ids and formatting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c35088bf31b3e3e828433bf03b6ce647a75ef8e2 URL: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-18T16:38:20+02:00 geoip2: docs - section ids and formatting --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… Patch: https://github.com/kamailio/kamailio/commit/c35088bf31b3e3e828433bf03b6ce64… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index 50a7d855fa8..cbc6ccb1493 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -11,26 +11,25 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> - This module allows real-time queries against the Max Mind GeoIP2 - database to be performed from the config script. + This module allows real-time queries against the Max Mind GeoIP2 + database to be performed from the config script. </para> <para> - The Max Mind GeoIP2 database is a map of IP network address assignments + The Max Mind GeoIP2 database is a map of IP network address assignments to geographical locales that can be useful -- though approximate -- in identifying the physical location with which an IP host address is associated on a relatively granular level. </para> <para> - This database itself can be obtained on a free or commercial basis + This database itself can be obtained on a free or commercial basis from <ulink url="http://dev.maxmind.com/geoip/"> - http://dev.maxmind.com/geoip/</ulink>. The - library libmaxminddb + http://dev.maxmind.com/geoip/</ulink>. The library libmaxminddb that interfaces with the Max Mind API, as well as scripts to automate downloading of the on-disk version are available at <ulink url="http://dev.maxmind.com/geoip/geoip2/downloadable/"> @@ -126,10 +125,10 @@ if(geoip2_match("$si", "src")) { </example> </section> </section> - + <section> <title>Functions</title> - <section> + <section id="geoip.f.geoip2_match"> <title> <function moreinfo="none">geoip2_match(ipaddr, pvc)</function> </title> @@ -149,7 +148,7 @@ if(geoip2_match("$si", "src")) </programlisting> </example> </section> - <section> + <section id="geoip.f.geoip2_distance"> <title> <function moreinfo="none">geoip2_distance(ip_addr, latitude, longitude)</function> </title> @@ -172,7 +171,7 @@ if(geoip2_match("$si", "src")) </programlisting> </example> </section> - + </section> <section> @@ -195,13 +194,13 @@ if(geoip2_match("$si", "src")) </example> </section> </section> - - <section> + + <section id="geoip.pvs"> <title>Exported pseudo-variables</title> <itemizedlist> <listitem><para> - <emphasis>$gip2(pvc=>key)</emphasis> - <emphasis>pvc</emphasis> is an - identifier for this query result; it is designated by the second + <emphasis>$gip2(pvc=>key)</emphasis> - <emphasis>pvc</emphasis> is an + identifier for this query result; it is designated by the second parameter of geoip2_match(). The <emphasis>key</emphasis> can be one of the following: </para>

1 year, 3 months

[kamailio/kamailio] Add 2 new options to dispatcher management in kamctl (PR #3512)

by Nir Simionovich

kamctl: added new options to dispatcher interface - added a new `rmip` option to delete a specific gateway `ip` in a predefined `setid` - added a new `rmset` option to delete a specific `setid` completely You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3512 -- Commit Summary -- * Add support for deleting a gateway or full setid in dispatcher. * Small style fix to help screen -- File Changes -- M utils/kamctl/kamctl (34) M utils/kamctl/kamctl.base (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3512.patch https://github.com/kamailio/kamailio/pull/3512.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3512 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3512(a)github.com>

1 year, 3 months

git:master:f68a1e9c: kamctl: add 2 new options to dispatcher management (#3512)

by GitHub

Module: kamailio Branch: master Commit: f68a1e9c9f249faee38d29776d5831cbf9e3cce7 URL: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… Author: Nir Simionovich <nir.simionovich(a)greenfieldtech.net> Committer: GitHub <noreply(a)github.com> Date: 2023-07-17T17:26:18+02:00 kamctl: add 2 new options to dispatcher management (#3512) *kamctl: add support for deleting a gateway or full setid in dispatcher. * kamctl: small style fix to help screen after previous change --------- Co-authored-by: Nir Simionovich <nirs(a)cloudonix.io> --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… Patch: https://github.com/kamailio/kamailio/commit/f68a1e9c9f249faee38d29776d5831c… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 34f6183dfb7..dd09ffb7daf 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1756,6 +1756,40 @@ dispatcher() { fi ;; + rmip) + require_dbengine + shift + if [ $# -ne 2 ] ; then + merr "missing gateway ip address and/or setid to be removed" + exit 1 + fi + + QUERY="delete from $DISPATCHER_TABLE where $DISPATCHER_SETID_COLUMN='$2' and $DISPATCHER_DESTINATION_COLUMN like 'sip:$1:%';" + $DBCMD "$QUERY" + + if [ $? -ne 0 ] ; then + merr "dispatcher - SQL Error" + exit 1 + fi + + ;; + rmset) + require_dbengine + shift + if [ $# -ne 2 ] ; then + merr "missing gateway setid to be removed" + exit 1 + fi + + QUERY="delete from $DISPATCHER_TABLE where $DISPATCHER_SETID_COLUMN='$1'' and $DISPATCHER_DESTINATION_COLUMN like 'sip:$1:%'';" + $DBCMD "$QUERY" + + if [ $? -ne 0 ] ; then + merr "dispatcher - SQL Error" + exit 1 + fi + + ;; reload) require_ctlengine ctl_cmd_run dispatcher.reload diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 9e37f5551fc..a265c479c04 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -512,6 +512,8 @@ cat <<EOF dispatcher add <setid> <destination> [flags] [priority] [attrs] [description] .......................... add gateway dispatcher rm <id> .................. delete gateway + dispatcher rmip <ip> <setid>......... delete gateway <ip> in <setid> + dispatcher rmset <setid> ............. delete all gateways in <setid> EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_dispatcher"

1 year, 3 months

[kamailio/kamailio] rabbitmq: Adding amqps support (PR #3511)

by joelbax

Adding support for secure AMQP connections over TLS (amqps).   #### 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) - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3511 -- Commit Summary -- * rabbitmq: Adding amqps support -- File Changes -- M src/modules/rabbitmq/rabbitmq.c (33) M src/modules/rabbitmq/rabbitmq.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3511.patch https://github.com/kamailio/kamailio/pull/3511.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3511 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3511(a)github.com>

1 year, 3 months

git:master:78c0275b: rabbitmq: Adding amqps support (#3511)

by GitHub

Module: kamailio Branch: master Commit: 78c0275b9081d4ee18a89f702f3931e3c3f83489 URL: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… Author: joelbax <98022231+joelbax(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2023-07-17T17:21:36+02:00 rabbitmq: Adding amqps support (#3511) * rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). * rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). rabbitmq: Adding amqps support Adding support for secure AMQP connections over TLS (amqps). rabbitmq: Format fixes Some style format fixes * rabbitmq: Format fixes Fixing some missing spaces * rabbitmq: Typo fix Fixing inilialized by initialized --- Modified: src/modules/rabbitmq/rabbitmq.c Modified: src/modules/rabbitmq/rabbitmq.h --- Diff: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… Patch: https://github.com/kamailio/kamailio/commit/78c0275b9081d4ee18a89f702f3931e… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index f1c44ff113b..94341070508 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -52,6 +52,7 @@ #include <stdint.h> #include <amqp_tcp_socket.h> +#include <amqp_ssl_socket.h> #include <amqp.h> #include <amqp_framing.h> @@ -73,10 +74,12 @@ static amqp_connection_state_t amqp_conn = NULL; /* module parameters */ static struct amqp_connection_info amqp_info; static char *amqp_url = RABBITMQ_DEFAULT_AMQP_URL; +static char *rmq_amqps_ca_file = NULL; static int max_reconnect_attempts = 1; static int timeout_sec = 1; static int timeout_usec = 0; static int direct_reply_to = 0; +static int amqp_ssl_init_called = 0; /* module helper functions */ static int rabbitmq_connect(amqp_connection_state_t *conn); @@ -124,6 +127,7 @@ static cmd_export_t cmds[] = { /* module parameters */ static param_export_t params[] = {{"url", PARAM_STRING, &amqp_url}, + {"amqps_ca_file", PARAM_STRING, &rmq_amqps_ca_file}, {"timeout_sec", PARAM_INT, &timeout_sec}, {"timeout_usec", PARAM_INT, &timeout_usec}, {"direct_reply_to", PARAM_INT, &direct_reply_to}, {0, 0, 0}}; @@ -557,25 +561,52 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) int ret; int log_ret; // amqp_rpc_reply_t reply; + + // amqp_ssl_init_called should only be called once + if(amqp_info.ssl && !amqp_ssl_init_called) { + amqp_set_initialize_ssl_library(1); + amqp_ssl_init_called = 1; + LM_DBG("AMQP SSL library initialized\n"); + } // establish a new connection to RabbitMQ server *conn = amqp_new_connection(); + if(!conn) { + LM_ERR("FAIL: create AMQP connection\n"); + return RABBITMQ_ERR_CREATE; + } log_ret = log_on_amqp_error( amqp_get_rpc_reply(*conn), "amqp_new_connection()"); if(log_ret != AMQP_RESPONSE_NORMAL && log_ret != AMQP_RESPONSE_NONE) { return RABBITMQ_ERR_CONNECT; } - amqp_sock = amqp_tcp_socket_new(*conn); + amqp_sock = (amqp_info.ssl) ? amqp_ssl_socket_new(*conn) + : amqp_tcp_socket_new(*conn); if(!amqp_sock) { LM_ERR("FAIL: create TCP amqp_sock"); amqp_destroy_connection(*conn); return RABBITMQ_ERR_SOCK; } + if(rmq_amqps_ca_file) { + if(amqp_ssl_socket_set_cacert(amqp_sock, rmq_amqps_ca_file)) { + LM_ERR("Failed to set CA certificate for amqps connection\n"); + return RABBITMQ_ERR_SSL_CACERT; + } + } + +#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 8 + amqp_ssl_socket_set_verify(amqp_sock, 1); +#else + amqp_ssl_socket_set_verify_peer(amqp_sock, 1); + amqp_ssl_socket_set_verify_hostname(amqp_sock, 1); +#endif + ret = amqp_socket_open(amqp_sock, amqp_info.host, amqp_info.port); if(ret != AMQP_STATUS_OK) { - LM_ERR("FAIL: open TCP sock, amqp_status=%d", ret); + LM_ERR("FAIL: open %s sock, amqp_status=%d", + (amqp_info.ssl) ? "SSL" : "TCP", ret); // amqp_destroy_connection(*conn); return RABBITMQ_ERR_SOCK; } diff --git a/src/modules/rabbitmq/rabbitmq.h b/src/modules/rabbitmq/rabbitmq.h index 30f39ca7fd5..b37c84674f9 100644 --- a/src/modules/rabbitmq/rabbitmq.h +++ b/src/modules/rabbitmq/rabbitmq.h @@ -49,8 +49,10 @@ typedef enum RABBITMQ_ERR_CHANNEL, RABBITMQ_ERR_QUEUE, RABBITMQ_ERR_PUBLISH, + RABBITMQ_ERR_CREATE, RABBITMQ_ERR_SOCK, RABBITMQ_ERR_CONSUME, + RABBITMQ_ERR_SSL_CACERT, RABBITMQ_ERR_NULL, } RABBITMQ_ENUM;

1 year, 3 months

git:5.5:aa022e9d: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.5 Commit: aa022e9d35f0ce9040d396288f69995d2a7399ac URL: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-17T11:47:06+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995… Patch: https://github.com/kamailio/kamailio/commit/aa022e9d35f0ce9040d396288f69995…

1 year, 3 months

git:5.5:edfbecd0: sst: fix condition on sst_min_se for sst_check_min()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: edfbecd0ed515dab637a03a793c6c2d565dfdaee URL: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:17:12+02:00 sst: fix condition on sst_min_se for sst_check_min() (cherry picked from commit a059af04ac47fd31238ca4f22ad868529e035c43) (cherry picked from commit febfc9722f83d992a3c1643fa373468b73cb3fa0) (cherry picked from commit 5fc4cca395e057714376b681bbad4935a9570d0d) --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… Patch: https://github.com/kamailio/kamailio/commit/edfbecd0ed515dab637a03a793c6c2d… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index 55010baaee2..690c03ddfac 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -672,7 +672,7 @@ int ki_sst_check_min(struct sip_msg *msg, int flag) * too small. We will take the smaller of the messages * Session-expires and min-se if stated. */ - if (sst_min_se < MIN(minse, se.interval)) { + if(sst_min_se > MIN(minse, se.interval)) { /* * Too small. See if we need to send the 422 and are able * to send it.

1 year, 3 months

git:5.5:063bceef: ipops: create container items if not found for srv and naptr functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 063bceefc411e2841b7507d9f366a45d62cfbe00 URL: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T11:17:02+02:00 ipops: create container items if not found for srv and naptr functions - GH #3419 (cherry picked from commit 7971d825361bee29d65fcea69f2978d7af31eeaa) (cherry picked from commit 408643ec916bc00f9f9447952e553d129f8ec896) (cherry picked from commit 771fcd42e315376c9d3c16bb63983a72e508be18) --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… Patch: https://github.com/kamailio/kamailio/commit/063bceefc411e2841b7507d9f366a45… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 6e9d86b5a6a..5151dfd39dc 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -633,7 +633,7 @@ static sr_srv_item_t *_sr_srv_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found; 1 - search only * OUTPUT: srv record pointer; NULL=not found **********/ @@ -1022,9 +1022,9 @@ int srv_update_pv (str *srvcname, str *pvid) LM_DBG ("service name missing: %.*s\n", srvcname->len, srvcname->s); return -2; } - pitem = sr_srv_add_item (pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_srv_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; } @@ -1185,7 +1185,7 @@ static sr_naptr_item_t *_sr_naptr_list = NULL; * * INPUT: * Arg (1) = pvid string pointer - * Arg (2) = find flag; <>0=search only + * Arg (2) = find flag; 0 - add if not found, 1 - search only * OUTPUT: naptr record pointer; NULL=not found **********/ @@ -1491,9 +1491,9 @@ int naptr_update_pv(str *naptrname, str *pvid) LM_DBG ("naptr name missing: %.*s\n", naptrname->len, naptrname->s); return -2; } - pitem = sr_naptr_add_item(pvid, 1); - if (!pitem) { - LM_DBG ("pvid not found: %.*s\n", pvid->len, pvid->s); + pitem = sr_naptr_add_item(pvid, 0); + if(!pitem) { + LM_DBG("pvid not found: %.*s\n", pvid->len, pvid->s); return -3; }

1 year, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2023