sr-dev July 2024

sr-dev@lists.kamailio.org

16 participants
206 discussions

git:master:41016d18: dispatcher: range checks for oc rate min/max limits

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 41016d1835c1ab62b7d3c0f6299fae727a6f7ed3 URL: https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T15:57:01+02:00 dispatcher: range checks for oc rate min/max limits --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae7… Patch: https://github.com/kamailio/kamailio/commit/41016d1835c1ab62b7d3c0f6299fae7… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8295145da0f..5e6f7da8926 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -411,9 +411,15 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) if(dest->attrs.ocmax > 100) { dest->attrs.ocmax = 100; } + if(dest->attrs.ocmax <= 0) { + dest->attrs.ocmax = 100; + } if(dest->attrs.ocmin > 100) { dest->attrs.ocmin = 0; } + if(dest->attrs.ocmin < 0) { + dest->attrs.ocmin = 0; + } if(dest->attrs.ocrate > 100) { dest->attrs.ocrate = 0; }

1 month, 2 weeks

git:master:08ee7330: dispatcher: intit oc rate max limit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 08ee7330922e9e2b4d8fd8d5f63f596c84e2c81c URL: https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T15:50:45+02:00 dispatcher: intit oc rate max limit --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596… Patch: https://github.com/kamailio/kamailio/commit/08ee7330922e9e2b4d8fd8d5f63f596… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index bdb615ad3ea..8295145da0f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -603,6 +603,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) dp->flags = flags; dp->priority = priority; dp->dload = dload; + dp->attrs.ocmax = 100; if(ds_set_attrs(dp, attrs) < 0) { LM_ERR("cannot set attributes!\n");

1 month, 2 weeks

git:master:629a5189: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 629a518991ab204a45f625d82fbe8a0ccd247cd6 URL: https://github.com/kamailio/kamailio/commit/629a518991ab204a45f625d82fbe8a0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-07-31T07:46:11+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/629a518991ab204a45f625d82fbe8a0… Patch: https://github.com/kamailio/kamailio/commit/629a518991ab204a45f625d82fbe8a0… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 6a5e0663bdf..8986ee4df23 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -503,12 +503,14 @@ event_route[network:msg] { 4.7. msg_iflag_set(flagname) Set internal SIP message flag. The parameter flagname can be: - USE_UAC_FROM, USE_UAC_TO or UAC_AUTH. + USE_UAC_FROM, USE_UAC_TO, UAC_AUTH or a number from 0 to 64 (the + meaning of each value can be found in source code). This functions should not be used in configuration file for (re)setting the internal flags, those are done by various functions internally, however, in very particular cases they might be useful (e.g., changing - From/To via textops functions). + From/To via textops functions, or during testing of C code + development). This function can be used from ANY_ROUTE.

1 month, 2 weeks

git:master:37e971f7: corex: docs updated for msg_iflag_set()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 37e971f72c1783266ee29c02434361aaf2c819ed URL: https://github.com/kamailio/kamailio/commit/37e971f72c1783266ee29c02434361a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T07:41:43+02:00 corex: docs updated for msg_iflag_set() --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/37e971f72c1783266ee29c02434361a… Patch: https://github.com/kamailio/kamailio/commit/37e971f72c1783266ee29c02434361a… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 3cdad0aa2a5..3d6ff893808 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -469,13 +469,15 @@ event_route[network:msg] { </title> <para> Set internal SIP message flag. The parameter flagname can be: - USE_UAC_FROM, USE_UAC_TO or UAC_AUTH. + USE_UAC_FROM, USE_UAC_TO, UAC_AUTH or a number from 0 to 64 + (the meaning of each value can be found in source code). </para> <para> This functions should not be used in configuration file for (re)setting the internal flags, those are done by various functions internally, however, in very particular cases they - might be useful (e.g., changing From/To via textops functions). + might be useful (e.g., changing From/To via textops functions, + or during testing of C code development). </para> <para> This function can be used from ANY_ROUTE.

1 month, 2 weeks

git:master:82c786fd: corex: functions to manage iflags can get 0..63 parameter value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 82c786fde7a635738c905899fb6edc9b7d1a2b67 URL: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-31T07:41:43+02:00 corex: functions to manage iflags can get 0..63 parameter value --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… Patch: https://github.com/kamailio/kamailio/commit/82c786fde7a635738c905899fb6edc9… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index e853032cd7f..de2fb03b5fd 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -587,6 +587,7 @@ static msg_iflag_name_t _msg_iflag_list[] = { static unsigned long long msg_lookup_flag(str *fname) { int i; + for(i = 0; _msg_iflag_list[i].name.len > 0; i++) { if(fname->len == _msg_iflag_list[i].name.len && strncasecmp(_msg_iflag_list[i].name.s, fname->s, fname->len) @@ -594,7 +595,22 @@ static unsigned long long msg_lookup_flag(str *fname) return _msg_iflag_list[i].value; } } - return 0; + if(fname->len < 1 || fname->len > 2) { + return 0; + } + if(!(fname->s[0] >= '0' && fname->s[0] <= '9')) { + return 0; + } + if(fname->len == 1) { + return 1ULL << (fname->s[0] - '0'); + } + if(!(fname->s[1] >= '0' && fname->s[1] <= '9')) { + return 0; + } + if((10 * (fname->s[0] - '0') - (fname->s[1] - '0')) > 63) { + return 0; + } + return 1ULL << (10 * (fname->s[0] - '0') - (fname->s[1] - '0')); } /**

1 month, 2 weeks

[kamailio/kamailio] Kamailio crash with DMQ!? (Issue #3905)

by Benjamin

### Description Kamailio version 5.7.4 crashed with a core file. Maybe it's related to the dmq module. #### Debugging Data ``` (gdb) bt full #0 atomic_inc_int (var=0x7f5700000000) at ../../core/parser/../mem/../atomic/atomic_x86.h:236 No locals. #1 cfg_update_local (no_cbs=<optimized out>) at ../../core/cfg/cfg_struct.h:381 group = <optimized out> last_cb = 0x7f57c99545e0 prev_cb = <optimized out> group = <optimized out> last_cb = <optimized out> prev_cb = <optimized out> __func__ = "cfg_update_local" #2 worker_loop (id=id@entry=2) at worker.c:57 worker = <optimized out> current_job = <optimized out> peer_response = {resp_code = 1, content_type = {s = 0x55ea7b42cfca <init_mod_child+90> "\205\300\017\210\r\002", len = 15}, reason = {s = 0x0, len = 2}, body = { s = 0x7ffcf6347c30 "\001", len = 2069833640}} ret_value = <optimized out> not_parsed = <optimized out> dmq_node = 0x0 __func__ = "worker_loop" #3 0x00007f57d9426a11 in child_init (rank=<optimized out>) at dmq.c:321 i = 2 newpid = <optimized out> __func__ = "child_init" #4 0x000055ea7b42cfca in init_mod_child (m=0x7f57dd005640, rank=rank@entry=0) at core/sr_module.c:911 ret = 0 __func__ = "init_mod_child" #5 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd005b90, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #6 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd006910, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #7 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd006e70, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #8 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd008660, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #9 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd0089d0, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #10 0x000055ea7b42cfa4 in init_mod_child (m=0x7f57dd008d70, rank=rank@entry=0) at core/sr_module.c:903 ret = <optimized out> __func__ = "init_mod_child" #11 0x000055ea7b43239e in init_child (rank=rank@entry=0) at core/sr_module.c:990 ret = <optimized out> type = <optimized out> __func__ = "init_child" #12 0x000055ea7b288365 in main_loop () at main.c:1929 i = <optimized out> pid = <optimized out> si = 0x0 si_desc = "udp receiver child=15 sock=172.20.21.4:5060\000\000\000\000\000H\211\064\366\374\177\000\000\301'C{\352U\000\000\276\000\000\000\002\000\000\000\017\247`{\352U\000\000\062\323b{\352U\000\000U\024\000\000\000\000\000\000\004\000_{\352U\000\000\000\272\030D\344\223ԃ\270Rc{\352U\000\000\004\000\000\000\000\000\000" nrprocs = <optimized out> woneinit = 1 __func__ = "main_loop" error = <optimized out> #13 0x000055ea7b27be9e in main (argc=<optimized out>, argv=<optimized out>) at main.c:3213 cfg_stream = <optimized out> c = <optimized out> r = <optimized out> tmp = 0x7ffcf6349e4e "" tmp_len = -554008000 port = 32599 proto = 0 ahost = 0x0 aport = 0 options = 0x55ea7b5f2cc8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 1892320457 rfd = <optimized out> debug_save = <optimized out> debug_flag = <optimized out> dont_fork_cnt = <optimized out> n_lst = <optimized out> p = <optimized out> st = {st_dev = 0, st_ino = 0, st_nlink = 0, st_mode = 0, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 0, st_blksize = 0, st_blocks = 0, st_atim = {tv_sec = 0, tv_nsec = 0}, st_mtim = {tv_sec = 0, tv_nsec = 0}, st_ctim = {tv_sec = 0, tv_nsec = 0}, __glibc_reserved = {0, 0, 0}} tbuf = '\000' <repeats 20 times>, " ", '\000' <repeats 35 times>, "\006\000\000\000\000\000\000\200", '\000' <repeats 56 times>, "\006\000\000\000\000\000\000\200", '\000' <repeats 168 times>... option_index = 9 long_options = {{name = 0x55ea7b5f12ea "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55ea7b5fa98e "version", has_arg = 0, flag = 0x0, val = 118}, { name = 0x55ea7b60a690 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55ea7b5f12ef "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55ea7b5f12f5 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55ea7b5f12fe "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55ea7b5f1308 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55ea7b5f1312 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55ea7b5f131d "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x55ea7b5f1326 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55ea7b5faaab "debug", has_arg = 1, flag = 0x0, val = 1032}, { name = 0x55ea7b5f1331 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x55ea7b5f133b "atexit", has_arg = 1, flag = 0x0, val = 1034}, { name = 0x55ea7b5f1342 "all-errors", has_arg = 0, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals No locals. (gdb) list 231 in ../../core/parser/../mem/../atomic/atomic_x86.h ``` #### Log Messages ``` Jul 2 15:24:44 hostname kernel: kamailio[1098]: segfault at 7f5700000000 ip 00007f57d94467a0 sp 00007ffcf6347b00 error 6 in dmq.so[7f57d9426000+23000] ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (x86_64/linux) 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: compiled with gcc 10.2.1 ``` * **Operating System**: ``` Debian: 11.10 - Bullseye Linux 5.10.0-30-amd64 #1 SMP Debian 5.10.218-1 (2024-06-01) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3905 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3905(a)github.com>

1 month, 2 weeks

[kamailio/kamailio] Suspected mem leak in the pua and request for ideas (Issue #3928)

by Andrew Pogrebennyk

Hi! it seems the pua module in send_subscribe ( ) is leaking some memory because the hentity is not released. According to memory allocations the shmem allocated for hentity is not cleaned. ``` 1454582 file = 0x70e59fd30209 "usrloc: ../../core/ut.h", func = 0x70e59fd326c8 <__func__.16> "shm_str_dup", mname = 0x70e59fd2fdf0 "usrloc", line = 722 698090 file = 0x604218f2fcd5 "core: core/xavp.c", func = 0x604218f31988 <__func__.9> "xavp_new_value", mname = 0x604218f2fcd0 "core", line = 100 360187 file = 0x70e59fd30663 "usrloc: ucontact.c", func = 0x70e59fd326b8 <__func__.17> "new_ucontact", mname = 0x70e59fd2fdf0 "usrloc", line = 94 34208 file = 0x70e59fc91ae9 "pua: send_subscribe.c", func = 0x70e59fc94c80 <__func__.2> "subscribe_cbparam", mname = 0x70e59fc917e0 "pua", line = 773 5569 file = 0x70e59fc91ae9 "pua: send_subscribe.c", func = 0x70e59fc94ca0 <__func__.1> "subs_cbparam_indlg", mname = 0x70e59fc917e0 "pua", line = 861 64 file = 0x70e5a231f424 "tmx: tmx_pretran.c", func = 0x70e5a2320230 <__func__.0> "tmx_check_pretran", mname = 0x70e5a231f420 "tmx", line = 271 64 file = 0x70e5a231f424 "tmx: tmx_pretran.c", func = 0x70e5a2320230 <__func__.0> "tmx_check_pretran", mname = 0x70e5a231f420 "tmx", line = 250 7 file = 0x70e59fc86854 "pua: event_list.c", func = 0x70e59fc86ad0 <__func__.1> "add_pua_event", mname = 0x70e59fc86850 "pua", line = 72 3 file = 0x70e5a297c249 "license: ../../core/ut.h", func = 0x70e5a297d4f8 <__func__.3> "shm_str_dup", mname = 0x70e5a297c000 "license", line = 722 3 file = 0x70e59fd329d4 "usrloc: udomain.c", func = 0x70e59fd35660 <__func__.22> "build_stat_name", mname = 0x70e59fd328a0 "usrloc", line = 56 ``` According to mod_stats for shmem over RPC the pua module was taking double as much memory as usrloc on the busy system. I have tried to address the issue shown on lines 773 and 861 and added clearing of hentity at the end of send_subscribe () : but it had caused the subscribe_200 outside of dialog to crash kamailio because of running the tm callback that accesses the hentity which is already free'd So I thought perhaps another approach is required and the tm callback should clean it, while I must say i do not 100% clear understand why this needs to be so complicated compared to other modules. Perhaps i have missed another bug and overcomplicated things because the uac_r seems to be cleaned just fine. The issue around the hentity does not seem to be solved in the latest releases while this is 5.3-something custom build. Anyway my last resort that could help is convert to use tm to clear memory once it is done, in tm/uac.c : t_uac_prepare() is registering a callback with release function ``` if(uac_r->cb && insert_tmcb(&(new_cell->tmcb_hl), uac_r->cb_flags, *(uac_r->cb), uac_r->cbp, NULL)!=1){ ret=E_OUT_OF_MEM; LM_ERR("short of tmcb shmem\n"); goto error1; } int insert_tmcb(struct tmcb_head_list *cb_list, int types, transaction_cb f, void *param, release_tmcb_param rel_func) { ``` is there any example of using such a relfunc in the other modules? Or anyone else has see the pua causing a mem leak when it is subscribed to reginfo from the config? I would appreciate some ideas what could be the issue and the solution. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3928 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3928(a)github.com>

1 month, 2 weeks

git:master:fe56aa38: tls_wolfssl: legacy clean-up

by S-P Chan

Module: kamailio Branch: master Commit: fe56aa38a88a9961141bbcc2fc26d384af63734e URL: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-07-30T19:47:06+08:00 tls_wolfssl: legacy clean-up --- Modified: src/modules/tls_wolfssl/tls_init.c Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… Patch: https://github.com/kamailio/kamailio/commit/fe56aa38a88a9961141bbcc2fc26d38… --- diff --git a/src/modules/tls_wolfssl/tls_init.c b/src/modules/tls_wolfssl/tls_init.c index 2c8c4a4965c..8f2f994e961 100644 --- a/src/modules/tls_wolfssl/tls_init.c +++ b/src/modules/tls_wolfssl/tls_init.c @@ -221,7 +221,6 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) #endif return p; } - #else /*TLS_MALLOC_DBG */ static void *ser_malloc(size_t size) { @@ -234,6 +233,7 @@ static void *ser_realloc(void *ptr, size_t size) } #endif + static void ser_free(void *ptr) { if(ptr) { @@ -241,45 +241,6 @@ static void ser_free(void *ptr) } } -#if 0 -// up align memory allocations to 16 bytes for -// wolfSSL --enable-aligndata=yes (the default) -static const int MAX_ALIGN = __alignof__(max_align_t); - -static void* ser_malloc(size_t size) -{ - char* ptr = shm_malloc(size + MAX_ALIGN); - int pad = MAX_ALIGN - ((long) ptr % MAX_ALIGN); // 8 or 16 bytes - - memset(ptr, pad, pad); - return ptr + pad; -} - -static void* ser_realloc(void *ptr, size_t new_size) -{ - if(!ptr) return ser_malloc(new_size); - - int pad = *((char*)ptr - 1); // 8 or 16 bytes - char *real_ptr = (char*)ptr - pad; - - char *new_ptr = shm_realloc(real_ptr, new_size+MAX_ALIGN); - int new_pad = MAX_ALIGN - ((long) new_ptr % MAX_ALIGN); - if (new_pad != pad) { - memmove(new_ptr + new_pad, new_ptr + pad, new_size); - memset(new_ptr, new_pad, new_pad); - } - - return new_ptr + new_pad; -} - -static void ser_free(void *ptr) -{ - if (ptr) { - int pad = *((unsigned char *)ptr - 1); - shm_free((unsigned char*)ptr - pad); - } -} -#endif /* * Initialize TLS socket diff --git a/src/modules/tls_wolfssl/tls_wolfssl_mod.c b/src/modules/tls_wolfssl/tls_wolfssl_mod.c index e95cecb7be5..9a195b76b39 100644 --- a/src/modules/tls_wolfssl/tls_wolfssl_mod.c +++ b/src/modules/tls_wolfssl/tls_wolfssl_mod.c @@ -262,22 +262,6 @@ static struct tls_hooks tls_h = { }; -#if 0 -/* - * Create TLS configuration from modparams - */ -static tls_domains_cfg_t* tls_use_modparams(void) -{ - tls_domains_cfg_t* ret; - - ret = tls_new_cfg(); - if (!ret) return; - - -} -#endif - - static int mod_init(void) { int method;

1 month, 2 weeks

git:master:072c4433: corex: switch to unsigned long long for iflag lookup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 072c44330297c653675b5078fb0facdc399a5ab4 URL: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-30T09:07:36+02:00 corex: switch to unsigned long long for iflag lookup --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… Patch: https://github.com/kamailio/kamailio/commit/072c44330297c653675b5078fb0facd… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index f055af88c8d..e853032cd7f 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -584,7 +584,7 @@ static msg_iflag_name_t _msg_iflag_list[] = { /** * */ -static int msg_lookup_flag(str *fname) +static unsigned long long msg_lookup_flag(str *fname) { int i; for(i = 0; _msg_iflag_list[i].name.len > 0; i++) { @@ -594,21 +594,22 @@ static int msg_lookup_flag(str *fname) return _msg_iflag_list[i].value; } } - return -1; + return 0; } + /** * */ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -621,14 +622,14 @@ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) */ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -641,14 +642,14 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) */ static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2) { - int fv; + unsigned long long fv; str fname; if(fixup_get_svalue(msg, (gparam_t *)pflag, &fname)) { LM_ERR("cannot get the msg flag name parameter\n"); return -1; } fv = msg_lookup_flag(&fname); - if(fv == -1) { + if(fv == 0) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; }

1 month, 2 weeks

git:master:fdb0ef98: corex: proper check for iflag lookup return code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fdb0ef987ca2b013104b06ece006f67bf8ae07d3 URL: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-07-30T08:55:08+02:00 corex: proper check for iflag lookup return code --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… Patch: https://github.com/kamailio/kamailio/commit/fdb0ef987ca2b013104b06ece006f67… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 4f3214049b6..f055af88c8d 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -608,7 +608,7 @@ static int w_msg_iflag_set(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv == 1) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -628,7 +628,7 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv < 0) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; } @@ -648,7 +648,7 @@ static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2) return -1; } fv = msg_lookup_flag(&fname); - if(fv < 0) { + if(fv == -1) { LM_ERR("unsupported flag name [%.*s]\n", fname.len, fname.s); return -1; }

1 month, 2 weeks

← Newer
1
2
3
4
5
6
7
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2024