sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
307 discussions

git:master:13bdd0e1: core: mem/shm - shared memory api updated to allow locking by manager
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 13bdd0e15883a07d396210b8a372c1b51786f2a9 URL: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:21:59+02:00 core: mem/shm - shared memory api updated to allow locking by manager - instead of generic global lock, allow memory manager to handle locking for shared memory --- Modified: src/core/mem/memapi.h Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… Patch: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… --- diff --git a/src/core/mem/memapi.h b/src/core/mem/memapi.h index 198bd4d25a..dc1cd80f03 100644 --- a/src/core/mem/memapi.h +++ b/src/core/mem/memapi.h @@ -46,6 +46,9 @@ typedef void* (*sr_resize_f)(void* mbp, void* p, size_t size); #endif /*DBG_SR_MEMORY*/ +typedef void (*sr_shm_glock_f)(void* mbp); +typedef void (*sr_shm_gunlock_f)(void* mbp); + typedef void (*sr_mem_status_f)(void* mbp); typedef void (*sr_mem_info_f)(void* mbp, struct mem_info* info); typedef unsigned long (*sr_mem_available_f)(void* mbp); @@ -128,6 +131,10 @@ typedef struct sr_shm_api { sr_mem_mod_get_stats_f xmodstats; /*memory stats free per module*/ sr_mem_mod_free_stats_f xfmodstats; + /*memory managing global lock*/ + sr_shm_glock_f xglock; + /*memory managing global unlock*/ + sr_shm_gunlock_f xgunlock; } sr_shm_api_t; #endif diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index f48cf3baad..3dbc34f11a 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -48,8 +48,6 @@ void shm_core_destroy(void); static int _shm_core_shmid[SHM_CORE_POOLS_SIZE] = { -1 }; /*shared memory id*/ #endif -gen_lock_t* _shm_lock=0; - static void* _shm_core_pools_mem[SHM_CORE_POOLS_SIZE] = { (void*)-1 }; static int _shm_core_pools_num = 1; @@ -168,41 +166,6 @@ void* shm_core_get_pool(void) } /** - * init the core lock - */ -int shm_core_lock_init(void) -{ - if (_shm_lock) { - LM_DBG("shared memory lock initialized\n"); - return 0; - } - _shm_lock=shm_malloc_unsafe(sizeof(gen_lock_t)); /* skip lock_alloc, - race cond*/ - if (_shm_lock==0){ - LOG(L_CRIT, "could not allocate lock\n"); - shm_core_destroy(); - return -1; - } - if (lock_init(_shm_lock)==0){ - LOG(L_CRIT, "could not initialize lock\n"); - shm_core_destroy(); - return -1; - } - return 0; -} - -/** - * - */ -void shm_core_lock_destroy(void) -{ - if (_shm_lock){ - DBG("destroying the shared memory lock\n"); - lock_destroy(_shm_lock); /* we don't need to dealloc it*/ - } -} - -/** * */ void shm_core_destroy(void) @@ -255,6 +218,8 @@ int shm_init_api(sr_shm_api_t *ap) _shm_root.xdestroy = ap->xdestroy; _shm_root.xmodstats = ap->xmodstats; _shm_root.xfmodstats = ap->xfmodstats; + _shm_root.xglock = ap->xglock; + _shm_root.xgunlock = ap->xgunlock; return 0; } @@ -291,11 +256,10 @@ int shm_init_manager(char *name) */ void shm_destroy_manager(void) { - shm_core_lock_destroy(); if(_shm_root.xdestroy) { - _shm_root.xdestroy(); LM_DBG("destroying memory manager: %s\n", (_shm_root.mname)?_shm_root.mname:"unknown"); + _shm_root.xdestroy(); } shm_core_destroy(); } diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 7af16be766..5d58071359 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -38,12 +38,6 @@ #include "../dprint.h" #include "../lock_ops.h" /* we don't include locking.h on purpose */ -extern gen_lock_t* _shm_lock; -#define shm_lock() lock_get(_shm_lock) -#define shm_unlock() lock_release(_shm_lock) -int shm_core_lock_init(void); -void shm_core_lock_destroy(void); - extern sr_shm_api_t _shm_root; #ifdef DBG_SR_MEMORY @@ -82,6 +76,9 @@ extern sr_shm_api_t _shm_root; # define shm_mod_get_stats(x) _shm_root.xmodstats(_shm_root.mem_block, x) # define shm_mod_free_stats(x) _shm_root.xfmodstats(x) +# define shm_global_lock() _shm_root.xglock(_shm_root.mem_block) +# define shm_global_unlock() _shm_root.xgunlock(_shm_root.mem_block) + void* shm_core_get_pool(void); int shm_init_api(sr_shm_api_t *ap);

1 0

git:master:cc9033be: tm: use standard shm malloc to store to-tag set
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: cc9033be4cbbd5330febecaec3c5718703c0267c URL: https://github.com/kamailio/kamailio/commit/cc9033be4cbbd5330febecaec3c5718… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:10:38+02:00 tm: use standard shm malloc to store to-tag set --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/cc9033be4cbbd5330febecaec3c5718… Patch: https://github.com/kamailio/kamailio/commit/cc9033be4cbbd5330febecaec3c5718… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 795da9cb14..c26b5eca32 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -306,10 +306,8 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok) } } /* that's a new to-tag -- record it */ - shm_lock(); - n=(struct totag_elem*) shm_malloc_unsafe(sizeof(struct totag_elem)); - s=(char *)shm_malloc_unsafe(tag->len); - shm_unlock(); + n=(struct totag_elem*) shm_malloc(sizeof(struct totag_elem)); + s=(char *)shm_malloc(tag->len); if (!s || !n) { LM_ERR("no more shm memory \n"); if (n) shm_free(n);

1 0

git:master:751c181f: core: new parameter - verbose_startup
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 751c181fe4477861e3aa300b78e115b8642d12f4 URL: https://github.com/kamailio/kamailio/commit/751c181fe4477861e3aa300b78e115b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T12:07:27+02:00 core: new parameter - verbose_startup - control if printing routing tree and udp probing buffer debug messages should be printed at startup - default 0 (don't print); set to 1 to get those debug messages --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/route.c Modified: src/core/udp_server.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/751c181fe4477861e3aa300b78e115b… Patch: https://github.com/kamailio/kamailio/commit/751c181fe4477861e3aa300b78e115b…

1 0

git:master:fe441c45: core: mem - fix printing shm memory manager name
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: fe441c4561a8be852c2baae6568e48ef8203210d URL: https://github.com/kamailio/kamailio/commit/fe441c4561a8be852c2baae6568e48e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T12:03:54+02:00 core: mem - fix printing shm memory manager name --- Modified: src/core/mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/fe441c4561a8be852c2baae6568e48e… Patch: https://github.com/kamailio/kamailio/commit/fe441c4561a8be852c2baae6568e48e… --- diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index 320f3366b0..f48cf3baad 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -306,5 +306,5 @@ void shm_destroy_manager(void) void shm_print_manager(void) { LM_DBG("shm - using memory manager: %s\n", - (_pkg_root.mname)?_pkg_root.mname:"unknown"); + (_shm_root.mname)?_shm_root.mname:"unknown"); }

1 0

git:master:401ec2f7: core: mem - initial framework to support many shm pools
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 401ec2f71fd237b3974114803cb61030172240ae URL: https://github.com/kamailio/kamailio/commit/401ec2f71fd237b3974114803cb6103… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T11:36:58+02:00 core: mem - initial framework to support many shm pools --- Modified: src/core/mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/401ec2f71fd237b3974114803cb6103… Patch: https://github.com/kamailio/kamailio/commit/401ec2f71fd237b3974114803cb6103…

1 0

git:master:eb277e85: core: mem - extend pkg/shm init function for latest api fields
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: eb277e854d94eaca3a29d0856e9c903d04df0fd5 URL: https://github.com/kamailio/kamailio/commit/eb277e854d94eaca3a29d0856e9c903… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T11:06:24+02:00 core: mem - extend pkg/shm init function for latest api fields --- Modified: src/core/mem/pkg.c Modified: src/core/mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/eb277e854d94eaca3a29d0856e9c903… Patch: https://github.com/kamailio/kamailio/commit/eb277e854d94eaca3a29d0856e9c903… --- diff --git a/src/core/mem/pkg.c b/src/core/mem/pkg.c index 53166ac932..f1e616eca6 100644 --- a/src/core/mem/pkg.c +++ b/src/core/mem/pkg.c @@ -39,8 +39,10 @@ int pkg_init_api(sr_pkg_api_t *ap) _pkg_root.mem_pool = ap->mem_pool; _pkg_root.mem_block = ap->mem_block; _pkg_root.xmalloc = ap->xmalloc; + _pkg_root.xmallocxz = ap->xmallocxz; _pkg_root.xfree = ap->xfree; _pkg_root.xrealloc = ap->xrealloc; + _pkg_root.xreallocxf = ap->xreallocxf; _pkg_root.xstatus = ap->xstatus; _pkg_root.xinfo = ap->xinfo; _pkg_root.xavailable = ap->xavailable; diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index e4f4ad6f17..8a2e93b92f 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -211,10 +211,12 @@ int shm_init_api(sr_shm_api_t *ap) _shm_root.mem_pool = ap->mem_pool; _shm_root.mem_block = ap->mem_block; _shm_root.xmalloc = ap->xmalloc; + _shm_root.xmallocxz = ap->xmallocxz; _shm_root.xmalloc_unsafe = ap->xmalloc_unsafe; _shm_root.xfree = ap->xfree; _shm_root.xfree_unsafe = ap->xfree_unsafe; _shm_root.xrealloc = ap->xrealloc; + _shm_root.xreallocxf = ap->xreallocxf; _shm_root.xresize = ap->xresize; _shm_root.xstatus = ap->xstatus; _shm_root.xinfo = ap->xinfo;

1 0

git:master:2415416d: sms: avoid overflowing ending 0 by sprintf()
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 2415416df6bd4c599c7fde57fbaa541e2e37f9c7 URL: https://github.com/kamailio/kamailio/commit/2415416df6bd4c599c7fde57fbaa541… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T10:21:08+02:00 sms: avoid overflowing ending 0 by sprintf() --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/2415416df6bd4c599c7fde57fbaa541… Patch: https://github.com/kamailio/kamailio/commit/2415416df6bd4c599c7fde57fbaa541… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index 62efe0bfb6..e8c7590456 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -275,6 +275,8 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) { char* start; char* end; + char tbuf[TIME_LEN+1]; + char dbuf[DATE_LEN+1]; /* the text is after the \r */ for( start=source ; *start && *start!='\r' ; start++ ); @@ -312,12 +314,14 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) } /* Get the date */ start=end+3; - sprintf(sms->date,"%c%c-%c%c-%c%c",start[3],start[4],start[0],start[1], + sprintf(dbuf,"%c%c-%c%c-%c%c",start[3],start[4],start[0],start[1], start[6],start[7]); + memcpy(sms->date, dbuf, DATE_LEN); /* Get the time */ start+=9; - sprintf(sms->time,"%c%c:%c%c:%c%c",start[0],start[1],start[3],start[4], + sprintf(tbuf,"%c%c:%c%c:%c%c",start[0],start[1],start[3],start[4], start[7],start[7]); + memcpy(sms->time, tbuf, TIME_LEN); sms->userdatalength=strlen(sms->ascii); return 1; } @@ -418,9 +422,13 @@ static int splitpdu(struct modem *mdm, char* pdu, struct incame_sms *sms) if (end!=0) { memcpy(sms->name,start,end-start); sms->name[end-start]=0; + } else { + /*Unsupported type*/ + return -1; } - } else + } else { end=pdu; + } /* the pdu is after the first \r */ for( start=end+1 ; *start && *start!='\r' ; start++ );

1 0

git:master:617e8c40: acc_diameter: few updates to make cleaner avp handling
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 617e8c40608c5e2ac97dd4b39d9ab739a779b9bb URL: https://github.com/kamailio/kamailio/commit/617e8c40608c5e2ac97dd4b39d9ab73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T09:46:29+02:00 acc_diameter: few updates to make cleaner avp handling --- Modified: src/modules/acc_diameter/diam_avp.c Modified: src/modules/acc_diameter/diam_message.c Modified: src/modules/acc_diameter/diam_tcp.c --- Diff: https://github.com/kamailio/kamailio/commit/617e8c40608c5e2ac97dd4b39d9ab73… Patch: https://github.com/kamailio/kamailio/commit/617e8c40608c5e2ac97dd4b39d9ab73… --- diff --git a/src/modules/acc_diameter/diam_avp.c b/src/modules/acc_diameter/diam_avp.c index f9d98dc61d..2ea5a577fa 100644 --- a/src/modules/acc_diameter/diam_avp.c +++ b/src/modules/acc_diameter/diam_avp.c @@ -107,7 +107,7 @@ AAA_AVP* AAACreateAVP( size_t length, AVPDataStatus data_status) { - AAA_AVP *avp; + AAA_AVP *avp = NULL; /* first check the params */ if( data==0 || length==0) { @@ -146,7 +146,8 @@ AAA_AVP* AAACreateAVP( return avp; error: - LM_ERR("no more free memoryfor a new AVP!\n"); + LM_ERR("no more free memory for a new AVP!\n"); + if(avp) ad_free(avp); return 0; } diff --git a/src/modules/acc_diameter/diam_message.c b/src/modules/acc_diameter/diam_message.c index 07b441d969..614318b26d 100644 --- a/src/modules/acc_diameter/diam_message.c +++ b/src/modules/acc_diameter/diam_message.c @@ -293,11 +293,15 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, /* create the AVP */ avp = AAACreateAVP( avp_code, avp_flags, avp_vendorID, (char*)ptr, avp_data_len, AVP_DONT_FREE_DATA); - if (!avp) + if (!avp) { + LM_ERR("failed to create aaa avp\n"); goto error; + } /* link the avp into aaa message to the end */ - AAAAddAVPToMessage( msg, avp, msg->avpList.tail); + if(AAAAddAVPToMessage( msg, avp, msg->avpList.tail)!= AAA_ERR_SUCCESS) { + LM_ERR("failed to add aaa avp to message\n"); + goto error; } ptr += to_32x_len( avp_data_len ); } diff --git a/src/modules/acc_diameter/diam_tcp.c b/src/modules/acc_diameter/diam_tcp.c index 724383d682..77525479c5 100644 --- a/src/modules/acc_diameter/diam_tcp.c +++ b/src/modules/acc_diameter/diam_tcp.c @@ -48,13 +48,13 @@ /*! \brief TCP connection setup */ int init_mytcp(char* host, int port) { - int sockfd; + int sfd; struct sockaddr_in serv_addr; struct hostent *server; - sockfd = socket(PF_INET, SOCK_STREAM, 0); + sfd = socket(PF_INET, SOCK_STREAM, 0); - if (sockfd < 0) + if (sfd < 0) { LM_ERR("failed to create the socket\n"); return -1; @@ -64,6 +64,7 @@ int init_mytcp(char* host, int port) if (server == NULL) { LM_ERR("failed to find the host\n"); + close(sfd); return -1; } @@ -73,18 +74,19 @@ int init_mytcp(char* host, int port) server->h_length); serv_addr.sin_port = htons(port); - if (connect(sockfd, (const struct sockaddr *)&serv_addr, + if (connect(sfd, (const struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) { LM_ERR("failed to connec to the DIAMETER client\n"); + close(sfd); return -1; } - return sockfd; + return sfd; } /*! \brief send a message over an already opened TCP connection */ -int tcp_send_recv(int sockfd, char* buf, int len, rd_buf_t* rb, +int tcp_send_recv(int sfd, char* buf, int len, rd_buf_t* rb, unsigned int waited_id) { int n, number_of_tries; @@ -97,7 +99,7 @@ int tcp_send_recv(int sockfd, char* buf, int len, rd_buf_t* rb, unsigned int m_id; /* try to write the message to the Diameter client */ - while( (n=write(sockfd, buf, len))==-1 ) + while( (n=write(sfd, buf, len))==-1 ) { if (errno==EINTR) continue; @@ -116,26 +118,26 @@ int tcp_send_recv(int sockfd, char* buf, int len, rd_buf_t* rb, /* Initialize the set of active sockets. */ FD_ZERO (&active_fd_set); - FD_SET (sockfd, &active_fd_set); + FD_SET (sfd, &active_fd_set); number_of_tries = 0; while(number_of_tries<MAX_TRIES) { read_fd_set = active_fd_set; - if (select (sockfd+1, &read_fd_set, NULL, NULL, &tv) < 0) + if (select (sfd+1, &read_fd_set, NULL, NULL, &tv) < 0) { LM_ERR("select function failed\n"); return AAA_ERROR; } - /* if (!FD_ISSET (sockfd, &read_fd_set)) + /* if (!FD_ISSET (sfd, &read_fd_set)) { LM_ERR("no response received\n"); // return AAA_ERROR; } */ /* Data arriving on a already-connected socket. */ reset_read_buffer(rb); - switch( do_read(sockfd, rb) ) + switch( do_read(sfd, rb) ) { case CONN_ERROR: LM_ERR("failed to read from socket\n");

1 0

git:master:26c94b32: topos: per contact and rr specific processing for receiving PRACK
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 26c94b32baec05a064beca7064e2f44eff9ca3ef URL: https://github.com/kamailio/kamailio/commit/26c94b32baec05a064beca7064e2f44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T09:14:27+02:00 topos: per contact and rr specific processing for receiving PRACK - records are taken from INVITE branch record --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/26c94b32baec05a064beca7064e2f44… Patch: https://github.com/kamailio/kamailio/commit/26c94b32baec05a064beca7064e2f44… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index ca360a975c..228996960e 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -774,20 +774,24 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { goto error; } + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { + goto error; + } } - /* detect direction - via from-tag */ - if(tps_dlg_detect_direction(msg, &stsd, &direction)<0) { - goto error; - } mtsd.direction = direction; tps_storage_lock_release(&lkey); - if(direction == TPS_DIR_UPSTREAM) { - nuri = stsd.a_contact; - } else { + if(use_branch) { nuri = stsd.b_contact; + } else { + if(direction == TPS_DIR_UPSTREAM) { + nuri = stsd.a_contact; + } else { + nuri = stsd.b_contact; + } } if(nuri.len>0) { if(rewrite_uri(msg, &nuri)<0) { @@ -796,31 +800,28 @@ int tps_request_received(sip_msg_t *msg, int dialog) } } - if(tps_reappend_route(msg, &stsd, &stsd.s_rr, - (direction==TPS_DIR_UPSTREAM)?0:1)<0) { - LM_ERR("failed to reappend s-route\n"); - return -1; - } - if(direction == TPS_DIR_UPSTREAM) { - if(use_branch) { - if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0)<0) { - LM_ERR("failed to reappend x-route\n"); - return -1; - } - } else { - if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { - LM_ERR("failed to reappend a-route\n"); - return -1; - } + if(use_branch) { + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { + LM_ERR("failed to reappend s-route\n"); + return -1; + } + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { + LM_ERR("failed to reappend b-route\n"); + return -1; } } else { - if(use_branch) { - if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1)<0) { - LM_ERR("failed to reappend b-route\n"); + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, + (direction == TPS_DIR_UPSTREAM) ? 0 : 1) < 0) { + LM_ERR("failed to reappend s-route\n"); + return -1; + } + if(direction == TPS_DIR_UPSTREAM) { + if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0) < 0) { + LM_ERR("failed to reappend a-route\n"); return -1; } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1) < 0) { LM_ERR("failed to reappend b-route\n"); return -1; }

1 0

[kamailio/kamailio] Kamailio 5.0.2 suddenly stops processing traffic, then generates a core when restarting. (#1172)
by Joel Serrano 10 Aug '17

10 Aug '17

### Description Kamailio suddenly stops working (this is a production server so debug logging is disabled), when we restart it a core is generated and a segfault is logged. ### Troubleshooting The only thing I have seen is some reference to IPv6 in the backtrace. But no idea where to start looking. I'm pretty sure we will need more information, but I don't know how to read or understand backtraces, please let me know what you see in it so I can dig deeper into this problem. #### Reproduction I don't know how to reproduce yet, first I have to understand the cause. #### Debugging Data Backtrace: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #1 0x00007efcf3b5e234 in OPENSSL_cleanup () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #2 0x00007efcf7721910 in __run_exit_handlers (status=0, listp=0x7efcf7a855d8 <__exit_funcs>, run_list_atexit=run_list_atexit@entry=true, run_dtors=run_dtors@entry=true) at exit.c:83 atfct = <optimized out> onfct = <optimized out> cxafct = <optimized out> f = <optimized out> #3 0x00007efcf772196a in __GI_exit (status=<optimized out>) at exit.c:105 No locals. #4 0x000055f0a9483d54 in handle_sigs () at main.c:699 chld = 845005216 chld_status = 845005248 any_chld_stopped = 32766 memlog = 0 __func__ = "handle_sigs" #5 0x000055f0a948ea43 in main_loop () at main.c:1758 i = 8 pid = 12091 si = 0x0 si_desc = "udp receiver child=7 sock=[2602:FF37:0:1:0:0:C601:377A]:5060\000\367v\215\200\262+\363\372~\000\000\025\067\236\003\000\000\000\000\300\017H\251\360U\000\000\340\305]2\376\177", '\000' <repeats 18 times>, "\020\303]2\376\177\000\000a\202g\251\360U\000" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #6 0x000055f0a9494fb9 in main (argc=13, argv=0x7ffe325dc5e8) at main.c:2646 cfg_stream = 0x55f0aa7fb010 c = -1 r = 0 tmp = 0x7ffe325dceb6 "" tmp_len = -133383536 port = 32508 proto = 845006016 options = 0x55f0a97d80e8 ":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 = 3679304743 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0xffffffff <error: Cannot access memory at address 0xffffffff> st = {st_dev = 19, st_ino = 14769, st_nlink = 2, st_mode = 16832, st_uid = 109, st_gid = 113, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1498523393, tv_nsec = 731915583}, st_mtim = {tv_sec = 1498533865, tv_nsec = 274210743}, st_ctim = {tv_sec = 1498533865, tv_nsec = 274210743}, __glibc_reserved = {0, 0, 0}} __func__ = "main" ``` Info locals: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. ``` List: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ``` #### Log Messages We have regular logging with no issues, then suddenly we get: ``` Jun 28 01:57:51 kam-1 sbc[12075]: WARNING: <script>: [DISPATCHER] - Destination down: OPTIONS sip:A.A.A.A:5060 (<null>) Jun 28 01:57:51 kam-1 sbc[12075]: WARNING: <script>: [DISPATCHER] - Destination down: OPTIONS sip:B.B.B.B:5060 (<null>) Jun 28 01:58:40 kam-1 sbc[12076]: NOTICE: <script>: Node unavailable, trying next sip:A.A.A.A:5060 - M=INVITE R=sip:+12345678900@A.A.A.A:5060 ID=334f3vqDtj Jun 28 01:58:40 kam-1 sbc[12076]: NOTICE: <script>: Forwarding request - M=INVITE R=sip:+12345678900@A.A.A.A:5060 ID=334f3vqDtj Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID '00g4gNy5KZ' and tags 'FHmrD-CM3' 'SZ3a5Sg58c5pB' Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID 'Kj7uLRzJfd' and tags 'wRSVjfGaT' 'yQHvjNaZ5Z3rc' Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID 'S5QUIXtS6-' and tags 'FV4ySEouz' 'eS7F910ycNg8H' Jun 28 01:59:10 kam-1 sbc[12075]: ERROR: <script>: No available gateways - M=INVITE R=sip:+12345678900@B.B.B.B:5060 ID=334f3vqDtj Jun 28 02:01:45 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf3904008 ref 1) Jun 28 02:03:15 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf40f0f50 ref 1) Jun 28 02:04:45 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf4d92108 ref 1) Jun 28 02:55:59 kam-1 sbc[12071]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 28 02:55:59 kam-1 sbc[12052]: NOTICE: <core> [main.c:696]: handle_sigs(): Thank you for flying kamailio!!! ``` NOTE: The process stops logging at 02:04:45, then at 02:55:59 we manually restart kamailio and a core is generated. Also, in `dmesg` we have: ``` [138953.744199] kamailio[12052]: segfault at 7efaf32f51b8 ip 00007efcf3b5df69 sp 00007ffe325dc0c0 error 4 in libcrypto.so.1.1[7efcf39f6000+265000] ``` #### SIP Traffic I don't have sip traffic, If required I can start capturing it. ### Additional Information ``` # kamailio -v version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, 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_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 # ``` ``` # dpkg -l | grep kamailio ii kamailio 5.0.2+stretch amd64 very fast, dynamic and configurable SIP server ii kamailio-dbg:amd64 5.0.2+stretch amd64 very fast and configurable SIP server [debug symbols] ii kamailio-extra-modules:amd64 5.0.2+stretch amd64 Extra modules for the Kamailio SIP Server ii kamailio-tls-modules:amd64 5.0.2+stretch amd64 TLS support for the Kamailio SIP server (authentication, transport) # ``` ``` # dpkg -l |grep libssl ii libssl1.0.2:amd64 1.0.2l-2 amd64 Secure Sockets Layer toolkit - shared libraries ii libssl1.1:amd64 1.1.0f-3 amd64 Secure Sockets Layer toolkit - shared libraries# ``` * **Operating System**: ``` # uname -a Linux kam-1 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u1 (2017-06-18) x86_64 GNU/Linux ``` ``` # lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 9.0 (stretch) Release: 9.0 Codename: stretch # ``` -- 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/1172

2 25

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017