sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

[kamailio/kamailio] cnxcc: minor changes (#2343)
by Victor Seva 04 Jun '20

04 Jun '20

#### 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) - [x] 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 - [x] 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  #### Description Still WIP * use [PKG|SHM]_MEM_ERROR * use memset and avoid initialization per field * init variables * add cnxcc to lgtm build You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2343 -- Commit Summary -- * cnxcc: minor changes -- File Changes -- M .lgtm.yml (3) M src/modules/cnxcc/cnxcc_mod.c (61) M src/modules/cnxcc/cnxcc_redis.c (29) M src/modules/cnxcc/cnxcc_rpc.c (30) M src/modules/cnxcc/cnxcc_sip_msg_faker.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2343.patch https://github.com/kamailio/kamailio/pull/2343.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/2343

2 4

git:master:e98457fa: cnxcc: minor changes
by Victor Seva 04 Jun '20

04 Jun '20

Module: kamailio Branch: master Commit: e98457faf2098ca2f16a831a4a68d2a26e301b0a URL: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-04T11:09:17+02:00 cnxcc: minor changes * use [PKG|SHM]_MEM_ERROR * use memset and avoid initialization per field * init variables * add cnxcc to lgtm build * use localtime_r() for a safer multi-thread usage * replaced deprecated STR_PARAM with PARAM_STR * clean includes * clang-format --- Modified: .lgtm.yml Modified: src/modules/cnxcc/cnxcc.c Modified: src/modules/cnxcc/cnxcc.h Modified: src/modules/cnxcc/cnxcc_mod.c Modified: src/modules/cnxcc/cnxcc_mod.h Modified: src/modules/cnxcc/cnxcc_redis.c Modified: src/modules/cnxcc/cnxcc_rpc.c Modified: src/modules/cnxcc/cnxcc_rpc.h Modified: src/modules/cnxcc/cnxcc_select.c Modified: src/modules/cnxcc/cnxcc_select.h Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.h --- Diff: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a… Patch: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a…

1 0

git:master:be57be33: pdb: use memcpy() for PDB_BUFTOSHORT macro
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: be57be33d0e48d412ddab9801ee4d6d906329d70 URL: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T21:46:20+02:00 pdb: use memcpy() for PDB_BUFTOSHORT macro - related to GH #2345 --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… Patch: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 1ab15af2e7..5fb1204e52 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -190,7 +190,7 @@ static int pdb_msg_format_send(struct pdb_msg *msg, /* two chars to short-int without caring of memory alignment in char buffer */ -#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) +#define PDB_BUFTOSHORT(_sv, _b, _n) memcpy(&(_sv), (char*)(_b) + (_n), sizeof(short int)) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -347,7 +347,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, msg.bdy.payload, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; } @@ -370,7 +370,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, buf, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; }

1 0

missing SAR messages
by Georgi Rosenov Stefanov 03 Jun '20

03 Jun '20

Hi All, I am experimenting with Kamailio 5.3.3 as an IMS and I am trying to do load tests I am using SIPp to generate SIP.REGISTER and MariaDB and a DIAMETER tool ( seagull) For now I achieved registrations with "speed" 200 per/sec. When I send SIP.REGISTER faster(let's say 500 per/sec) I see some SARs missing, not sent at all. I start debugging and found that cxdx_send_sar is responsible to creating SAR message. I put my debug message in it. The strange thing: there is a mismatch of my debug message (cxdx_send_sar invocation) and real SAR send over the network. What is the thing I missing ? Is there anything else responsible for SAR creating except cxdx_send_sar ? Did someone made similar tests ? my test machine is Centos 7 with 3.10.0 Intel(R) Core(TM) i7-9700K CPU @ 3.60GHz 16G RAM During this tests I see kamailio very low CPU usage, even when I push it with 500/sec The biggest CPU load is in MariaDB, but I do not have issues with UAR and MAR

2 2

[kamailio/kamailio] warning cleanup (#2298)
by sergey-safarov 03 Jun '20

03 Jun '20

**ld_fld.c:273** implicit-function-declaration ``` CC (gcc) [M db2_ldap.so] db2_ldap_mod.o CC (gcc) [M db2_ldap.so] ld_cfg.o CC (gcc) [M db2_ldap.so] ld_cmd.o CC (gcc) [M db2_ldap.so] ld_con.o CC (gcc) [M db2_ldap.so] ld_fld.o ld_fld.c: In function 'ldap_gentime2db_datetime': ld_fld.c:273:10: warning: implicit declaration of function 'timelocal' [-Wimplicit-function-declaration] 273 | *dst = timelocal(&time); | ^~~~~~~~~ CC (gcc) [M db2_ldap.so] ld_res.o CC (gcc) [M db2_ldap.so] ld_uri.o make[3]: 'libsrdb2.so.1.0' is up to date. ``` **redis_table.c:586** maybe-uninitialized ``` CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o CC (gcc) [M db_redis.so] redis_table.o redis_table.c: In function 'db_redis_parse_keys': redis_table.c:586:38: warning: 'table' may be used uninitialized in this function [-Wmaybe-uninitialized] 586 | table->types = type_target = type; | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ make[3]: 'libsrdb2.so.1.0' is up to date. make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so ``` **app_python** strict-aliasing ``` CC (gcc) [M app_python.so] app_python_mod.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/Python.h:83, from apy_kemi.c:25: apy_kemi.c: In function 'sr_kemi_apy_return_true': /usr/include/python2.7/object.h:769:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 769 | ((PyObject*)(op))->ob_refcnt++) | ~^~~~~~~~~~~~~~~~ apy_kemi.c:121:2: note: in expansion of macro 'Py_INCREF' 121 | Py_INCREF(Py_True); | ^~~~~~~~~ apy_kemi.c: In function 'sr_kemi_apy_return_false': /usr/include/python2.7/object.h:769:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 769 | ((PyObject*)(op))->ob_refcnt++) | ~^~~~~~~~~~~~~~~~ apy_kemi.c:130:2: note: in expansion of macro 'Py_INCREF' 130 | Py_INCREF(Py_False); | ^~~~~~~~~ CC (gcc) [M app_python.so] apy_kemi_export.o CC (gcc) [M app_python.so] mod_Core.o ``` **pdb.c:348** address-of-packed-member] ``` LD (gcc) [M p_usrloc.so] p_usrloc.so CC (gcc) [M path.so] path.o CC (gcc) [M path.so] path_mod.o LD (gcc) [M path.so] path.so CC (gcc) [M pdb.so] pdb.o pdb.c: In function 'pdb_query': pdb.c:348:60: warning: taking address of packed member of 'struct pdb_msg' may result in an unaligned pointer value [-Waddress-of-packed-member] 348 | _id = (short int *)&(msg.bdy.payload[reqlen]); /* make gcc happy */ | ^~~~~~~~~~~~~~~~~~~~~~~~~~ LD (gcc) [M pdb.so] pdb.so CC (gcc) [M pdt.so] pdt.o CC (gcc) [M pdt.so] pdtree.o make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- 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/2298

3 5

git:master:4deb5141: core: tcp - log details of the exiting tcp connection on insert failure
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 4deb51419ab66931459709fe44acd3e7a0acc18d URL: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T12:45:05+02:00 core: tcp - log details of the exiting tcp connection on insert failure --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… Patch: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8147951b21..db6e8b923a 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1720,7 +1720,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) * idx - index in the fd_array (or -1 if not known) * return: -1 on error, or when we are not interested any more on reads * from this fd (e.g.: we are closing it ) - * 0 on EAGAIN or when by some other way it is known that no more + * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). * Usefull to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. @@ -1728,7 +1728,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) * queued -- the receive buffer might still be non-empty) */ inline static int handle_io(struct fd_map* fm, short events, int idx) -{ +{ int ret; int n; int read_flags; @@ -1736,10 +1736,11 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) int s; long resp; ticks_t t; - + fd_map_t *ee = NULL; + /* update the local config */ cfg_update(); - + switch(fm->type){ case F_TCPMAIN: again: @@ -1803,7 +1804,7 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) if (unlikely(read_flags & RD_CONN_REPEAT_READ)) goto repeat_1st_read; #endif /* USE_TLS */ - + /* must be before io_watch_add, io_watch_add might catch some * already existing events => might call handle_io and * handle_io might decide to del. the new connection => @@ -1816,13 +1817,25 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) local_timer_reinit(&con->timer); local_timer_add(&tcp_reader_ltimer, &con->timer, S_TO_TICKS(TCP_CHILD_TIMEOUT), t); - if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)){ + if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)) { LM_CRIT("io_watch_add failed for %p id %d fd %d, state %d, flags %x," " main fd %d, refcnt %d ([%s]:%u -> [%s]:%u)\n", con, con->id, con->fd, con->state, con->flags, con->s, atomic_get(&con->refcnt), ip_addr2a(&con->rcv.src_ip), con->rcv.src_port, ip_addr2a(&con->rcv.dst_ip), con->rcv.dst_port); + ee = get_fd_map(&io_w, s); + if(ee!=0 && ee->type==F_TCPCONN) { + tcp_connection_t *ec; + ec = (tcp_connection_t*)ee->data; + LM_CRIT("existing tcp con %p id %d fd %d, state %d, flags %x," + " main fd %d, refcnt %d ([%s]:%u -> [%s]:%u)\n", + ec, ec->id, ec->fd, ec->state, ec->flags, + ec->s, atomic_get(&ec->refcnt), + ip_addr2a(&ec->rcv.src_ip), ec->rcv.src_port, + ip_addr2a(&ec->rcv.dst_ip), ec->rcv.dst_port); + + } tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); local_timer_del(&tcp_reader_ltimer, &con->timer); goto con_error;

1 0

git:master:50af00c7: core: io_wait.h - typedef fd_map_t, more details in log when is a fd conflict
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 50af00c7ef7037b6e55a3d3254a38935532bb0fa URL: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:55:57+02:00 core: io_wait.h - typedef fd_map_t, more details in log when is a fd conflict --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… Patch: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index 3112085a14..9177ae2aaf 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -109,12 +109,12 @@ typedef int fd_type; /* maps a fd to some other structure; used in almost all cases * except epoll and maybe kqueue or /dev/poll */ -struct fd_map{ +typedef struct fd_map { int fd; /* fd no */ fd_type type; /* "data" type */ void* data; /* pointer to the corresponding structure */ short events; /* events we are interested int */ -}; +} fd_map_t; #ifdef HAVE_KQUEUE @@ -132,7 +132,7 @@ struct fd_map{ /* handler structure */ -struct io_wait_handler{ +typedef struct io_wait_handler { enum poll_types poll_method; int flags; struct fd_map* fd_hash; @@ -172,13 +172,12 @@ struct io_wait_handler{ fd_set master_wset; /* write set */ int max_fd_select; /* maximum select used fd */ #endif -}; - -typedef struct io_wait_handler io_wait_h; +} io_wait_h; /* get the corresponding fd_map structure pointer */ #define get_fd_map(h, fd) (&(h)->fd_hash[(fd)]) + /* remove a fd_map structure from the hash; the pointer must be returned * by get_fd_map or hash_fd_map*/ #define unhash_fd_map(pfm) \ @@ -321,7 +320,7 @@ inline static int io_watch_add( io_wait_h* h, h->fd_array[h->fd_no].events=(ev); /* useless for select */ \ h->fd_array[h->fd_no].revents=0; /* useless for select */ \ }while(0) - + #define set_fd_flags(f) \ do{ \ flags=fcntl(fd, F_GETFL); \ @@ -336,8 +335,7 @@ inline static int io_watch_add( io_wait_h* h, goto error; \ } \ }while(0) - - + struct fd_map* e; int flags; #ifdef HAVE_EPOLL @@ -353,7 +351,7 @@ inline static int io_watch_add( io_wait_h* h, int idx; int check_io; struct pollfd pf; - + check_io=0; /* set to 1 if we need to check for pre-existing queued io/data on the fd */ idx=-1; @@ -378,13 +376,13 @@ inline static int io_watch_add( io_wait_h* h, /* hash sanity check */ e=get_fd_map(h, fd); if (unlikely(e && (e->type!=0 /*F_NONE*/))){ - LM_ERR("trying to overwrite entry %d" - " watched for %x in the hash(%d, %d, %p) with (%d, %d, %p)\n", - fd, events, e->fd, e->type, e->data, fd, type, data); + LM_ERR("trying to overwrite entry %d watched for %x" + " in the hash %p (fd:%d, type:%d, data:%p) with (%d, %d, %p)\n", + fd, events, h, e->fd, e->type, e->data, fd, type, data); e=0; goto error; } - + if (unlikely((e=hash_fd_map(h, fd, events, type, data))==0)){ LM_ERR("failed to hash the fd %d\n", fd); goto error;

1 0

git:master:19b3deb8: ctl: renamed global io_h to clt_io_h
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 19b3deb88afe5d787ca366885c660e66f17c3409 URL: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:33:01+02:00 ctl: renamed global io_h to clt_io_h - tcp core also uses a glibal io_h --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6… Patch: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6…

1 0

git:master:b6abc761: erlang: renamed global io_h to clt_io_h
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: b6abc7618af7b8b3470e76aae7a0fd5ba0869949 URL: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:36:07+02:00 erlang: renamed global io_h to clt_io_h - tcp core also uses a glibal io_h --- Modified: src/modules/erlang/cnode.c --- Diff: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5… Patch: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5…

1 0

git:master:2d58abdc: modules: readme files regenerated - crypto ... [skip ci]
by Kamailio Dev 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 2d58abdc01372898f61d2c09190fdce2681eb738 URL: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-02T11:16:27+02:00 modules: readme files regenerated - crypto ... [skip ci] --- Modified: src/modules/crypto/README --- Diff: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce… Patch: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev