sr-dev

sr-dev@lists.kamailio.org

17 participants
45418 discussions

git:master:15aafe49: presence: prefix short global variables
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 15aafe49a6a022809f278f596812c97dc5404982 URL: https://github.com/kamailio/kamailio/commit/15aafe49a6a022809f278f596812c97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T13:25:04+01:00 presence: prefix short global variables --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/subscribe.c Modified: src/modules/presence/utils_func.c --- Diff: https://github.com/kamailio/kamailio/commit/15aafe49a6a022809f278f596812c97… Patch: https://github.com/kamailio/kamailio/commit/15aafe49a6a022809f278f596812c97…

1 0

git:master:7da07508: presence: removed unused external variable
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 7da07508bc74a6a0c87e1dc7993d0061b65e2faa URL: https://github.com/kamailio/kamailio/commit/7da07508bc74a6a0c87e1dc7993d006… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T13:18:15+01:00 presence: removed unused external variable --- Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/7da07508bc74a6a0c87e1dc7993d006… Patch: https://github.com/kamailio/kamailio/commit/7da07508bc74a6a0c87e1dc7993d006… --- diff --git a/src/modules/presence/publish.c b/src/modules/presence/publish.c index 2399ff43e10..fa39498d986 100644 --- a/src/modules/presence/publish.c +++ b/src/modules/presence/publish.c @@ -46,8 +46,6 @@ #include "publish.h" #include "presentity.h" -extern gen_lock_set_t *set; - static str pu_400a_rpl = str_init("Bad request"); static str pu_400b_rpl = str_init("Invalid request"); static str pu_500_rpl = str_init("Server Internal Error"); @@ -713,4 +711,4 @@ int update_hard_presentity( } return ret; -} \ No newline at end of file +}

1 0

git:master:05076041: lib: presence - remove old commented code and adjust comments
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 050760411bac006c1e6351f179fab7ea6333b3e5 URL: https://github.com/kamailio/kamailio/commit/050760411bac006c1e6351f179fab7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-22T09:29:31+01:00 lib: presence - remove old commented code and adjust comments --- Modified: src/lib/presence/notifier_domain.c Modified: src/lib/presence/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/050760411bac006c1e6351f179fab7e… Patch: https://github.com/kamailio/kamailio/commit/050760411bac006c1e6351f179fab7e… --- diff --git a/src/lib/presence/notifier_domain.c b/src/lib/presence/notifier_domain.c index 56773d13c1c..8f03828c119 100644 --- a/src/lib/presence/notifier_domain.c +++ b/src/lib/presence/notifier_domain.c @@ -223,33 +223,6 @@ static void free_subscription(qsa_subscription_t *s) cds_free(s); } -/*static void add_server_subscription(notifier_t *n, qsa_subscription_t *s) -{ - server_subscription_t server_s; - - server_s.notifier_data = NULL; - if (n->subscribe(n, &s->record_id, s, &server_s.notifier_data) == 0) { - server_s.notifier = n; - vector_add(&s->server_subscriptions, &server_s); - } - else ERROR_LOG("subscription not accepted by notifier %p\n", n); -} - -static void remove_notifier_from_subscription(qsa_subscription_t *s, notifier_t *n) -{ - int cnt,i; - - cnt = vector_size(&s->server_subscriptions); - for (i = 0; i < cnt; i++) { - ss = vector_get_ptr(&s->server_subscriptions, i); - if (!ss) continue; - / * FIXME: call n->unsubscribe ??? - * NO this is called from unregister which is initiated - * by the notifier (may be synchronized there!) * / - if (ss->notifier == n) ss->notifier = NULL; / * "zombie" * / - } -} -*/ /* -------- Domain initialization/destruction functions -------- */ diff --git a/src/lib/presence/pidf.c b/src/lib/presence/pidf.c index d875ce974c4..3f00314a5fa 100644 --- a/src/lib/presence/pidf.c +++ b/src/lib/presence/pidf.c @@ -170,9 +170,9 @@ static void doc_add_presentity( DEBUG_LOG("doc_add_presentity()\n"); if(use_cpim_pidf_ns) - dstr_append_zt( - buf, "<presence xmlns=\"urn:ietf:params:xml:ns:cpim-pidf\" " - "entity=\""); + dstr_append_zt(buf, + "<presence xmlns=\"urn:ietf:params:xml:ns:cpim-pidf\" " + "entity=\""); else dstr_append_zt(buf, "<presence xmlns=\"urn:ietf:params:xml:ns:pidf\" entity=\""); @@ -402,7 +402,7 @@ static int read_tuple(xmlNode *tuple, presence_tuple_info_t **dst, status = presence_tuple_open; if(strcasecmp(s, "closed") == 0) status = presence_tuple_closed; - /* FIXME: handle not standardized variants too (add note to basic status) */ + /* NOTE: handle not standardized variants too (add note to basic status) */ /* get ID from tuple node attribute? */ id.s = (char *)get_attr_value(find_attr(tuple->properties, "id")); @@ -433,7 +433,7 @@ static int read_tuple(xmlNode *tuple, presence_tuple_info_t **dst, } else if(cmp_node(n, "status", ns) >= 0) { /* skip, already processed */ } else if(cmp_node(n, "timestamp", ns) >= 0) { - /* FIXME: process */ + /* TODO: process */ } else { /* PIDF extensions - only from non-PIDF namespace? */ res = read_extension(n, &ex, doc); if((res == 0) && ex)

1 0

git:master:0a11489d: lib/srdb2: review and adapt old comments
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 0a11489d4b699a62596b2c4626171e8d92e966fd URL: https://github.com/kamailio/kamailio/commit/0a11489d4b699a62596b2c4626171e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-21T10:20:39+01:00 lib/srdb2: review and adapt old comments --- Modified: src/lib/srdb2/db_cmd.c Modified: src/lib/srdb2/db_gen.h --- Diff: https://github.com/kamailio/kamailio/commit/0a11489d4b699a62596b2c4626171e8… Patch: https://github.com/kamailio/kamailio/commit/0a11489d4b699a62596b2c4626171e8… --- diff --git a/src/lib/srdb2/db_cmd.c b/src/lib/srdb2/db_cmd.c index 2782f4dc7c5..9ba1d22ee66 100644 --- a/src/lib/srdb2/db_cmd.c +++ b/src/lib/srdb2/db_cmd.c @@ -58,7 +58,7 @@ db_cmd_t *db_cmd(enum db_cmd_type type, db_ctx_t *ctx, char *table, newp->type = type; - /** FIXME: it is not clear now that this is necessary + /** NOTE: it is not clear now that this is necessary * when we have match and value separate arrays */ if(result) { newp->result = db_fld_copy(result); @@ -78,7 +78,7 @@ db_cmd_t *db_cmd(enum db_cmd_type type, db_ctx_t *ctx, char *table, goto err; } - /* FIXME: This should be redesigned so that we do not need to connect + /* NOTE: This should be redesigned so that we do not need to connect * connections in context before commands are created, this takes splitting * the command initialization sequence in two steps, one would be creating * all the data structures and the second would be checking corresponding @@ -242,7 +242,6 @@ int db_exec(db_res_t **res, db_cmd_t *cmd) return -1; } - /* FIXME */ db_payload_idx = 0; ret = cmd->exec[0](r, cmd); if(ret < 0) { diff --git a/src/lib/srdb2/db_gen.h b/src/lib/srdb2/db_gen.h index eca24c76046..f8dd483b87a 100644 --- a/src/lib/srdb2/db_gen.h +++ b/src/lib/srdb2/db_gen.h @@ -95,7 +95,7 @@ extern "C" */ /* - * FIXME: We should find some other way of doing this than just copying + * NOTE: We should find some other way of doing this than just copying * and pasting the code from STAILQ_FOREACH */ #define DBLIST_FOREACH(var, head) \ @@ -111,7 +111,7 @@ extern "C" */ /* - * FIXME: We should find some other way of doing this than just copying + * NOTE: We should find some other way of doing this than just copying * and pasting the code from STAILQ_FOREACH_SAFE */ #define DBLIST_FOREACH_SAFE(var, head, tvar) \

1 0

git:master:67f71d1b: lib/xcap: reviewed and removed old comments and disabled code
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: 67f71d1b7c44a7d3ef1ba2917272e2ba36608cd7 URL: https://github.com/kamailio/kamailio/commit/67f71d1b7c44a7d3ef1ba2917272e2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-20T12:37:12+01:00 lib/xcap: reviewed and removed old comments and disabled code --- Modified: src/lib/xcap/common_policy.c Modified: src/lib/xcap/parse_common_rules.c Modified: src/lib/xcap/resource_list.c Modified: src/lib/xcap/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/67f71d1b7c44a7d3ef1ba2917272e2b… Patch: https://github.com/kamailio/kamailio/commit/67f71d1b7c44a7d3ef1ba2917272e2b… --- diff --git a/src/lib/xcap/common_policy.c b/src/lib/xcap/common_policy.c index a7d33d95d5d..0f887aa7ce7 100644 --- a/src/lib/xcap/common_policy.c +++ b/src/lib/xcap/common_policy.c @@ -175,7 +175,7 @@ int is_rule_for_uri(cp_rule_t *rule, const str_t *uri) if(!rule) return 0; if(!rule->conditions) - return 1; /* FIXME: ??? */ + return 1; id = rule->conditions->identity; if(!id) return 0; diff --git a/src/lib/xcap/parse_common_rules.c b/src/lib/xcap/parse_common_rules.c index 0e46ace7161..ca3f4599c06 100644 --- a/src/lib/xcap/parse_common_rules.c +++ b/src/lib/xcap/parse_common_rules.c @@ -211,13 +211,11 @@ static int read_conditions(xmlNode *cn, cp_conditions_t **dst) while(n) { if(n->type == XML_ELEMENT_NODE) { if(cmp_node(n, "validity", common_policy_ns) >= 0) { - /* FIXME: free existing validity */ res = read_validity(n, &(*dst)->validity); if(res != 0) break; } else { if(cmp_node(n, "identity", common_policy_ns) >= 0) { - /* FIXME: free existing identity */ res = read_identity(n, &(*dst)->identity); if(res != 0) break; diff --git a/src/lib/xcap/resource_list.c b/src/lib/xcap/resource_list.c index cb7d111057f..928c133df51 100644 --- a/src/lib/xcap/resource_list.c +++ b/src/lib/xcap/resource_list.c @@ -169,9 +169,9 @@ void free_traversed_list(traversed_list_t *list) /* ------- helper functions (doing flat list) ------- */ +/* absolute uri from ref (RFC 3986, section 5.2) */ static char *relative2absolute_uri(const str_t *xcap_root, const char *relative) { - /* FIXME: do absolute uri from ref (RFC 3986, section 5.2) */ int len; int root_len = 0; int rel_len = 0; diff --git a/src/lib/xcap/xcap_client.c b/src/lib/xcap/xcap_client.c index c633f3c7f5f..2fe6e41d1d6 100644 --- a/src/lib/xcap/xcap_client.c +++ b/src/lib/xcap/xcap_client.c @@ -284,13 +284,8 @@ int xcap_query( /* follow redirects (needed for apache mod_speling - case insesitive names) */ curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1); - /* curl_easy_setopt(handle, CURLOPT_TCP_NODELAY, 1); - curl_easy_setopt(handle, CURLOPT_CONNECTTIMEOUT, 10);*/ - /* Accept headers */ - res = curl_easy_perform(handle); - /* curl_easy_cleanup(handle); */ /* FIXME: experimental */ } else ERROR_LOG("can't initialize curl handle\n"); if(res == 0) {

1 0

git:master:e8ee31f6: lib/cds: reviewed and removed old comments
by Daniel-Constantin Mierla 22 Jan '24

22 Jan '24

Module: kamailio Branch: master Commit: e8ee31f6bce32050f8caaa8d053ddaea8d99cc1d URL: https://github.com/kamailio/kamailio/commit/e8ee31f6bce32050f8caaa8d053ddae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-20T12:16:13+01:00 lib/cds: reviewed and removed old comments --- Modified: src/lib/cds/dbid.c Modified: src/lib/cds/simple_profile.c Modified: src/lib/cds/sstr.c --- Diff: https://github.com/kamailio/kamailio/commit/e8ee31f6bce32050f8caaa8d053ddae… Patch: https://github.com/kamailio/kamailio/commit/e8ee31f6bce32050f8caaa8d053ddae… --- diff --git a/src/lib/cds/dbid.c b/src/lib/cds/dbid.c index 5eb2ab20edc..fc4a47deb6d 100644 --- a/src/lib/cds/dbid.c +++ b/src/lib/cds/dbid.c @@ -9,7 +9,6 @@ void generate_dbid_ptr(dbid_t dst, void *data_ptr) { /* TODO: add cluster distinctive member */ - /* FIXME: replace sprintf by something more effective */ snprintf(dst, MAX_DBID_LEN, "%px%xx%x", data_ptr, (int)time(NULL), rand()); } @@ -26,7 +25,6 @@ void generate_dbid(dbid_t dst) } /* TODO: add cluster distinctive member */ - /* FIXME: replace sprintf by something more effective */ snprintf(dst, MAX_DBID_LEN, "%xy%xy%xy%x", my_pid, cntr++, (int)time(NULL), rand()); } diff --git a/src/lib/cds/simple_profile.c b/src/lib/cds/simple_profile.c index f166ec8b0db..f20211776a0 100644 --- a/src/lib/cds/simple_profile.c +++ b/src/lib/cds/simple_profile.c @@ -4,9 +4,6 @@ #include <sys/time.h> #include <string.h> -/* FIXME: only for testing */ -/*#include "dprint.h"*/ - #define trace_signal SIGTRAP typedef void (*_sig_t)(int); diff --git a/src/lib/cds/sstr.c b/src/lib/cds/sstr.c index 5b065fdcbe5..a342fbb26dc 100644 --- a/src/lib/cds/sstr.c +++ b/src/lib/cds/sstr.c @@ -263,7 +263,6 @@ char *str_strchr(const str_t *s, char c) char *str_str(const str_t *s, const str_t *search_for) { int i, j; - /* FIXME: reimplement using better algorithm */ if(is_str_empty(search_for)) return s->s;

1 0

[kamailio/kamailio] ASYNC functions in event_route[xhttp:request] don't work (Issue #3720)
by vsaranov 21 Jan '24

21 Jan '24

### Description When calling the async_route() from event_route[xhttp:request], an error occurs. ERROR: tm [t_lookup.c:769]: t_lookup_request(): too few headers ERROR: async [async_sleep.c:238]: async_sleep(): cannot create the transaction #### Reproduction The problem is reproducible. Below is a fragment of the configuration file. ... listen=tcp:192.168.3.115:8080 loadmodule "xhttp.so" loadmodule "async.so" ... event_route[xhttp:request] { async_route("TEST", "2"); exit; } route[TEST] { xhttp_reply("200", "OK", "text/html", "<html><body>URL $hu</body></html>\r\n"); exit; } Making a HTTP-request: curl -X POST http://192.168.3.115:8080/test \ -H "Content-Type: application/json" \ -d '{"test": 1}' #### Log Messages [messages.zip](https://github.com/kamailio/kamailio/files/13994226/messages.… ### Additional Information #kamailio -v version: kamailio 5.7.3 (x86_64/linux) e4d96b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e4d96b compiled on 12:59:36 Nov 17 2023 with gcc 4.8.5 * **Operating System**: #cat /etc/redhat-release CentOS Linux release 7.9.2009 (Core) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3720 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3720(a)github.com>

4 9

[kamailio/kamailio] failed to open database connection (Issue #3721)
by faratell 20 Jan '24

20 Jan '24

Hello. I have installed Kamailio version devel on Ubuntu 22.04 and use the mysql database on the same machine. when i run systemctl status kamailio.service ● kamailio.service - LSB: Start the Kamailio SIP proxy server Loaded: loaded (/etc/init.d/kamailio; generated) Active: active (exited) since Sat 2024-01-20 11:35:09 +0330; 21min ago Docs: man:systemd-sysv-generator(8) CPU: 48ms faraz /usr/local/sbin/kamailio[173481]: ERROR: usrloc [dlist.c:846]: register_udomain(): failed to open database connection faraz /usr/local/sbin/kamailio[173481]: ERROR: registrar [registrar.c:767]: domain_fixup(): failed to register domain faraz /usr/local/sbin/kamailio[173481]: ERROR: <core> [core/route.c:1193]: fix_actions(): fixing failed (code=-1) at cfg:/usr/local/etc/kamailio/kamailio.cfg:717 faraz /usr/local/sbin/kamailio[173481]: ERROR: <core> [core/rvalue.c:3818]: fix_rval_expr(): failure in cfg at line: 717 col: 22 faraz /usr/local/sbin/kamailio[173481]: ERROR: <core> [core/rvalue.c:3818]: fix_rval_expr(): failure in cfg at line: 717 col: 22 faraz /usr/local/sbin/kamailio[173481]: ERROR: <core> [core/route.c:1193]: fix_actions(): fixing failed (code=-1) at cfg:/usr/local/etc/kamailio/kamailio.cfg:720 faraz /usr/local/sbin/kamailio[173481]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized faraz kamailio[173463]: * already running faraz kamailio[173463]: ...done. faraz systemd[1]: Started LSB: Start the Kamailio SIP proxy server. In /usr/local/etc/kamailio/kamctlrc, I uncomment these lines: SIP_DOMAIN=ims.mnc55.mcc999.farazNET.org DBENGINE=MYSQL DBHOST=localhost in /usr/local/etc/kamailio/kamailio.cfg i apply this changes: auto_aliases=no alias="ims.mnc55.mcc999.farazNET.org" listen=udp:192.168.75.185:5060 listen=tcp:192.168.75.185:5060 how can i solved it? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3721 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3721(a)github.com>

2 2

[kamailio/kamailio] error in install tls-wolfssh modul (Issue #3712)
by faratell 20 Jan '24

20 Jan '24

Hello. I am trying to install Kamailio branch devel for using Volte on open5gs. when compiled have this error: /bin/sh: 3: ./autogen.sh: not found env: ‘./configure’: No such file or directory make[2]: *** [Makefile:28: ../../../misc/external/wolfssl/build/include/wolfssl/options.h] Error 127 make[2]: Leaving directory '/usr/local/src/kamailio-devel/kamailio/src/modules/tls_wolfssl' make[1]: *** [Makefile:508: modules] Error 1 make[1]: Leaving directory '/usr/local/src/kamailio-devel/kamailio/src' make: *** [Makefile:34: all] Error 2 I answer my question also on the user mailing list but no one reply me. It is noticeable that I installed libwolfssl-dev. Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3712 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3712(a)github.com>

2 2

[kamailio/kamailio] dialog: failover database loading behaviour in shared DB scenario, expiration of dialogs (#2080)
by Henning Westerholt 20 Jan '24

20 Jan '24

The dialog module will expire dialogs that don't actually belong to the particular proxy. Scenario: 2 proxies on 5.2.4 with a loadbalancer in front. Call was routed over proxy1, dialog timeout on proxy2 was shorter (to make it easier to reproduce it). The results: * Dialog synchronized with DMQ: proxy 2 would timeout the dialog * Dialog entry synchronized to proxy2 DB and proxy2 restarted: Proxy2 would timeout the dialog * Dialog entry synchronized to proxy2 DB and proxy2 not restarted: Proxy2 would _not_ timeout the dialog (I’ve tried both db_mode 1 and 2) So the proxy2 would load the dialog into memory and then later expire it. So timeout routes, send_bye on timeout would not work correctly. One idea to solve this would be to check e.g. over the existing socket data if the dialog belongs to this proxy and skip loading it in this case. This could be also made configurable e.g. with a module parameter. Any comments? Better ideas how to solve it? -- 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/2080

5 9

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev