sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:master:43a6dd1e: dmq_usrloc: coherent indentations
by Daniel-Constantin Mierla 04 Nov '16

04 Nov '16

Module: kamailio Branch: master Commit: 43a6dd1e9fe37141ded6c6a62d76a98f469bb49e URL: https://github.com/kamailio/kamailio/commit/43a6dd1e9fe37141ded6c6a62d76a98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-04T10:17:30+01:00 dmq_usrloc: coherent indentations --- Modified: modules/dmq_usrloc/dmq_usrloc.c Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:master:f109109a: app_lua: safety check of returned anchor before using it
by Daniel-Constantin Mierla 04 Nov '16

04 Nov '16

Module: kamailio Branch: master Commit: f109109a194abcc105f6d6a2e398d28e21870941 URL: https://github.com/kamailio/kamailio/commit/f109109a194abcc105f6d6a2e398d28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-04T09:49:50+01:00 app_lua: safety check of returned anchor before using it --- Modified: modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] Presence: Fix startup inconsistency in presentity hash table (#809)
by Stefan Kohlhauser 03 Nov '16

03 Nov '16

pres_htable_restore(): Remove check of expired presentity entries when initially filling the hash table to represent the number of expired + valid entries. Because hash.c::delete_phtable() decrements publ_count on removal of _every_ expired DB entry. get_p_notify_body(): Compensate the fix on hash table restore by checking for the expires time on building the NOTIFY. This also fixes a problem when a SUBSCRIBE is received for an expired entry before the cleaner can remove the entry from the DB. … [View More]

6 23

[kamailio/kamailio] dispatcher: kamcmd dispatcher.reload kamailio seg (#846)
by Rick 03 Nov '16

03 Nov '16

When doing a dispatcher reload with kamcmd kamailio crashes. ``` # kamailio -v version: kamailio 5.0.0-dev6 (x86_64/freebsd) 276ccc flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, … [View More]MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: 276ccc compiled on 17:39:46 Sep 29 2016 with clang 3.4 ``` ``` #0 0x00000008098d32c3 in ds_avl_destroy (node_ptr=0x809ed2b40) at dispatch.c:3046 3046 if(dest->uri.s!=NULL) [New Thread 80286b400 (LWP 100148/<unknown>)] (gdb) bt #0 0x00000008098d32c3 in ds_avl_destroy (node_ptr=0x809ed2b40) at dispatch.c:3046 #1 0x00000008098d95cb in ds_destroy_list () at dispatch.c:1000 #2 0x0000000809911ead in destroy () at dispatcher.c:593 #3 0x0000000000508345 in destroy_modules () at sr_module.c:811 #4 0x0000000000517ff7 in cleanup (show_status=1) at main.c:526 #5 0x000000000052011c in shutdown_children (sig=15, show_status=1) at main.c:668 #6 0x000000000051f094 in handle_sigs () at main.c:760 #7 0x0000000000530859 in main_loop () at main.c:1748 #8 0x000000000053b530 in main (argc=15, argv=0x7fffffffeb38) at main.c:2632 Current language: auto; currently minimal ``` ``` Nov 3 10:10:17 <local0.info> kamailio[43234]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43233]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43232]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43231]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43230]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43228]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43227]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43226]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43225]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43224]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.info> kamailio[43229]: INFO: <core> [main.c:811]: sig_usr(): signal 15 received Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43233 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43234 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43232 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43231 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43230 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43229 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43228 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43227 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43226 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43225 exited normally, status=0 Nov 3 10:10:17 <local0.alert> kamailio[43223]: ALERT: <core> [main.c:738]: handle_sigs(): child process 43224 exited normally, status=0 Nov 3 10:10:17 <local0.info> kamailio[43223]: INFO: <core> [main.c:756]: handle_sigs(): terminating due to SIGCHLD ``` -- 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/846 [View Less]

3 14

git:master:45e94dca: alias_db: remove inline to function provided as parameter to another one
by Daniel-Constantin Mierla 03 Nov '16

03 Nov '16

Module: kamailio Branch: master Commit: 45e94dca8e1fc2b7bae6cece0d3ac19fbc5e430d URL: https://github.com/kamailio/kamailio/commit/45e94dca8e1fc2b7bae6cece0d3ac19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-03T16:45:16+01:00 alias_db: remove inline to function provided as parameter to another one --- Modified: modules/alias_db/alookup.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:98f9cace: dispatcher: replaced some fields init with memset to 0
by Daniel-Constantin Mierla 03 Nov '16

03 Nov '16

Module: kamailio Branch: master Commit: 98f9cace74adc33f42a6a6aca4d0adc1bcc81248 URL: https://github.com/kamailio/kamailio/commit/98f9cace74adc33f42a6a6aca4d0adc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-03T14:31:16+01:00 dispatcher: replaced some fields init with memset to 0 - safer when adding new fields in structures --- Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/… [View More]dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/98f9cace74adc33f42a6a6aca4d0adc… Patch: https://github.com/kamailio/kamailio/commit/98f9cace74adc33f42a6a6aca4d0adc… --- diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index e86c9c4..53b597d 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -206,7 +206,7 @@ int init_data(void) LM_ERR("Out of memory\n"); return -1; } - ds_lists[0] = ds_lists[1] = 0; + memset(ds_lists, 0, 2*sizeof(ds_set_t*)); p = (int*)shm_malloc(3*sizeof(int)); @@ -215,6 +215,7 @@ int init_data(void) LM_ERR("Out of memory\n"); return -1; } + memset(p, 0, 3*sizeof(int)); crt_idx = p; next_idx = p+1; @@ -588,10 +589,12 @@ int dp_init_weights(ds_set_t *dset) /*! \brief compact destinations from sets for fast access */ int reindex_dests( ds_set_t* node ) { + int i=0; + int j=0; + if ( !node ) return 0; - int i=0; for( ;i<2;++i) { int rc = reindex_dests( node->next[i] ); @@ -599,8 +602,6 @@ int reindex_dests( ds_set_t* node ) return rc; } - int j; - ds_dest_t *dp = NULL, *dp0= NULL; dp0 = (ds_dest_t*)shm_malloc(node->nr*sizeof(ds_dest_t)); @@ -3029,18 +3030,18 @@ ds_set_t* ds_avl_find( ds_set_t* node, int id ) */ void ds_avl_destroy( ds_set_t** node_ptr ) { + ds_set_t *node=NULL; + ds_dest_t *dest=NULL; + int i=0; if ( !node_ptr || !(*node_ptr) ) return; - ds_set_t* node = *node_ptr; + node = *node_ptr; - int i=0; for( ;i<2;++i) ds_avl_destroy( &node->next[i] ); - ds_dest_t *dest = NULL; - for(dest = node->dlist; dest!= NULL; dest=dest->next) { if(dest->uri.s!=NULL) @@ -3062,8 +3063,12 @@ static void avl_rebalance( ds_set_t** path_top, int target ); ds_set_t* ds_avl_insert( ds_set_t** root, int id, int* setn ) { - ds_set_t** rotation_top = root; - ds_set_t* node = *root; + ds_set_t** rotation_top; + ds_set_t* node; + + rotation_top = root; + node = *root; + while (node && id != node->id) { int next_step = (id > node->id); if (!AVL_BALANCED(node)) rotation_top = root; @@ -3072,8 +3077,8 @@ ds_set_t* ds_avl_insert( ds_set_t** root, int id, int* setn ) } if (!node) { - node = shm_malloc(sizeof(*node)); - node->next[0] = node->next[1] = NULL; + node = shm_malloc(sizeof(ds_set_t)); + memset(node, 0, sizeof(ds_set_t)); node->id = id; node->longer = AVL_NEITHER; *root = node; @@ -3102,6 +3107,7 @@ static void avl_rebalance_path( ds_set_t* path, int id ) static ds_set_t* avl_rotate_2( ds_set_t** path_top, int dir ) { ds_set_t *B, *C, *D, *E; + B = *path_top; D = B->next[dir]; C = D->next[1-dir]; @@ -3111,12 +3117,14 @@ static ds_set_t* avl_rotate_2( ds_set_t** path_top, int dir ) B->next[dir] = C; B->longer = AVL_NEITHER; D->longer = AVL_NEITHER; + return E; } static ds_set_t* avl_rotate_3( ds_set_t** path_top, int dir, int third ) { ds_set_t *B, *F, *D, *C, *E; + B = *path_top; F = B->next[dir]; D = F->next[1-dir]; @@ -3149,8 +3157,11 @@ static ds_set_t* avl_rotate_3( ds_set_t** path_top, int dir, int third ) static void avl_rebalance( ds_set_t** path_top, int id ) { - ds_set_t* path = *path_top; + ds_set_t* path; int first, second, third; + + path = *path_top; + if (AVL_BALANCED(path)) { avl_rebalance_path(path, id); return; diff --git a/modules/dispatcher/dispatch.h b/modules/dispatcher/dispatch.h index cbe965a..dedc6b5 100644 --- a/modules/dispatcher/dispatch.h +++ b/modules/dispatcher/dispatch.h @@ -180,7 +180,7 @@ typedef struct _ds_set unsigned int wlist[100]; unsigned int rwlist[100]; struct _ds_set *next[2]; - int longer:2; + int longer; } ds_set_t; #define AVL_LEFT 0 #define AVL_RIGHT 1 [View Less]

1 0

git:master:0369e5ab: dispatcher: coherent indentation
by Daniel-Constantin Mierla 03 Nov '16

03 Nov '16

Module: kamailio Branch: master Commit: 0369e5ab3811a09cf1b1615950401967217bfce4 URL: https://github.com/kamailio/kamailio/commit/0369e5ab3811a09cf1b161595040196… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-03T14:14:23+01:00 dispatcher: coherent indentation --- Modified: modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0369e5ab3811a09cf1b161595040196… Patch: https://github.com/kamailio/kamailio/commit/0369e5ab3811a09cf1b161595040196…

1 0

git:master:a471e472: auth_ephemeral: re-ordered code so access to sip msg is done after NULL check
by Daniel-Constantin Mierla 03 Nov '16

03 Nov '16

Module: kamailio Branch: master Commit: a471e4723206cdce7e9e319af344145b92444698 URL: https://github.com/kamailio/kamailio/commit/a471e4723206cdce7e9e319af344145… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-03T12:55:31+01:00 auth_ephemeral: re-ordered code so access to sip msg is done after NULL check --- Modified: modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:e415c3a0: dialog: safety check of return pointer to dmq vars field
by Daniel-Constantin Mierla 03 Nov '16

03 Nov '16

Module: kamailio Branch: master Commit: e415c3a0493b15c19b8a7984ddaff0bfd170a5ed URL: https://github.com/kamailio/kamailio/commit/e415c3a0493b15c19b8a7984ddaff0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-03T11:17:38+01:00 dialog: safety check of return pointer to dmq vars field --- Modified: modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

[kamailio/kamailio] fix TLS client config selection based on dst ip and port (#842)
by sergey-vb 03 Nov '16

03 Nov '16

Hi All. After some try to configure kamailio 4.4.3 to act as SPI TLS client for Cisco SIP TLS gateways I have found one issue. If I do client configuration for tls [client:10.1.23.19:5061] verify_certificate = yes ca_list = /etc/kamailio/CAs/ca1.pem [client:10.1.23.29:5061] verify_certificate = yes ca_list = /etc/kamailio/CAs/ca2.pem [client:default] verify_certificate = no require_certificate = no Kamailo always do default profile selection (I do configuration without server_name or … [View More]server_id, with it kamailio works fine but there are some troubles to make selection of this parameters from config script, I need additional checks and queries) after some research in tls module source code I have added some debug information in file tls_server.c: ``` if (c->flags & F_CONN_PASSIVE) { state=S_TLS_ACCEPTING; dom = tls_lookup_cfg(cfg, TLS_DOMAIN_SRV, &c->rcv.dst_ip, c->rcv.dst_port, 0, 0); } else { state=S_TLS_CONNECTING; sname = tls_get_connect_server_name(); srvid = tls_get_connect_server_id(); // ------------------------------------------------------------- DBG("Entered client config loockup (c->rcv.dst_port %d)\n", c->rcv.dst_port); DBG("Entered client config loockup (&c->rcv.dst_ip %s)\n", ip_addr2a(&c->rcv.dst_ip)); DBG("Entered client config loockup (c->rcv.src_port %d)\n", c->rcv.src_port); DBG("Entered client config loockup (&c->rcv.src_ip %s)\n", ip_addr2a(&c->rcv.src_ip)); // ------------------------------------------------------------- dom = tls_lookup_cfg(cfg, TLS_DOMAIN_CLI, &c->rcv.dst_ip, c->rcv.dst_port, sname, srvid); } ``` After making a test call: Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: <core> [parser/msg_parser.c:597]: parse_msg(): method: <INVITE> Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: <core> [parser/msg_parser.c:599]: parse_msg(): uri: <sip:9098@10.1.23.19:5061;transport=TLS> Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: <core> [parser/msg_parser.c:601]: parse_msg(): version: <SIP/2.0> I see: Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: <core> [ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: 10.1.23.19 Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: <core> [tcp_main.c:985]: tcpconn_new(): on port 5061, type 3 Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: <core> [tcp_main.c:1295]: tcpconn_add(): hashes: 1394:0:0, 1 Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_server.c:197]: tls_complete_init(): completing tls connection initialization Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_server.c:160]: tls_get_connect_server_name(): xavp with outbound server name not found Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_server.c:140]: tls_get_connect_server_id(): xavp with outbound server id not found Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_server.c:219]: tls_complete_init(): Entered client config loockup (c->rcv.dst_port 40123) Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_server.c:220]: tls_complete_init(): Entered client config loockup (&c->rcv.dst_ip 10.1.23.23) Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_server.c:221]: tls_complete_init(): Entered client config loockup (c->rcv.src_port 5061) Oct 26 09:23:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_server.c:222]: tls_complete_init(): Entered client config loockup (&c->rcv.src_ip 10.1.23.19) Where: **&c->rcv.dst_ip 10.1.23.23** - it is my local kamailio tls socket ip address to make tls connect from **c->rcv.dst_port 40123** - it is my local kamailio tls socket port **&c->rcv.src_ip 10.1.23.19** - ip of my TLS device to make tls connection to **c->rcv.src_port 5061** - port of my TLS device to make tls connection to so if I change line ``` dom = tls_lookup_cfg(cfg, TLS_DOMAIN_CLI, &c->rcv.dst_ip, c->rcv.dst_port, sname, srvid); to ``` ``` dom = tls_lookup_cfg(cfg, TLS_DOMAIN_CLI, &c->rcv.src_ip, c->rcv.src_port, sname, srvid); ``` I got correct client domain selection from tls.cfg: Oct 26 09:33:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_server.c:233]: tls_complete_init(): Using initial TLS domain TLSc<10.1.23.19:5061> (dom 0x7fd2eefa3d68 ctx 0x7fd2ef7e70a8 sn []) Oct 26 09:33:56 sip1 /usr/sbin/kamailio[20712]: DEBUG: tls [tls_domain.c:703]: sr_ssl_ctx_info_callback(): SSL handshake started You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/842 -- Commit Summary -- * Merge pull request #3 from kamailio/master * modules/tls: fix TLS client config selection based on dst ip and port -- File Changes -- M modules/tls/tls_server.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/842.patch https://github.com/kamailio/kamailio/pull/842.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/842 [View Less]

2 9

← Newer
1
...
21
22
23
24
25
26
27
28
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016