sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
254 discussions

git:master:5a5b96c8: ipops: Add KEMI wrapper for ptr_query function
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 5a5b96c8a1906b45873e50243f5946b8db5a068b URL: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add KEMI wrapper for ptr_query function --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… Patch: https://github.com/kamailio/kamailio/commit/5a5b96c8a1906b45873e50243f5946b… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 60fd514d4fb..ea82beb0867 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1333,6 +1333,14 @@ static int w_ptr_query(sip_msg_t *msg, char *ip, char *pv_name) return ptr_update_pv(&ip_address, &name); } +/** + * \brief KEMI wrapper for `ptr_query` function. + */ +static int ki_ptr_query(sip_msg_t *msg, str *ip, str *pvid) +{ + return ptr_update_pv(ip, pvid); +} + /** * */ @@ -1513,6 +1521,11 @@ static sr_kemi_t sr_kemi_ipops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("ipops"), str_init("ptr_query"), + SR_KEMIP_INT, ki_ptr_query, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("ipops"), str_init("srv_query"), SR_KEMIP_INT, ki_srv_query, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:812ad6eb: ipops: Add brief comment for ptr_query
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 812ad6eb4e49426197e2860b89b255fffb018b5a URL: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add brief comment for ptr_query --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… Patch: https://github.com/kamailio/kamailio/commit/812ad6eb4e49426197e2860b89b255f… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index ea2669d2a19..60fd514d4fb 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1298,7 +1298,18 @@ static int ki_dns_query(sip_msg_t *msg, str *naptrname, str *pvid) } /** + *! \brief Return 1 (true) if the given `ip` IP address (string or pv) + * could successfully be resolved to a domain and saved into `pv_name` pv. + * Otherwise, return negative values depending on the error. * + * \param[in] msg SIP message structure. + * \param[in] ip IP address (string or pv) to resolve. + * \param[in] pv_name PV name to save the resolved domain. + * \returns 1 on success. + * \returns negative values depending on the error: + * \retval 1 success. + * \retval res -1 to -5 for bad input. + * \retval -6 for error in resolving the domain. */ static int w_ptr_query(sip_msg_t *msg, char *ip, char *pv_name) { diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 10447e84bcd..034ec696594 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -413,8 +413,16 @@ int dns_update_pv(str *hostname, str *name) return 1; } -/* -* +/** + * \brief Updates the pointer (PTR) record for a given IP address and saves it into pv. + * + * \details This function updates the PTR record for a specified IP address, and saves it + * into `name` AVP encapsulated in $ptrquery pv. + * It performs a reverse DNS lookup to obtain the hostname corresponding to the IP address. + * + * @param ip_address The IP address to update the PTR record for. + * @param name The name of AVP to hold the information in $ptrquery pv. + * @return 1 on success, or a negative value on failure. */ int ptr_update_pv(str *ip_address, str *name) {

1 0

git:master:a824e939: ipops: Add ptr_query docs
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: a824e939b589ae595fc735de1337a8bf4470de20 URL: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add ptr_query docs --- Modified: src/modules/ipops/doc/ipops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… Patch: https://github.com/kamailio/kamailio/commit/a824e939b589ae595fc735de1337a8b… --- diff --git a/src/modules/ipops/doc/ipops_admin.xml b/src/modules/ipops/doc/ipops_admin.xml index 14dad9f5df6..912d953c9fe 100644 --- a/src/modules/ipops/doc/ipops_admin.xml +++ b/src/modules/ipops/doc/ipops_admin.xml @@ -883,6 +883,93 @@ if(dns_query("test.com", "xyz")) </section> + <section id="ipops.f.ptr_query"> + <title> + <function moreinfo="none">ptr_query(ip, pvid)</function> + </title> + + <para> + Store the hostname that correspond to an IP address (IPv4 or IPv6) + in a pseudo-variable variable $ptrquery(pvid=>hostname). + </para> + + <para> + <emphasis>Note: Results will be in in $ptrquery(pvid=>key).</emphasis> + key can be: + <itemizedlist> + <listitem> + <para> + <emphasis>addr</emphasis> - IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>type</emphasis> - type of IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>ipv4</emphasis> - 1 if IPv4 address + </para> + </listitem> + <listitem> + <para> + <emphasis>ipv6</emphasis> - 1 if IPv6 address + </para> + </listitem> + <listitem> + <para> + <emphasis>count</emphasis> - number of hostnames found + </para> + </listitem> + <listitem> + <para> + <emphasis>hostname</emphasis> - hostname + </para> + </listitem> + </itemizedlist> + </para> + + <para>Parameters:</para> + + <itemizedlist> + <listitem> + <para> + <emphasis>ip</emphasis> - string or pseudo-variable containing the ip. + </para> + </listitem> + <listitem> + <para> + <emphasis>pvid</emphasis> - AVP id for script variable. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title> + <function>ptr_query</function> usage + </title> + <programlisting format="linespecific"> +... +if(ptr_query("8.8.8.8","ip4")) +{ + xlog(" number of names: $ptrquery(ip4=>count)\n"); + $var(j) = 0; + while($var(j)<$ptrquery(ip4=>count)) { + xlog(" #[$var(j)] name [ $ptrquery(ip4=>hostname) ]\n"); + $var(j) = $var(j) + 1; + } +} +... + </programlisting> + </example> + + </section> + <section id="ipops.f.srv_query"> <title> <function moreinfo="none">srv_query(srvcname, pvid)</function>

1 0

git:master:4c775edd: ipops: Add PTR query support
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 4c775eddaf76cbaf376bfb2d0e5efc78d0d60dc4 URL: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Add PTR query support --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7… Patch: https://github.com/kamailio/kamailio/commit/4c775eddaf76cbaf376bfb2d0e5efc7…

1 0

git:master:9181ee56: ipops: Move structures to header
by Xenofon Karamanos 09 Apr '24

09 Apr '24

Module: kamailio Branch: master Commit: 9181ee56e8e90845982a5d994b96917c1e03d059 URL: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-04-09T13:32:46+03:00 ipops: Move structures to header --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… Patch: https://github.com/kamailio/kamailio/commit/9181ee56e8e90845982a5d994b96917… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index c6374b6ab7c..6769d1863c7 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -35,38 +35,8 @@ #include "../../core/resolve.h" #include "../../core/pvar.h" +#include "ipops_pv.h" -#define PV_DNS_ADDR 64 -#define PV_DNS_RECS 32 - -typedef struct _sr_dns_record -{ - int type; - char addr[PV_DNS_ADDR]; -} sr_dns_record_t; - -typedef struct _sr_dns_item -{ - str name; - unsigned int hashid; - char hostname[256]; - int count; - int ipv4; - int ipv6; - sr_dns_record_t r[PV_DNS_RECS]; - struct _sr_dns_item *next; -} sr_dns_item_t; - -#define SR_DNS_PVIDX 1 - -typedef struct _dns_pv -{ - sr_dns_item_t *item; - int type; - int flags; - pv_spec_t *pidx; - int nidx; -} dns_pv_t; static sr_dns_item_t *_sr_dns_list = NULL; diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 8b6642ce3a8..f62e4e52e5e 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -24,6 +24,35 @@ #define _IPOPS_PV_H_ #include "../../core/pvar.h" +#define PV_DNS_ADDR 64 +#define PV_DNS_RECS 32 +#define SR_DNS_PVIDX 1 + +typedef struct _sr_dns_record +{ + int type; + char addr[PV_DNS_ADDR]; +} sr_dns_record_t; +typedef struct _sr_dns_item +{ + str name; + unsigned int hashid; + char hostname[256]; + int count; + int ipv4; + int ipv6; + sr_dns_record_t r[PV_DNS_RECS]; + struct _sr_dns_item *next; +} sr_dns_item_t; + +typedef struct _dns_pv +{ + sr_dns_item_t *item; + int type; + int flags; + pv_spec_t *pidx; + int nidx; +} dns_pv_t; int pv_parse_dns_name(pv_spec_t *sp, str *in); int pv_get_dns(sip_msg_t *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:a7e02a40: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: a7e02a406a0ecec5434fc634149dfc8f61043b2f URL: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-08T21:31:24+02:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… Patch: https://github.com/kamailio/kamailio/commit/a7e02a406a0ecec5434fc634149dfc8… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 844a6cf3107..57ae0972735 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -78,6 +78,7 @@ Hugh Waite 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 5. Pseudo-Variables @@ -141,6 +142,7 @@ Hugh Waite 1.29. http_client_request() usage 1.30. http_client_request_v2pk() usage 1.31. http_client_response_headers_set() usage + 1.32. http_client_response_headers_clear() usage Chapter 1. Admin Guide @@ -188,6 +190,7 @@ Chapter 1. Admin Guide 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 5. Pseudo-Variables @@ -732,6 +735,7 @@ modparam("http_client", "response_headers", 1) 4.6. http_client_request(met, url, body, hdrs, respv) 4.7. http_client_request_v2pk(met, url, body, hdrs, respv) 4.8. http_client_response_headers_set(mode) + 4.9. http_client_response_headers_clear() 4.1. http_connect(connection, url, [content_type, data,] result) @@ -951,6 +955,20 @@ ram})&f_uri=$(fu{s.escape.param})", xinfo("response header: $httprhdr(X-Header)\n"); ... +4.9. http_client_response_headers_clear() + + Clear stored response headers, if not explicitely done, it happens when + the next HTTP request is performed. + + Example 1.32. http_client_response_headers_clear() usage +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.pa +ram})&f_uri=$(fu{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); +http_client_response_headers_clear(); +... + 5. Pseudo-Variables 5.1. $curlerror(error)

1 0

git:master:5ba76f65: nghttp2: new module for supporting direct http2 connections
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: 5ba76f65f5c2ea522a2e6629bd845918258a80cf URL: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T21:25:11+02:00 nghttp2: new module for supporting direct http2 connections - initial import version --- Added: src/modules/nghttp2/Makefile Added: src/modules/nghttp2/README Added: src/modules/nghttp2/doc/Makefile Added: src/modules/nghttp2/doc/nghttp2.xml Added: src/modules/nghttp2/doc/nghttp2_admin.xml Added: src/modules/nghttp2/nghttp2_mod.c Added: src/modules/nghttp2/nghttp2_server.c Added: src/modules/nghttp2/nghttp2_server.h --- Diff: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591… Patch: https://github.com/kamailio/kamailio/commit/5ba76f65f5c2ea522a2e6629bd84591…

1 0

git:master:d55cd7e6: http_client: docs for http_client_response_headers_clear()
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: d55cd7e613c787ce0dd91abad036d4ecd7556023 URL: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T17:03:19+02:00 http_client: docs for http_client_response_headers_clear() --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… Patch: https://github.com/kamailio/kamailio/commit/d55cd7e613c787ce0dd91abad036d4e… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 0a8f147eb0e..e81d912c11e 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -1047,6 +1047,26 @@ http_client_response_headers_set("1"); http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", "", "X-Token: abc", "$var(result)"); xinfo("response header: $httprhdr(X-Header)\n"); +... + </programlisting> + </example> + </section> + <section id="http_client.f.http_client_response_headers_clear"> + <title> + <function moreinfo="none">http_client_response_headers_clear()</function> + </title> + <para> + Clear stored response headers, if not explicitely done, it happens + when the next HTTP request is performed. + </para> + <example> + <title><function>http_client_response_headers_clear()</function> usage</title> + <programlisting format="linespecific"> +... +http_client_request_v2pk("GET", "http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s.escap…", + "", "X-Token: abc", "$var(result)"); +xinfo("response header: $httprhdr(X-Header)\n"); +http_client_response_headers_clear(); ... </programlisting> </example>

1 0

git:master:cdf0633b: http_client: added http_client_response_headers_clear()
by Daniel-Constantin Mierla 08 Apr '24

08 Apr '24

Module: kamailio Branch: master Commit: cdf0633b6b51bbfb7eb785715358c88aeb4c6a40 URL: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-08T14:14:58+02:00 http_client: added http_client_response_headers_clear() - clear response headers - if not explicitely done, it happens when next http request is performed --- Modified: src/modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… Patch: https://github.com/kamailio/kamailio/commit/cdf0633b6b51bbfb7eb785715358c88… --- diff --git a/src/modules/http_client/http_client.c b/src/modules/http_client/http_client.c index c8af2f64901..27310829d0e 100644 --- a/src/modules/http_client/http_client.c +++ b/src/modules/http_client/http_client.c @@ -160,6 +160,8 @@ static int w_http_query_request_v2pk(struct sip_msg *_m, char *_met, char *_url, char *_body, char *_hdrs, char *_result); static int w_http_client_response_headers_set( sip_msg_t *_m, char *_pval, char *_p2); +static int w_http_client_response_headers_clear( + sip_msg_t *_m, char *_p1, char *_p2); /* forward function */ static int curl_con_param(modparam_t type, void *val); @@ -205,6 +207,9 @@ static cmd_export_t cmds[] = { {"http_client_response_headers_set", (cmd_function)w_http_client_response_headers_set, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"http_client_response_headers_clear", + (cmd_function)w_http_client_response_headers_clear, 1, 0, + 0, ANY_ROUTE}, {"bind_http_client", (cmd_function)bind_httpc_api, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -1184,6 +1189,16 @@ static int w_http_client_response_headers_set( return ki_http_client_response_headers_set(_m, ival); } +/*! + * + */ +static int w_http_client_response_headers_clear( + sip_msg_t *_m, char *_pval, char *_p2) +{ + http_client_response_headers_reset(); + return 1; +} + /*! * Parse arguments to pv $curlerror */

1 0

git:5.8:215af598: pdb server: allow carrier id 0
by Stefan-Cristian Mititelu 08 Apr '24

08 Apr '24

Module: kamailio Branch: 5.8 Commit: 215af59832efc6e485563b55e3af9d209121d0c5 URL: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2024-04-08T12:47:20+03:00 pdb server: allow carrier id 0 (cherry-picked from commit 60ded00a3b574a08457a696334d11d668595cc0b) --- Modified: utils/pdbt/common.h --- Diff: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… Patch: https://github.com/kamailio/kamailio/commit/215af59832efc6e485563b55e3af9d2… --- diff --git a/utils/pdbt/common.h b/utils/pdbt/common.h index 2146109a29d..a014e7d97e4 100644 --- a/utils/pdbt/common.h +++ b/utils/pdbt/common.h @@ -36,7 +36,7 @@ -1000..-1 used in dtm to indicate a carrier id and that no more nodes will follow (leaf node compression). -1001 used in dtm to mark a pointer to a child node as NULL. */ -#define MIN_PDB_CARRIERID 1 +#define MIN_PDB_CARRIERID 0 #define MAX_PDB_CARRIERID 999 #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024