- sr-dev - kamailio.org

git:master:9df27ff7: tm: updated for the new shm global locking functions
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 9df27ff7afbf1cf8ee7b3afd1741355e9f6f866e URL: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:38:39+02:00 tm: updated for the new shm global locking functions --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… Patch: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 2e8e8e7717..19b5daec0b 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -147,7 +147,7 @@ void free_cell_helper( if(unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0); - shm_lock(); + shm_global_lock(); /* UA Server */ if(dead_cell->uas.request) sip_msg_free_unsafe(dead_cell->uas.request); @@ -167,9 +167,9 @@ void free_cell_helper( * otherwise the release function must to be aware of * the lock state (Miklos) */ - shm_unlock(); + shm_global_unlock(); cbs_tmp->release(cbs_tmp->param); - shm_lock(); + shm_global_lock(); } shm_free_unsafe(cbs_tmp); } @@ -250,7 +250,7 @@ void free_cell_helper( /* the cell's body */ shm_free_unsafe(dead_cell); - shm_unlock(); + shm_global_unlock(); t_stats_freed(); }

1 0

git:master:1ec69642: core: main.c - updates for shm unlock in shutdown cleanup
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 1ec6964249dc5db4bd69c612b626466cae896c41 URL: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:37:33+02:00 core: main.c - updates for shm unlock in shutdown cleanup - test if shm was initialized before global unlock --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… Patch: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… --- diff --git a/src/main.c b/src/main.c index a98a35693f..b65b0020ca 100644 --- a/src/main.c +++ b/src/main.c @@ -518,10 +518,11 @@ void cleanup(int show_status) /*clean-up*/ #ifndef SHM_SAFE_MALLOC - if (_shm_lock) - shm_unlock(); /* hack: force-unlock the shared memory lock in case - some process crashed and let it locked; this will - allow an almost gracious shutdown */ + if(shm_initialized()) { + /* force-unlock the shared memory lock in case some process crashed + * and let it locked; this will allow an almost gracious shutdown */ + shm_global_unlock(); + } #endif destroy_rpcs(); destroy_modules();

1 0

git:master:13a1e6c2: core: mem/tlsf_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 13a1e6c23576ab3797af6fefde6fcbbd2d0b83e3 URL: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:31:40+02:00 core: mem/tlsf_malloc - shared memory locking implemented internally --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb… Patch: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb…

1 0

git:master:bccdcf3c: core: mem/q_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: bccdcf3c456ef450399be337131fcf33e97eb57a URL: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:26:25+02:00 core: mem/q_malloc - shared memory locking implemented internally --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3… Patch: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3…

1 0

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:fcff3426: core: mem/f_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: fcff3426798a925dffd32b75569b9d86e0f131c3 URL: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:24:29+02:00 core: mem/f_malloc - shared memory locking implemented internally --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8… Patch: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8…

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: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: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: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

git:master:a3e80032: core: store advertise addr for new sockets created from interface name
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: a3e8003274ded1420d2af677246a48ef5c743a3c URL: https://github.com/kamailio/kamailio/commit/a3e8003274ded1420d2af677246a48e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T14:05:13+02:00 core: store advertise addr for new sockets created from interface name - reported by GH #1209 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/a3e8003274ded1420d2af677246a48e… Patch: https://github.com/kamailio/kamailio/commit/a3e8003274ded1420d2af677246a48e… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index ee33d915f4..a50cfe3e59 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1353,13 +1353,15 @@ static int fix_hostname(str* name, struct ip_addr* address, str* address_str, * return 0 on succes, -1 on error */ static int addr_info_to_si_lst(struct addr_info* ai_lst, unsigned short port, - char proto, enum si_flags flags, + char proto, char *usename, + unsigned short useport, + enum si_flags flags, struct socket_info** list) { struct addr_info* ail; for (ail=ai_lst; ail; ail=ail->next){ - if(new_sock2list(ail->name.s, 0, port, proto, 0, 0, + if(new_sock2list(ail->name.s, 0, port, proto, usename, useport, ail->flags | flags, list)==0) return -1; } @@ -1374,7 +1376,10 @@ static int addr_info_to_si_lst(struct addr_info* ai_lst, unsigned short port, */ static int addr_info_to_si_lst_after(struct addr_info* ai_lst, unsigned short port, - char proto, enum si_flags flags, + char proto, + char *usename, + unsigned short useport, + enum si_flags flags, struct socket_info* el) { struct addr_info* ail; @@ -1382,7 +1387,7 @@ static int addr_info_to_si_lst_after(struct addr_info* ai_lst, for (ail=ai_lst; ail; ail=ail->next){ if((new_si=new_sock2list_after(ail->name.s, 0, port, proto, - 0, 0, ail->flags | flags, el))==0) + usename, useport, ail->flags | flags, el))==0) return -1; el=new_si; } @@ -1447,7 +1452,8 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) }else{ /* add all addr. as separate interfaces */ if (addr_info_to_si_lst_after(ai_lst, si->port_no, si->proto, - si->flags, si)!=0) + si->useinfo.name.s, si->useinfo.port_no, + si->flags, si)!=0) goto error; /* ai_lst not needed anymore */ free_addr_info_lst(&ai_lst); @@ -1758,7 +1764,7 @@ int fix_all_socket_lists() #else && ( !auto_bind_ipv6 || add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst) ==0 ) /* add_interface does not work for IPv6 on Linux */ #endif /* __OS_linux */ - ) && (addr_info_to_si_lst(ai_lst, 0, PROTO_UDP, 0, &udp_listen)==0)){ + ) && (addr_info_to_si_lst(ai_lst, 0, PROTO_UDP, 0, 0, 0, &udp_listen)==0)){ free_addr_info_lst(&ai_lst); ai_lst=0; /* if ok, try to add the others too */ @@ -1770,7 +1776,7 @@ int fix_all_socket_lists() #else || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_TCP, &ai_lst) !=0 ) #endif /* __OS_linux */ - ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TCP, 0, + ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TCP, 0, 0, 0, &tcp_listen)!=0)) goto error; free_addr_info_lst(&ai_lst); @@ -1784,7 +1790,7 @@ int fix_all_socket_lists() #else || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_TLS, &ai_lst)!=0) #endif /* __OS_linux */ - ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TLS, 0, + ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TLS, 0, 0, 0, &tls_listen)!=0)) goto error; } @@ -1801,7 +1807,7 @@ int fix_all_socket_lists() #else || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) #endif /* __OS_linux */ - ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_SCTP, 0, + ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_SCTP, 0, 0, 0, &sctp_listen)!=0)) goto error; free_addr_info_lst(&ai_lst);

1 0

git:master:10be0865: modules: readme files regenerated - carrierroute ... [skip ci]
by Kamailio Dev 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 10be086500d37d19674235b04cb302a0f34983fc URL: https://github.com/kamailio/kamailio/commit/10be086500d37d19674235b04cb302a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-10T13:01:57+02:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/10be086500d37d19674235b04cb302a… Patch: https://github.com/kamailio/kamailio/commit/10be086500d37d19674235b04cb302a… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index b766dac0fb..633c63e0d6 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -578,8 +578,8 @@ descavp) contiguous range starting at 1, limited by the configuration parameter max_targets. Possible values for hash_source are: call_id, from_uri, from_user, to_uri, to_user and rand - * decsavp - Name of the AVP where to store the description. This - parameter is optional. + * decsavp - AVP where to store the description. This parameter is + optional. 4.3. cr_nofallback_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp)

1 0

git:master:bc3666ba: Merge pull request #1211 from dunst0/fix/carrierroute-README
by GitHub 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: bc3666ba9ff46fbaafa97483d5c9ee2f574a2d2c URL: https://github.com/kamailio/kamailio/commit/bc3666ba9ff46fbaafa97483d5c9ee2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-10T13:00:57+02:00 Merge pull request #1211 from dunst0/fix/carrierroute-README carrierroute: update to readme to precise that decsavp need to be an avp --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bc3666ba9ff46fbaafa97483d5c9ee2… Patch: https://github.com/kamailio/kamailio/commit/bc3666ba9ff46fbaafa97483d5c9ee2… --- diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index 7d11d5365b..ecebcee57a 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -514,7 +514,7 @@ cr_tree_rewrite_uri(tree, domain) </para> </listitem> <listitem> - <para><emphasis>decsavp</emphasis> - Name of the AVP where to store the description. + <para><emphasis>decsavp</emphasis> - AVP where to store the description. This parameter is optional. </para> </listitem>

1 0

git:master:5328dc6d: carrierroute: update to readme to precise that decsavp need to be an avp
by Rick Barenthin 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 5328dc6d511a57ef47600f2724813124e082e53e URL: https://github.com/kamailio/kamailio/commit/5328dc6d511a57ef47600f272481312… Author: Rick Barenthin <dunst0(a)gmail.com> Committer: Rick Barenthin <dunst0(a)gmail.com> Date: 2017-08-10T11:31:30+02:00 carrierroute: update to readme to precise that decsavp need to be an avp --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5328dc6d511a57ef47600f272481312… Patch: https://github.com/kamailio/kamailio/commit/5328dc6d511a57ef47600f272481312… --- diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index 7d11d5365b..ecebcee57a 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -514,7 +514,7 @@ cr_tree_rewrite_uri(tree, domain) </para> </listitem> <listitem> - <para><emphasis>decsavp</emphasis> - Name of the AVP where to store the description. + <para><emphasis>decsavp</emphasis> - AVP where to store the description. This parameter is optional. </para> </listitem>

1 0

[kamailio/kamailio] carrierroute: update to readme to precise that decsavp need to be an avp (#1211)
by Rick 10 Aug '17

10 Aug '17

#### 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 - [x] Related to issue #1210 (replace XXXX with an open issue number) #### Description  Make documentation of parameters description more clear that it has to be an avp not just the name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1211 -- Commit Summary -- * carrierroute: update to readme to precise that decsavp need to be an avp -- File Changes -- M src/modules/carrierroute/doc/carrierroute_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1211.patch https://github.com/kamailio/kamailio/pull/1211.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/1211

2 1

git:master:4e8eeaf9: Makefile.defs: version set to 5.1.0-dev6
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 4e8eeaf99dd024182d860f59207ae47c609093ca URL: https://github.com/kamailio/kamailio/commit/4e8eeaf99dd024182d860f59207ae47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:55:11+02:00 Makefile.defs: version set to 5.1.0-dev6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/4e8eeaf99dd024182d860f59207ae47… Patch: https://github.com/kamailio/kamailio/commit/4e8eeaf99dd024182d860f59207ae47… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ac7aafcc38..5ffbc5dba7 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git: new commits in branch master
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

- URL: https://github.com/kamailio/kamailio/commit/e02990b561e306507a56b1557b44b6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T11:48:50+02:00 xmlrpc: use reallocxf() to free old pointer in case of failure - URL: https://github.com/kamailio/kamailio/commit/444894cb9a26ba2a33c5a49e6507ac9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T11:49:37+02:00 core: mem - avoid free(0) when realloc(0, size) fails - URL: https://github.com/kamailio/kamailio/commit/027728ef16dd57383fe9ed62dff6143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T11:50:29+02:00 lib/ims: use reallocxf() to cope properly with realloc failure - URL: https://github.com/kamailio/kamailio/commit/27b6801ba4f6bffa80c52ad6edf1c8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:12:31+02:00 app_java: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/76ef8d98051971c4c46afe598afd920… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:13:18+02:00 app_lua: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/810f4196ab4ad0f0c72cbd31d8b54a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:13:36+02:00 app_python: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/1486a47f018eb322957cc9e481e8765… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:13:57+02:00 cnxcc: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/21e9d2c77264ebae6f7349fe97ef21e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:14:18+02:00 clt: proper handling of ctl_realloc() failure - URL: https://github.com/kamailio/kamailio/commit/20012fa12f9db6b4c51bdc4f3e69692… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:15:09+02:00 db_sqlite: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/46d1799fa37f12bd453c110b5e2c480… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:15:23+02:00 db_text: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/4a58b48876b829756c2bb6e483feb55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:15:36+02:00 rtpengine: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/8ffd7473d46e5229cde1ab7623c3fa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:15:47+02:00 rtpproxy: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/6f6bff7aae8192d1715c501708d7672… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:35:43+02:00 http_async_client: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/9b2229471a4e7b01b88a31ef9869c1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:36:22+02:00 rls: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/c50e80d19dc9f6099e03db973be7e66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:36:38+02:00 uid_auth_db: use reallocxf() to handle realloc failure - URL: https://github.com/kamailio/kamailio/commit/e0ff472acfbae9ad1077a3dc6f2309e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T12:52:58+02:00 pua_dialoginfo: goto error in case of failures inside build_dialoginfo()

1 0

[kamailio/kamailio] carrierroute: segfault while fixup cr_route params (#1210)
by Rick 10 Aug '17

10 Aug '17

### Description  I tried to configure the carrierroute module with the description loaded from the database into an avp. But it crashes with a segfault while startup. ### Troubleshooting #### Reproduction  ``` /* ----- carrierroute params ----------------------------------------------- */ modparam("carrierroute", "config_source", "db") modparam("carrierroute", "db_url", ....) modparam("carrierroute", "fetch_rows", 2000) modparam("carrierroute", "db_load_description", 1) modparam("carrierroute", "match_mode", 10) modparam("carrierroute", "avoid_failed_destinations", 1) ``` ``` if (cr_route("default", "default", "$(rU{s.strip,1})", "$rU", "call_id", "destination")) { .... } ``` #### Debugging Data  ``` #0 avp_name_fixup (param=0x8018d1330) at cr_fixup.c:187 187 if (((gparam_p)(*param))->v.pve->spec->type == PVT_AVP && [New Thread 80165a600 (LWP 100186/<unknown>)] (gdb) bt full #0 avp_name_fixup (param=0x8018d1330) at cr_fixup.c:187 No locals. #1 0x00000008072f0256 in cr_route_fixup (param=0x8018d1330, param_no=6) at cr_fixup.c:242 my_hash_source = shs_call_id #2 0x000000000073238e in fix_actions (a=0x8018d1258) at core/route.c:919 t = (struct action *) 0x8018d1258 p = (struct proxy_l *) 0xffffffff00000048 tmp = 0x0 tmp_p = (void *) 0x8018d1660 ret = 0 i = 5 cmd = (sr31_cmd_export_t *) 0x80186dcd0 s = {s = 0xffffffff00000000 <Address 0xffffffff00000000 out of bounds>, len = 0} he = (struct hostent *) 0x4 ip = {af = 4859304, len = 0, u = {addrl = 0x7fffffff9be0, addr32 = 0x7fffffff9be0, addr16 = 0x7fffffff9be0, addr = 0x7fffffff9be0 "?"}} si = (struct socket_info *) 0x7fffffff9c10 lval = (struct lvalue *) 0xffffffff00000001 rve = (struct rval_expr *) 0x0 err_rve = (struct rval_expr *) 0x1 rve_type = RV_NONE err_type = 48625432 expected_type = RV_NONE rv = (struct rvalue *) 0x9b6cf7 rve_param_no = 0 #3 0x000000000068a1c4 in fix_rval (rv=0x8018d36c8, rve=0x8018d36c0) at core/rvalue.c:2873 No locals. #4 0x000000000068843e in fix_rval_expr (p=0x8018d36c0) at core/rvalue.c:3797 rve = (struct rval_expr *) 0x8018d36c0 ret = 32767 #5 0x000000000072aa08 in fix_actions (a=0x8018c94d0) at core/route.c:706 t = (struct action *) 0x8018d1d18 p = (struct proxy_l *) 0x68341cdd25 tmp = 0x3 <Address 0x3 out of bounds> tmp_p = (void *) 0x8018cc9c0 ret = 0 i = 1 cmd = (sr31_cmd_export_t *) 0x801869de0 s = {s = 0x8018cc9c0 "", len = 5} he = (struct hostent *) 0x9b6cf7 ip = {af = 6302080, len = 0, u = {addrl = 0x7fffffffcfc0, addr32 = 0x7fffffffcfc0, addr16 = 0x7fffffffcfc0, addr = 0x7fffffffcfc0 ""}} si = (struct socket_info *) 0x7fffffffd0a0 lval = (struct lvalue *) 0x800f42023 rve = (struct rval_expr *) 0x8018d36c0 err_rve = (struct rval_expr *) 0x0 rve_type = RV_INT err_type = 9938251 expected_type = 32767 rv = (struct rvalue *) 0x8018ccf20 rve_param_no = 0 #6 0x000000000073fd6d in fix_rl (rt=0xce3830) at core/route.c:2088 i = 0 ret = -12096 #7 0x000000000073fc37 in fix_rls () at core/route.c:2104 ret = 4 #8 0x000000000043b0ae in main (argc=4, argv=0x7fffffffeb30) at main.c:2635 cfg_stream = (FILE *) 0x8011fdc90 c = -1 r = 1 tmp = 0x800f84aa2 "H\213\vH;M?u\aH\203?([]??\225!??f\017\037\204" tmp_len = 32767 port = -5424 proto = 0 options = 0x979297 ":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 = 2763663412 rfd = 4 debug_save = 3 debug_flag = 1 dont_fork_cnt = 1 n_lst = (struct name_lst *) 0x7fffffffeaa0 p = 0x4 <Address 0x4 out of bounds> st = {st_dev = 93, st_ino = 160517, st_mode = 16832, st_nlink = 2, st_uid = 986, st_gid = 986, st_rdev = 332063, st_atim = {tv_sec = 1459764184, tv_nsec = 513386000}, st_mtim = {tv_sec = 1502352532, tv_nsec = 990638000}, st_ctim = {tv_sec = 1502352532, tv_nsec = 990638000}, st_size = 512, st_blocks = 8, st_blksize = 32768, st_flags = 0, st_gen = 3958570559, st_lspare = 0, st_birthtim = {tv_sec = 1459764184, tv_nsec = 513356000}} Current language: auto; currently minimal ``` #### Log Messages  ``` 0(45720) DEBUG: <core> [core/route.c:872]: fix_actions(): fixing cr_route() 0(45720) DEBUG: <core> [core/pvapi.c:419]: pv_spec_lookup(): PV <$(rU{s.strip,1})> is not in cache 0(45720) DEBUG: <core> [core/pvapi.c:293]: pv_cache_add(): pvar [$(rU{s.strip,1})] added in cache 0(45720) DEBUG: <core> [core/pvapi.c:321]: pv_cache_lookup(): pvar [$rU] found in cache Segmentation fault (core dumped) ``` #### SIP Traffic  ``` none ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.1.0-dev5 (x86_64/freebsd) 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, 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, select, kqueue. id: unknown compiled on 16:54:24 Aug 9 2017 with clang 3.8 ``` * **Operating System**:  ``` # uname -a FreeBSD hostname.com 11.0-RELEASE-p9 FreeBSD 11.0-RELEASE-p9 #0: Tue Apr 11 08:48:40 UTC 2017 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 ``` -- 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/1210

3 4

git:master:49217fb1: carrierroute: safety checks inside avp_name_fixup
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 49217fb14e7cc5794c8a0a2774c33337c33438ab URL: https://github.com/kamailio/kamailio/commit/49217fb14e7cc5794c8a0a2774c3333… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T11:19:19+02:00 carrierroute: safety checks inside avp_name_fixup - reported by GH #1210 --- Modified: src/modules/carrierroute/cr_fixup.c --- Diff: https://github.com/kamailio/kamailio/commit/49217fb14e7cc5794c8a0a2774c3333… Patch: https://github.com/kamailio/kamailio/commit/49217fb14e7cc5794c8a0a2774c3333… --- diff --git a/src/modules/carrierroute/cr_fixup.c b/src/modules/carrierroute/cr_fixup.c index ac363e9e9e..92c751047c 100644 --- a/src/modules/carrierroute/cr_fixup.c +++ b/src/modules/carrierroute/cr_fixup.c @@ -184,6 +184,11 @@ static int avp_name_fixup(void ** param) { LM_ERR("could not fixup parameter"); return -1; } + if(*param==NULL || ((gparam_p)(*param))->v.pve==NULL + || ((gparam_p)(*param))->v.pve->spec==NULL) { + LM_ERR("invalid AVP type definition\n"); + return -1; + } if (((gparam_p)(*param))->v.pve->spec->type == PVT_AVP && ((gparam_p)(*param))->v.pve->spec->pvp.pvn.u.isname.name.s.len == 0 && ((gparam_p)(*param))->v.pve->spec->pvp.pvn.u.isname.name.s.s == 0) {

1 0

git:master:2a80448b: xprint: use pkg_reallocxf() to ensure old pointer is freed in case of failure
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 2a80448b07b39dece0770bd04014a12e2d0390d8 URL: https://github.com/kamailio/kamailio/commit/2a80448b07b39dece0770bd04014a12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T10:55:07+02:00 xprint: use pkg_reallocxf() to ensure old pointer is freed in case of failure - fix also potential free of null --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/2a80448b07b39dece0770bd04014a12… Patch: https://github.com/kamailio/kamailio/commit/2a80448b07b39dece0770bd04014a12… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index d68bd64c05..068608a304 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1862,9 +1862,8 @@ int xl_mod_init() str_domainname.s = NULL; } else { str_fullname.len = strlen(s); - s = pkg_realloc(s, str_fullname.len+1); /* this will leave the ending \0 */ + s = pkg_reallocxf(s, str_fullname.len+1); /* this will leave the ending \0 */ if (!s) { /* should never happen because decreasing size */ - pkg_free(s); return -1; } str_fullname.s = s;

1 0

git:master:7bf71edc: tm: relocated the crit log when branch was not set for reply transaction
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 7bf71edc62b26a4812b19f13f5c01f980c8e55b3 URL: https://github.com/kamailio/kamailio/commit/7bf71edc62b26a4812b19f13f5c01f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T10:39:36+02:00 tm: relocated the crit log when branch was not set for reply transaction - added after the safety check on not accessing invalid branch indexed structure --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/7bf71edc62b26a4812b19f13f5c01f9… Patch: https://github.com/kamailio/kamailio/commit/7bf71edc62b26a4812b19f13f5c01f9… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 14939ec29b..795da9cb14 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2180,14 +2180,18 @@ int reply_received( struct sip_msg *p_msg ) branch = T_BR_UNDEFINED; if (t_check(p_msg , &branch)==-1) goto trans_not_found; - if (unlikely(branch==T_BR_UNDEFINED)) { - LM_CRIT("BUG: invalid branch - report to developers\n"); - goto trans_not_found; - } /*... if there is none, tell the core router to fwd statelessly */ t=get_t(); - if ( (t==0)||(t==T_UNDEFINED)) + if ( (t==0)||(t==T_UNDEFINED)) { + LM_DBG("transaction not found - (branch %d)\n", branch); goto trans_not_found; + } + if (unlikely(branch==T_BR_UNDEFINED)) { + LM_CRIT("BUG: transaction found, but no branch matched\n"); + /* t_check() referenced the transaction */ + t_unref(p_msg); + goto trans_not_found; + } /* if transaction found, increment the rpl_received counter */ t_stats_rpl_received();

1 0

git:master:d5fa8ec4: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: d5fa8ec41292e0cc1aaf3454fde6a251eff07fed URL: https://github.com/kamailio/kamailio/commit/d5fa8ec41292e0cc1aaf3454fde6a25… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-10T09:16:28+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/d5fa8ec41292e0cc1aaf3454fde6a25… Patch: https://github.com/kamailio/kamailio/commit/d5fa8ec41292e0cc1aaf3454fde6a25…

1 0

git:master:c06b1890: kex: documentation for rpc command core.ppdefines
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: c06b1890a59fe6998fdef8d26def3568816ab8d7 URL: https://github.com/kamailio/kamailio/commit/c06b1890a59fe6998fdef8d26def356… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T09:08:13+02:00 kex: documentation for rpc command core.ppdefines --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c06b1890a59fe6998fdef8d26def356… Patch: https://github.com/kamailio/kamailio/commit/c06b1890a59fe6998fdef8d26def356… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 49414ed1a9..6c588a31b5 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -22,7 +22,7 @@ &kamailio; Core Cookbook is available at: &kamwikilink; </para> </section> - + <section> <title>Dependencies</title> <section> @@ -648,6 +648,26 @@ resetdebug(); ... </programlisting> </section> + <section id="kex.r.core.ppdefines"> + <title> + <function moreinfo="none">core.ppdefines</function> + </title> + <para> + List preprocessor defines enabled in config. + </para> + <para> + Name: <emphasis>core.ppdefines</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis>.</para> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +&kamcmd; core.ppdefines +... + </programlisting> + </section> <section id="kex.r.pkg.stats"> <title>

1 0

git:master:3324b33c: core: added rpc command core.ppdefines
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 3324b33c7eb6036a984666e4294323f2cb015032 URL: https://github.com/kamailio/kamailio/commit/3324b33c7eb6036a984666e4294323f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T09:04:29+02:00 core: added rpc command core.ppdefines - list preprocessor defines enabled in config --- Modified: src/core/cfg.lex Modified: src/core/core_cmd.c Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/3324b33c7eb6036a984666e4294323f… Patch: https://github.com/kamailio/kamailio/commit/3324b33c7eb6036a984666e4294323f…

1 0

git:master:3469156e: Makefile.groups: added acc_diameter to extra group
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: 3469156e29565c03ea4a8e8bafe746eec06e3a83 URL: https://github.com/kamailio/kamailio/commit/3469156e29565c03ea4a8e8bafe746e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T19:23:41+02:00 Makefile.groups: added acc_diameter to extra group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/3469156e29565c03ea4a8e8bafe746e… Patch: https://github.com/kamailio/kamailio/commit/3469156e29565c03ea4a8e8bafe746e… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index d7074cbc65..ab82466413 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -21,7 +21,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ - log_custom keepalive ss7ops app_sqlang + log_custom keepalive ss7ops app_sqlang acc_diameter # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

IMPORTANT: acc module - SQL define removed and diameter code relocated
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Hello, I just pushed a bit of clean up to acc module, therefore be aware of following changes: 1) the define conditions on SQL_ACC were removed -- this was enabled for more than 10 years and only made the code look complex and hard to follow up its logic. 2) the code related to DIAMETER accounting was relocated to acc_diameter (new) module. It was a consistent size of code that was not enabled for sooo... long. It is now a dedicated module, similar to acc_radius. The diameter accounting code, even a new module now, is in the same stage, compiling but not tested, in pair with auth_diameter module, it may work, but very likely not. In summary, what's important for those using the acc module -- it offers the same functionality as it was enabled by default in the past 10 years or more, only the unused code was relocated. It offers the functionality of writing accounting records to syslog and sql databases. The acc module is now slimmer, only with the code that it needs, therefore easier to maintain and enhance for the future. Hopefully, there was no side effect with this update -- anyhow, if you find any issue, just open a bug report on github project. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 0

git:master:d05e4bff: acc_radius: coherent indentation and whitespacing
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: d05e4bffa921cb7daac24eda2ff7ddb09cde942d URL: https://github.com/kamailio/kamailio/commit/d05e4bffa921cb7daac24eda2ff7ddb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T15:28:59+02:00 acc_radius: coherent indentation and whitespacing --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d05e4bffa921cb7daac24eda2ff7ddb… Patch: https://github.com/kamailio/kamailio/commit/d05e4bffa921cb7daac24eda2ff7ddb… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index df5dbdf5f8..94e521f537 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -67,7 +67,7 @@ acc_api_t accb; acc_engine_t _acc_radius_engine; /* ----- RADIUS acc variables ----------- */ -/*! \name AccRadiusVariables Radius Variables */ +/*! \name AccRadiusVariables Radius Variables */ /*@{*/ static char *radius_config = 0; @@ -324,7 +324,7 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) int rc_result=-1; double tsecmicro; char smicrosec[18]; - + send=NULL; attr_cnt = accb.get_core_attrs( req, inf->varr, inf->iarr, inf->tarr ); @@ -344,16 +344,16 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) ADD_RAD_AVPAIR( RA_SIP_METHOD, &av_type, -1); // Event Time Stamp with Microseconds - if(rad_time_mode==1){ - gettimeofday(&inf->env->tv, NULL); - tsecmicro=inf->env->tv.tv_sec+((double)inf->env->tv.tv_usec/1000000.0); - //radius client doesn t support double so convert it - sprintf(smicrosec,"%17.6f",tsecmicro); - ADD_RAD_AVPAIR(RA_TIME_STAMP, &smicrosec, -1); - }else{ - av_type = (uint32_t)inf->env->ts; - ADD_RAD_AVPAIR(RA_TIME_STAMP, &av_type, -1); - } + if(rad_time_mode==1){ + gettimeofday(&inf->env->tv, NULL); + tsecmicro=inf->env->tv.tv_sec+((double)inf->env->tv.tv_usec/1000000.0); + //radius client doesn t support double so convert it + sprintf(smicrosec,"%17.6f",tsecmicro); + ADD_RAD_AVPAIR(RA_TIME_STAMP, &smicrosec, -1); + }else{ + av_type = (uint32_t)inf->env->ts; + ADD_RAD_AVPAIR(RA_TIME_STAMP, &av_type, -1); + } /* add extra also */ @@ -392,29 +392,29 @@ int acc_radius_send_request(struct sip_msg *req, acc_info_t *inf) rc_result=rc_acct(rh, SIP_PORT, send); - if (rc_result==ERROR_RC) { - LM_ERR("Radius accounting - ERROR - \n"); - goto error; - }else if(rc_result==BADRESP_RC){ - LM_ERR("Radius accounting - BAD RESPONSE \n"); - goto error; - }else if(rc_result==TIMEOUT_RC){ - LM_ERR("Radius accounting - TIMEOUT \n"); - goto error; - }else if(rc_result==REJECT_RC){ - LM_ERR("Radius accounting - REJECTED \n"); - goto error; - }else if(rc_result==OK_RC){ - LM_DBG("Radius accounting - OK \n"); - }else{ - LM_ERR("Radius accounting - Unknown response \n"); - goto error; - } - - rc_avpair_free(send); - /* free memory allocated by extra2strar */ - free_strar_mem( &(inf->tarr[m-o]), &(inf->varr[m-o]), o, m); - return 1; + if (rc_result==ERROR_RC) { + LM_ERR("Radius accounting - ERROR - \n"); + goto error; + }else if(rc_result==BADRESP_RC){ + LM_ERR("Radius accounting - BAD RESPONSE \n"); + goto error; + }else if(rc_result==TIMEOUT_RC){ + LM_ERR("Radius accounting - TIMEOUT \n"); + goto error; + }else if(rc_result==REJECT_RC){ + LM_ERR("Radius accounting - REJECTED \n"); + goto error; + }else if(rc_result==OK_RC){ + LM_DBG("Radius accounting - OK \n"); + }else{ + LM_ERR("Radius accounting - Unknown response \n"); + goto error; + } + + rc_avpair_free(send); + /* free memory allocated by extra2strar */ + free_strar_mem( &(inf->tarr[m-o]), &(inf->varr[m-o]), o, m); + return 1; error: rc_avpair_free(send);

1 0

git:master:5cb612b7: acc: relocated the code related to diameter accounting to acc_diameter
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: 5cb612b7ff9bba75ec8e48dade06561810a77ccd URL: https://github.com/kamailio/kamailio/commit/5cb612b7ff9bba75ec8e48dade06561… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T15:28:25+02:00 acc: relocated the code related to diameter accounting to acc_diameter --- Modified: src/modules/acc/Makefile Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_api.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_extra.c Modified: src/modules/acc/acc_logic.c Modified: src/modules/acc/acc_logic.h Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/acc_mod.h Removed: src/modules/acc/diam_avp.c Removed: src/modules/acc/diam_dict.h Removed: src/modules/acc/diam_message.c Removed: src/modules/acc/diam_message.h Removed: src/modules/acc/diam_tcp.c Removed: src/modules/acc/diam_tcp.h --- Diff: https://github.com/kamailio/kamailio/commit/5cb612b7ff9bba75ec8e48dade06561… Patch: https://github.com/kamailio/kamailio/commit/5cb612b7ff9bba75ec8e48dade06561…

1 0

git:master:560c52cb: acc_diameter: diameter accounting module with code relocated from acc
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: 560c52cbd4f6f4f934cd907621979ce33a676821 URL: https://github.com/kamailio/kamailio/commit/560c52cbd4f6f4f934cd907621979ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T15:27:47+02:00 acc_diameter: diameter accounting module with code relocated from acc --- Added: src/modules/acc_diameter/Makefile Added: src/modules/acc_diameter/README Added: src/modules/acc_diameter/acc_diameter_mod.c Added: src/modules/acc_diameter/diam_avp.c Added: src/modules/acc_diameter/diam_dict.h Added: src/modules/acc_diameter/diam_message.c Added: src/modules/acc_diameter/diam_message.h Added: src/modules/acc_diameter/diam_tcp.c Added: src/modules/acc_diameter/diam_tcp.h Added: src/modules/acc_diameter/doc/Makefile Added: src/modules/acc_diameter/doc/acc_diameter.xml Added: src/modules/acc_diameter/doc/acc_diameter_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/560c52cbd4f6f4f934cd907621979ce… Patch: https://github.com/kamailio/kamailio/commit/560c52cbd4f6f4f934cd907621979ce…

1 0

git:master:60a35d4e: acc_radius: removed unused code left when split from acc module
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: 60a35d4ea83fc0a6d2a29aa56ff94afc57eff9af URL: https://github.com/kamailio/kamailio/commit/60a35d4ea83fc0a6d2a29aa56ff94af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T13:38:16+02:00 acc_radius: removed unused code left when split from acc module --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60a35d4ea83fc0a6d2a29aa56ff94af… Patch: https://github.com/kamailio/kamailio/commit/60a35d4ea83fc0a6d2a29aa56ff94af… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index 05adfb1b11..df5dbdf5f8 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -203,14 +203,6 @@ static int acc_api_fixup(void** param, int param_no) accp->reason.len = strlen(accp->reason.s); } *param = (void*)accp; -#ifdef SQL_ACC - } else if (param_no == 2) { - /* only for db acc - the table name */ - if (db_url.s==0) { - pkg_free(p); - *param = 0; - } -#endif } return 0; }

1 0

git:master:8eb6e6a0: acc: removed define for SQL_ACC
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: 8eb6e6a01d435955939ceddee82b3ba0a3ee93f8 URL: https://github.com/kamailio/kamailio/commit/8eb6e6a01d435955939ceddee82b3ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T13:37:20+02:00 acc: removed define for SQL_ACC - it was enabled for more than 10 years and the module links to lib/srdb1 anyhow --- Modified: src/modules/acc/Makefile Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_logic.c Modified: src/modules/acc/acc_logic.h Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/acc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/8eb6e6a01d435955939ceddee82b3ba… Patch: https://github.com/kamailio/kamailio/commit/8eb6e6a01d435955939ceddee82b3ba…

1 0

RFC: Moving misc/obsolete/ to its own git repository
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Hello, trying to make the git repository a bit slimmer and avoid unuseful indexing of unused modules, I am considering to move misc/obsolete to its own github repository (planned to be named kamailio-obsolete). The initial idea was to keep there modules that were duplicated or no longer maintained, just in case someone will come later and wants to revive it. However, iirc, it is more than 4 years and nobody touched them, so very likely it requires a bit of work to revive any of them, so a fresh re-import will be the same from an external repository. If anyone still wants to keep them in the main kamailio repository, respond on the mailing list and present the benefits. If not, I will do the operation in the next several days. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 1

git:master:eff1e2c6: misc: removed obsolete folder
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: eff1e2c6a2ccceae1ddfc81298cbdcc789fcf6dd URL: https://github.com/kamailio/kamailio/commit/eff1e2c6a2ccceae1ddfc81298cbdcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T12:34:46+02:00 misc: removed obsolete folder - content relocated to its own github repo: kamailio-obsolete --- Removed: misc/obsolete/acc_db/.cvsignore Removed: misc/obsolete/acc_db/Makefile Removed: misc/obsolete/acc_db/acc_db.c Removed: misc/obsolete/acc_db/acc_db.xml Removed: misc/obsolete/acc_radius/Makefile Removed: misc/obsolete/acc_radius/acc_radius.c Removed: misc/obsolete/acc_syslog/.cvsignore Removed: misc/obsolete/acc_syslog/Makefile Removed: misc/obsolete/acc_syslog/README Removed: misc/obsolete/acc_syslog/acc_syslog.c Removed: misc/obsolete/acc_syslog/acc_syslog.xml Removed: misc/obsolete/acc_syslog/attrs.h Removed: misc/obsolete/acc_syslog/doc/Makefile Removed: misc/obsolete/acc_syslog/doc/acc_syslog.xml Removed: misc/obsolete/acc_syslog/doc/functions.xml Removed: misc/obsolete/acc_syslog/doc/params.xml Removed: misc/obsolete/auth_radius/Makefile Removed: misc/obsolete/auth_radius/README Removed: misc/obsolete/auth_radius/authorize.c Removed: misc/obsolete/auth_radius/authorize.h Removed: misc/obsolete/auth_radius/authrad_mod.c Removed: misc/obsolete/auth_radius/authrad_mod.h Removed: misc/obsolete/auth_radius/doc/Makefile Removed: misc/obsolete/auth_radius/doc/auth_radius.xml Removed: misc/obsolete/auth_radius/doc/functions.xml Removed: misc/obsolete/auth_radius/doc/params.xml Removed: misc/obsolete/auth_radius/sterman.c Removed: misc/obsolete/auth_radius/sterman.h Removed: misc/obsolete/avp_radius/Makefile Removed: misc/obsolete/avp_radius/README Removed: misc/obsolete/avp_radius/avp_radius.c Removed: misc/obsolete/avp_radius/doc/Makefile Removed: misc/obsolete/avp_radius/doc/avp_radius.xml Removed: misc/obsolete/avp_radius/doc/functions.xml Removed: misc/obsolete/avp_radius/doc/params.xml Removed: misc/obsolete/bdb/Makefile Removed: misc/obsolete/bdb/README Removed: misc/obsolete/bdb/bdb.c Removed: misc/obsolete/bdb/bdb.h Removed: misc/obsolete/bdb/bdb_api.c Removed: misc/obsolete/bdb/bdb_api.h Removed: misc/obsolete/bdb/bdb_base.c Removed: misc/obsolete/bdb/bdb_res.h Removed: misc/obsolete/bdb/bdb_rval.c Removed: misc/obsolete/bdb/bdb_sval.c Removed: misc/obsolete/bdb/bdb_uval.c Removed: misc/obsolete/bdb/bdb_val.c Removed: misc/obsolete/bdb/bdb_vals.h Removed: misc/obsolete/bdb/doc/Makefile Removed: misc/obsolete/bdb/doc/bdb.xml Removed: misc/obsolete/bdb/version.dump Removed: misc/obsolete/cpl-c/CPL_tree.h Removed: misc/obsolete/cpl-c/Makefile Removed: misc/obsolete/cpl-c/README Removed: misc/obsolete/cpl-c/cpl-06.dtd Removed: misc/obsolete/cpl-c/cpl.c Removed: misc/obsolete/cpl-c/cpl_db.c Removed: misc/obsolete/cpl-c/cpl_db.h Removed: misc/obsolete/cpl-c/cpl_env.h Removed: misc/obsolete/cpl-c/cpl_loader.c Removed: misc/obsolete/cpl-c/cpl_loader.h Removed: misc/obsolete/cpl-c/cpl_log.c Removed: misc/obsolete/cpl-c/cpl_log.h Removed: misc/obsolete/cpl-c/cpl_nonsig.c Removed: misc/obsolete/cpl-c/cpl_nonsig.h Removed: misc/obsolete/cpl-c/cpl_parser.c Removed: misc/obsolete/cpl-c/cpl_parser.h Removed: misc/obsolete/cpl-c/cpl_proxy.h Removed: misc/obsolete/cpl-c/cpl_rpc.c Removed: misc/obsolete/cpl-c/cpl_rpc.h Removed: misc/obsolete/cpl-c/cpl_run.c Removed: misc/obsolete/cpl-c/cpl_run.h Removed: misc/obsolete/cpl-c/cpl_sig.c Removed: misc/obsolete/cpl-c/cpl_sig.h Removed: misc/obsolete/cpl-c/cpl_switches.h Removed: misc/obsolete/cpl-c/cpl_time.c Removed: misc/obsolete/cpl-c/cpl_time.h Removed: misc/obsolete/cpl-c/cpl_utils.h Removed: misc/obsolete/cpl-c/doc/Makefile Removed: misc/obsolete/cpl-c/doc/cpl-c.xml Removed: misc/obsolete/cpl-c/doc/functions.xml Removed: misc/obsolete/cpl-c/doc/params.xml Removed: misc/obsolete/cpl-c/init.mysql Removed: misc/obsolete/cpl-c/loc_set.h Removed: misc/obsolete/cpl-c/ser-cpl.cfg Removed: misc/obsolete/cpl-c/sub_list.c Removed: misc/obsolete/cpl-c/sub_list.h Removed: misc/obsolete/dbtext/Makefile Removed: misc/obsolete/dbtext/README Removed: misc/obsolete/dbtext/dbt_api.c Removed: misc/obsolete/dbtext/dbt_api.h Removed: misc/obsolete/dbtext/dbt_base.c Removed: misc/obsolete/dbtext/dbt_file.c Removed: misc/obsolete/dbtext/dbt_lib.c Removed: misc/obsolete/dbtext/dbt_lib.h Removed: misc/obsolete/dbtext/dbt_res.c Removed: misc/obsolete/dbtext/dbt_res.h Removed: misc/obsolete/dbtext/dbt_tb.c Removed: misc/obsolete/dbtext/dbt_util.c Removed: misc/obsolete/dbtext/dbt_util.h Removed: misc/obsolete/dbtext/dbtex/Makefile Removed: misc/obsolete/dbtext/dbtex/db/location Removed: misc/obsolete/dbtext/dbtex/db/test Removed: misc/obsolete/dbtext/dbtex/dbtex.c Removed: misc/obsolete/dbtext/dbtext.c Removed: misc/obsolete/dbtext/dbtext.h Removed: misc/obsolete/dbtext/doc/Makefile Removed: misc/obsolete/dbtext/doc/dbtext-ser.cfg Removed: misc/obsolete/dbtext/doc/dbtext.xml Removed: misc/obsolete/dialog/Makefile Removed: misc/obsolete/dialog/db_dlg.c Removed: misc/obsolete/dialog/db_dlg.h Removed: misc/obsolete/dialog/dlg_mod.c Removed: misc/obsolete/dialog/dlg_mod.h Removed: misc/obsolete/dialog/dlg_mod_internal.h Removed: misc/obsolete/dialog/dlg_request.c Removed: misc/obsolete/dialog/dlg_request.h Removed: misc/obsolete/dialog/dlg_utils.c Removed: misc/obsolete/dialog/dlg_utils.h Removed: misc/obsolete/dialog/serialize_dlg.c Removed: misc/obsolete/dialog/serialize_dlg.h Removed: misc/obsolete/dispatcher/Makefile Removed: misc/obsolete/dispatcher/README Removed: misc/obsolete/dispatcher/dispatch.h Removed: misc/obsolete/dispatcher/dispatcher.c Removed: misc/obsolete/dispatcher/dispatcher.h Removed: misc/obsolete/dispatcher/doc/Makefile Removed: misc/obsolete/dispatcher/doc/dispatcher.cfg Removed: misc/obsolete/dispatcher/doc/dispatcher.list Removed: misc/obsolete/dispatcher/doc/dispatcher.xml Removed: misc/obsolete/dispatcher/doc/fifo.xml Removed: misc/obsolete/dispatcher/doc/functions.xml Removed: misc/obsolete/dispatcher/doc/params.xml Removed: misc/obsolete/dispatcher/ds_backend.c Removed: misc/obsolete/dispatcher/ds_rpc.c Removed: misc/obsolete/dispatcher/ds_rpc.h Removed: misc/obsolete/diversion/Makefile Removed: misc/obsolete/diversion/README Removed: misc/obsolete/diversion/diversion.c Removed: misc/obsolete/eval/Makefile Removed: misc/obsolete/eval/README Removed: misc/obsolete/eval/eval.c Removed: misc/obsolete/exec/Makefile Removed: misc/obsolete/exec/README Removed: misc/obsolete/exec/config.h Removed: misc/obsolete/exec/doc/Makefile Removed: misc/obsolete/exec/doc/exec.xml Removed: misc/obsolete/exec/doc/functions.xml Removed: misc/obsolete/exec/doc/params.xml Removed: misc/obsolete/exec/exec.c Removed: misc/obsolete/exec/exec.h Removed: misc/obsolete/exec/exec_hf.c Removed: misc/obsolete/exec/exec_hf.h Removed: misc/obsolete/exec/exec_mod.c Removed: misc/obsolete/exec/kill.c Removed: misc/obsolete/exec/kill.h Removed: misc/obsolete/fifo/Makefile Removed: misc/obsolete/fifo/README Removed: misc/obsolete/fifo/fifo.c Removed: misc/obsolete/fifo/fifo.h Removed: misc/obsolete/fifo/fifo_server.c Removed: misc/obsolete/fifo/fifo_server.h Removed: misc/obsolete/iptrtpproxy/Makefile Removed: misc/obsolete/iptrtpproxy/README Removed: misc/obsolete/iptrtpproxy/doc/Makefile Removed: misc/obsolete/iptrtpproxy/doc/iptrtpproxy.xml Removed: misc/obsolete/iptrtpproxy/doc/iptrtpproxy_admin.xml Removed: misc/obsolete/iptrtpproxy/iptrtpproxy.c Removed: misc/obsolete/iptrtpproxy/oob/clean_rtpproxy_attrs Removed: misc/obsolete/iptrtpproxy/oob/rtpproxy_attrs.sql Removed: misc/obsolete/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.inc Removed: misc/obsolete/iptrtpproxy/oob/sip-router-oob-RTPPROXY.cfg.patch Removed: misc/obsolete/jabber_k/Makefile Removed: misc/obsolete/jabber_k/README Removed: misc/obsolete/jabber_k/doc/Makefile Removed: misc/obsolete/jabber_k/doc/jabber.cfg Removed: misc/obsolete/jabber_k/doc/jabber.gws Removed: misc/obsolete/jabber_k/doc/jabber.sql Removed: misc/obsolete/jabber_k/doc/jabber.xml Removed: misc/obsolete/jabber_k/doc/jabber_admin.xml Removed: misc/obsolete/jabber_k/doc/jabberreg.pl Removed: misc/obsolete/jabber_k/doc/jabberx.cfg Removed: misc/obsolete/jabber_k/doc/web/libjab.php Removed: misc/obsolete/jabber_k/doc/web/subscribe.php Removed: misc/obsolete/jabber_k/jabber.c Removed: misc/obsolete/jabber_k/mdefines.h Removed: misc/obsolete/jabber_k/sha.c Removed: misc/obsolete/jabber_k/tree234.c Removed: misc/obsolete/jabber_k/tree234.h Removed: misc/obsolete/jabber_k/xjab_base.c Removed: misc/obsolete/jabber_k/xjab_base.h Removed: misc/obsolete/jabber_k/xjab_dmsg.h Removed: misc/obsolete/jabber_k/xjab_jcon.c Removed: misc/obsolete/jabber_k/xjab_jcon.h Removed: misc/obsolete/jabber_k/xjab_jconf.c Removed: misc/obsolete/jabber_k/xjab_jconf.h Removed: misc/obsolete/jabber_k/xjab_load.c Removed: misc/obsolete/jabber_k/xjab_load.h Removed: misc/obsolete/jabber_k/xjab_presence.c Removed: misc/obsolete/jabber_k/xjab_presence.h Removed: misc/obsolete/jabber_k/xjab_util.c Removed: misc/obsolete/jabber_k/xjab_util.h Removed: misc/obsolete/jabber_k/xjab_wlist.c Removed: misc/obsolete/jabber_k/xjab_worker.c Removed: misc/obsolete/jabber_k/xjab_worker.h Removed: misc/obsolete/jabber_k/xode.c Removed: misc/obsolete/jabber_k/xode.h Removed: misc/obsolete/jabber_k/xode_from.c Removed: misc/obsolete/jabber_k/xode_str.c Removed: misc/obsolete/jabber_k/xpool.c Removed: misc/obsolete/jabber_k/xsnprintf.c Removed: misc/obsolete/jabber_k/xstream.c Removed: misc/obsolete/jabber_s/Makefile Removed: misc/obsolete/jabber_s/README Removed: misc/obsolete/jabber_s/doc/Makefile Removed: misc/obsolete/jabber_s/doc/admin.xml Removed: misc/obsolete/jabber_s/doc/faq.txt Removed: misc/obsolete/jabber_s/doc/functions.xml Removed: misc/obsolete/jabber_s/doc/gateways.txt Removed: misc/obsolete/jabber_s/doc/jabber.xml Removed: misc/obsolete/jabber_s/doc/params.xml Removed: misc/obsolete/jabber_s/doc/regjab.pl Removed: misc/obsolete/jabber_s/doc/web/libjab.php Removed: misc/obsolete/jabber_s/doc/web/subscribe.php Removed: misc/obsolete/jabber_s/doc/xjab.cfg Removed: misc/obsolete/jabber_s/doc/xjab.sql Removed: misc/obsolete/jabber_s/doc/xxjab.cfg Removed: misc/obsolete/jabber_s/jabber.c Removed: misc/obsolete/jabber_s/mdefines.h Removed: misc/obsolete/jabber_s/ser-jabber.cfg Removed: misc/obsolete/jabber_s/sha.c Removed: misc/obsolete/jabber_s/tree234.c Removed: misc/obsolete/jabber_s/tree234.h Removed: misc/obsolete/jabber_s/xjab_base.c Removed: misc/obsolete/jabber_s/xjab_base.h Removed: misc/obsolete/jabber_s/xjab_dmsg.h Removed: misc/obsolete/jabber_s/xjab_jcon.c Removed: misc/obsolete/jabber_s/xjab_jcon.h Removed: misc/obsolete/jabber_s/xjab_jconf.c Removed: misc/obsolete/jabber_s/xjab_jconf.h Removed: misc/obsolete/jabber_s/xjab_load.c Removed: misc/obsolete/jabber_s/xjab_load.h Removed: misc/obsolete/jabber_s/xjab_presence.c Removed: misc/obsolete/jabber_s/xjab_presence.h Removed: misc/obsolete/jabber_s/xjab_util.c Removed: misc/obsolete/jabber_s/xjab_util.h Removed: misc/obsolete/jabber_s/xjab_wlist.c Removed: misc/obsolete/jabber_s/xjab_worker.c Removed: misc/obsolete/jabber_s/xjab_worker.h Removed: misc/obsolete/jabber_s/xode.c Removed: misc/obsolete/jabber_s/xode.h Removed: misc/obsolete/jabber_s/xode_from.c Removed: misc/obsolete/jabber_s/xode_str.c Removed: misc/obsolete/jabber_s/xpool.c Removed: misc/obsolete/jabber_s/xsnprintf.c Removed: misc/obsolete/jabber_s/xstream.c Removed: misc/obsolete/maxfwd/Makefile Removed: misc/obsolete/maxfwd/README Removed: misc/obsolete/maxfwd/doc/Makefile Removed: misc/obsolete/maxfwd/doc/functions.xml Removed: misc/obsolete/maxfwd/doc/maxfwd.xml Removed: misc/obsolete/maxfwd/doc/params.xml Removed: misc/obsolete/maxfwd/maxfwd.c Removed: misc/obsolete/maxfwd/mf_funcs.c Removed: misc/obsolete/maxfwd/mf_funcs.h Removed: misc/obsolete/msilo/Makefile Removed: misc/obsolete/msilo/README Removed: misc/obsolete/msilo/doc/Makefile Removed: misc/obsolete/msilo/doc/functions.xml Removed: misc/obsolete/msilo/doc/msilo.cfg Removed: misc/obsolete/msilo/doc/msilo.xml Removed: misc/obsolete/msilo/doc/params.xml Removed: misc/obsolete/msilo/ms_msg_list.c Removed: misc/obsolete/msilo/ms_msg_list.h Removed: misc/obsolete/msilo/msfuncs.c Removed: misc/obsolete/msilo/msfuncs.h Removed: misc/obsolete/msilo/msilo.c Removed: misc/obsolete/msilo/ser-msilo.cfg Removed: misc/obsolete/nathelper/Makefile Removed: misc/obsolete/nathelper/README Removed: misc/obsolete/nathelper/TODO Removed: misc/obsolete/nathelper/doc/Makefile Removed: misc/obsolete/nathelper/doc/functions.xml Removed: misc/obsolete/nathelper/doc/nathelper.xml Removed: misc/obsolete/nathelper/doc/params.xml Removed: misc/obsolete/nathelper/nathelper.c Removed: misc/obsolete/nathelper/nathelper.cfg Removed: misc/obsolete/nathelper/nathelper.h Removed: misc/obsolete/nathelper/natping.c Removed: misc/obsolete/nathelper/nhelpr_funcs.c Removed: misc/obsolete/nathelper/nhelpr_funcs.h Removed: misc/obsolete/options/Makefile Removed: misc/obsolete/options/README Removed: misc/obsolete/options/doc/Makefile Removed: misc/obsolete/options/doc/functions.xml Removed: misc/obsolete/options/doc/options.xml Removed: misc/obsolete/options/doc/params.xml Removed: misc/obsolete/options/mod_options.c Removed: misc/obsolete/options/mod_options.h Removed: misc/obsolete/oracle/Makefile Removed: misc/obsolete/oracle/README Removed: misc/obsolete/oracle/common.h Removed: misc/obsolete/oracle/db_mod.c Removed: misc/obsolete/oracle/dbase.c Removed: misc/obsolete/oracle/dbase.h Removed: misc/obsolete/oracle/prepare.c Removed: misc/obsolete/oracle/prepare.h Removed: misc/obsolete/oracle/utils.c Removed: misc/obsolete/oracle/utils.h Removed: misc/obsolete/osp/Makefile Removed: misc/obsolete/osp/README Removed: misc/obsolete/osp/RELEASE-NOTES.txt Removed: misc/obsolete/osp/destination.c Removed: misc/obsolete/osp/destination.h Removed: misc/obsolete/osp/doc/Makefile Removed: misc/obsolete/osp/doc/osp.xml Removed: misc/obsolete/osp/doc/osp_admin.xml Removed: misc/obsolete/osp/doc/osp_devel.xml Removed: misc/obsolete/osp/doc/osp_faq.xml Removed: misc/obsolete/osp/etc/cacert_0.pem Removed: misc/obsolete/osp/etc/localcert.pem Removed: misc/obsolete/osp/etc/pkey.pem Removed: misc/obsolete/osp/etc/sample-osp-ser.cfg Removed: misc/obsolete/osp/globals.c Removed: misc/obsolete/osp/orig_transaction.c Removed: misc/obsolete/osp/orig_transaction.h Removed: misc/obsolete/osp/osp_mod.c Removed: misc/obsolete/osp/osp_mod.h Removed: misc/obsolete/osp/osptoolkit.c Removed: misc/obsolete/osp/osptoolkit.h Removed: misc/obsolete/osp/provider.c Removed: misc/obsolete/osp/provider.h Removed: misc/obsolete/osp/sipheader.c Removed: misc/obsolete/osp/sipheader.h Removed: misc/obsolete/osp/term_transaction.c Removed: misc/obsolete/osp/term_transaction.h Removed: misc/obsolete/osp/tm.c Removed: misc/obsolete/osp/tm.h Removed: misc/obsolete/osp/usage.c Removed: misc/obsolete/osp/usage.h Removed: misc/obsolete/pa/ChangeLog Removed: misc/obsolete/pa/Makefile Removed: misc/obsolete/pa/README Removed: misc/obsolete/pa/async_auth.c Removed: misc/obsolete/pa/async_auth.h Removed: misc/obsolete/pa/auth.c Removed: misc/obsolete/pa/auth.h Removed: misc/obsolete/pa/dlist.c Removed: misc/obsolete/pa/dlist.h Removed: misc/obsolete/pa/doc/Makefile Removed: misc/obsolete/pa/doc/auth.xml Removed: misc/obsolete/pa/doc/functions.xml Removed: misc/obsolete/pa/doc/pa.xml Removed: misc/obsolete/pa/doc/pa_base.xml Removed: misc/obsolete/pa/doc/pa_db_src.xml Removed: misc/obsolete/pa/doc/pa_incl.xml Removed: misc/obsolete/pa/doc/params.xml Removed: misc/obsolete/pa/doc/xcap.xml Removed: misc/obsolete/pa/extension_elements.c Removed: misc/obsolete/pa/extension_elements.h Removed: misc/obsolete/pa/hslot.c Removed: misc/obsolete/pa/hslot.h Removed: misc/obsolete/pa/message.c Removed: misc/obsolete/pa/message.h Removed: misc/obsolete/pa/mimetypes.c Removed: misc/obsolete/pa/mimetypes.h Removed: misc/obsolete/pa/notify.c Removed: misc/obsolete/pa/notify.h Removed: misc/obsolete/pa/offline_winfo.c Removed: misc/obsolete/pa/offline_winfo.h Removed: misc/obsolete/pa/pa_mod.c Removed: misc/obsolete/pa/pa_mod.h Removed: misc/obsolete/pa/paerrno.c Removed: misc/obsolete/pa/paerrno.h Removed: misc/obsolete/pa/pdomain.c Removed: misc/obsolete/pa/pdomain.h Removed: misc/obsolete/pa/pres_notes.c Removed: misc/obsolete/pa/pres_notes.h Removed: misc/obsolete/pa/pres_timer.c Removed: misc/obsolete/pa/presentity.c Removed: misc/obsolete/pa/presentity.h Removed: misc/obsolete/pa/ptime.c Removed: misc/obsolete/pa/ptime.h Removed: misc/obsolete/pa/publish.c Removed: misc/obsolete/pa/publish.h Removed: misc/obsolete/pa/qsa_interface.c Removed: misc/obsolete/pa/qsa_interface.h Removed: misc/obsolete/pa/reply.c Removed: misc/obsolete/pa/reply.h Removed: misc/obsolete/pa/rpc.c Removed: misc/obsolete/pa/rpc.h Removed: misc/obsolete/pa/status_query.c Removed: misc/obsolete/pa/status_query.h Removed: misc/obsolete/pa/subscribe.c Removed: misc/obsolete/pa/subscribe.h Removed: misc/obsolete/pa/trace.h Removed: misc/obsolete/pa/tuple.c Removed: misc/obsolete/pa/tuple.h Removed: misc/obsolete/pa/tuple_extensions.c Removed: misc/obsolete/pa/tuple_extensions.h Removed: misc/obsolete/pa/tuple_notes.c Removed: misc/obsolete/pa/tuple_notes.h Removed: misc/obsolete/pa/watcher.c Removed: misc/obsolete/pa/watcher.h Removed: misc/obsolete/pa/winfo_doc.c Removed: misc/obsolete/pa/winfo_doc.h Removed: misc/obsolete/pdt/Makefile Removed: misc/obsolete/pdt/README Removed: misc/obsolete/pdt/doc/Makefile Removed: misc/obsolete/pdt/doc/admin.sql Removed: misc/obsolete/pdt/doc/fifo.sh Removed: misc/obsolete/pdt/doc/fifo.xml Removed: misc/obsolete/pdt/doc/functions.xml Removed: misc/obsolete/pdt/doc/params.xml Removed: misc/obsolete/pdt/doc/pdt.cfg Removed: misc/obsolete/pdt/doc/pdt.sql Removed: misc/obsolete/pdt/doc/pdt.xml Removed: misc/obsolete/pdt/doc/pdt_fifo_add.sh Removed: misc/obsolete/pdt/doc/pdt_fifo_delete.sh Removed: misc/obsolete/pdt/doc/pdt_fifo_list.sh Removed: misc/obsolete/pdt/doc/web/index.php Removed: misc/obsolete/pdt/doc/web/request.php Removed: misc/obsolete/pdt/domains.c Removed: misc/obsolete/pdt/domains.h Removed: misc/obsolete/pdt/pdt.c Removed: misc/obsolete/pdt/pdtree.c Removed: misc/obsolete/pdt/pdtree.h Removed: misc/obsolete/pdt/ser-pdt.cfg Removed: misc/obsolete/permissions/Makefile Removed: misc/obsolete/permissions/README Removed: misc/obsolete/permissions/allow_files.c Removed: misc/obsolete/permissions/allow_files.h Removed: misc/obsolete/permissions/config/permissions.allow Removed: misc/obsolete/permissions/config/permissions.deny Removed: misc/obsolete/permissions/config/register.allow Removed: misc/obsolete/permissions/config/register.deny Removed: misc/obsolete/permissions/doc/Makefile Removed: misc/obsolete/permissions/doc/functions.xml Removed: misc/obsolete/permissions/doc/params.xml Removed: misc/obsolete/permissions/doc/permissions.xml Removed: misc/obsolete/permissions/doc/xmlrpc.xml Removed: misc/obsolete/permissions/im_db.c Removed: misc/obsolete/permissions/im_db.h Removed: misc/obsolete/permissions/im_hash.c Removed: misc/obsolete/permissions/im_hash.h Removed: misc/obsolete/permissions/im_locks.c Removed: misc/obsolete/permissions/im_locks.h Removed: misc/obsolete/permissions/im_rpc.c Removed: misc/obsolete/permissions/im_rpc.h Removed: misc/obsolete/permissions/ip_set.c Removed: misc/obsolete/permissions/ip_set.h Removed: misc/obsolete/permissions/ip_set_rpc.c Removed: misc/obsolete/permissions/ip_set_rpc.h Removed: misc/obsolete/permissions/ip_tree.c Removed: misc/obsolete/permissions/ip_tree.h Removed: misc/obsolete/permissions/ipmatch.c Removed: misc/obsolete/permissions/ipmatch.h Removed: misc/obsolete/permissions/parse_config.c Removed: misc/obsolete/permissions/parse_config.h Removed: misc/obsolete/permissions/permissions.c Removed: misc/obsolete/permissions/permissions.h Removed: misc/obsolete/permissions/permissions_rpc.h Removed: misc/obsolete/permissions/rule.c Removed: misc/obsolete/permissions/rule.h Removed: misc/obsolete/permissions/trusted.c Removed: misc/obsolete/permissions/trusted.h Removed: misc/obsolete/permissions/trusted_hash.c Removed: misc/obsolete/permissions/trusted_hash.h Removed: misc/obsolete/permissions/trusted_rpc.c Removed: misc/obsolete/permissions/trusted_rpc.h Removed: misc/obsolete/pike/Makefile Removed: misc/obsolete/pike/README Removed: misc/obsolete/pike/doc/Makefile Removed: misc/obsolete/pike/doc/devel.xml Removed: misc/obsolete/pike/doc/functions.xml Removed: misc/obsolete/pike/doc/params.xml Removed: misc/obsolete/pike/doc/pike.xml Removed: misc/obsolete/pike/doc/rpc.xml Removed: misc/obsolete/pike/ip_tree.c Removed: misc/obsolete/pike/ip_tree.h Removed: misc/obsolete/pike/pike.c Removed: misc/obsolete/pike/pike_funcs.c Removed: misc/obsolete/pike/pike_funcs.h Removed: misc/obsolete/pike/rpc.c Removed: misc/obsolete/pike/rpc.h Removed: misc/obsolete/pike/timer.c Removed: misc/obsolete/pike/timer.h Removed: misc/obsolete/pike/top.c Removed: misc/obsolete/pike/top.h Removed: misc/obsolete/presence_b2b/ChangeLog Removed: misc/obsolete/presence_b2b/Makefile Removed: misc/obsolete/presence_b2b/README Removed: misc/obsolete/presence_b2b/doc/Makefile Removed: misc/obsolete/presence_b2b/doc/functions.xml Removed: misc/obsolete/presence_b2b/doc/params.xml Removed: misc/obsolete/presence_b2b/doc/presence_b2b.xml Removed: misc/obsolete/presence_b2b/euac_funcs.c Removed: misc/obsolete/presence_b2b/euac_funcs.h Removed: misc/obsolete/presence_b2b/euac_internals.c Removed: misc/obsolete/presence_b2b/euac_internals.h Removed: misc/obsolete/presence_b2b/euac_state_machine.c Removed: misc/obsolete/presence_b2b/euac_state_machine.h Removed: misc/obsolete/presence_b2b/events_mod.c Removed: misc/obsolete/presence_b2b/events_mod.h Removed: misc/obsolete/presence_b2b/events_uac.c Removed: misc/obsolete/presence_b2b/events_uac.h Removed: misc/obsolete/presence_b2b/qsa_events.c Removed: misc/obsolete/presence_b2b/qsa_events.h Removed: misc/obsolete/presence_b2b/rpc.c Removed: misc/obsolete/presence_b2b/rpc.h Removed: misc/obsolete/presence_b2b/trace.h Removed: misc/obsolete/purple/LICENSE Removed: misc/obsolete/purple/Makefile Removed: misc/obsolete/purple/README Removed: misc/obsolete/purple/clientaccount.c Removed: misc/obsolete/purple/clientaccount.h Removed: misc/obsolete/purple/clientops.c Removed: misc/obsolete/purple/clientops.h Removed: misc/obsolete/purple/clientpipe.c Removed: misc/obsolete/purple/clientpipe.h Removed: misc/obsolete/purple/clientsig.c Removed: misc/obsolete/purple/clientsig.h Removed: misc/obsolete/purple/defines.h Removed: misc/obsolete/purple/doc/Makefile Removed: misc/obsolete/purple/doc/purple.xml Removed: misc/obsolete/purple/doc/purple_admin.xml Removed: misc/obsolete/purple/hashtable.c Removed: misc/obsolete/purple/hashtable.h Removed: misc/obsolete/purple/mapping.c Removed: misc/obsolete/purple/mapping.h Removed: misc/obsolete/purple/miniclient.c Removed: misc/obsolete/purple/miniclient.h Removed: misc/obsolete/purple/namespaces.h Removed: misc/obsolete/purple/purple.c Removed: misc/obsolete/purple/purple.h Removed: misc/obsolete/purple/purple_sip.c Removed: misc/obsolete/purple/purple_sip.h Removed: misc/obsolete/purple/purplepipe.c Removed: misc/obsolete/purple/purplepipe.h Removed: misc/obsolete/purple/utils.c Removed: misc/obsolete/purple/utils.h Removed: misc/obsolete/ratelimit/Makefile Removed: misc/obsolete/ratelimit/README Removed: misc/obsolete/ratelimit/doc/Makefile Removed: misc/obsolete/ratelimit/doc/fifo.xml Removed: misc/obsolete/ratelimit/doc/functions.xml Removed: misc/obsolete/ratelimit/doc/params.xml Removed: misc/obsolete/ratelimit/doc/ratelimit.xml Removed: misc/obsolete/ratelimit/ratelimit.c Removed: misc/obsolete/registrar/Makefile Removed: misc/obsolete/registrar/README Removed: misc/obsolete/registrar/common.c Removed: misc/obsolete/registrar/common.h Removed: misc/obsolete/registrar/doc/Makefile Removed: misc/obsolete/registrar/doc/functions.xml Removed: misc/obsolete/registrar/doc/params.xml Removed: misc/obsolete/registrar/doc/registrar.xml Removed: misc/obsolete/registrar/lookup.c Removed: misc/obsolete/registrar/lookup.h Removed: misc/obsolete/registrar/reg_mod.c Removed: misc/obsolete/registrar/reg_mod.h Removed: misc/obsolete/registrar/regtime.c Removed: misc/obsolete/registrar/regtime.h Removed: misc/obsolete/registrar/reply.c Removed: misc/obsolete/registrar/reply.h Removed: misc/obsolete/registrar/rerrno.c Removed: misc/obsolete/registrar/rerrno.h Removed: misc/obsolete/registrar/save.c Removed: misc/obsolete/registrar/save.h Removed: misc/obsolete/registrar/sip_msg.c Removed: misc/obsolete/registrar/sip_msg.h Removed: misc/obsolete/rls/ChangeLog Removed: misc/obsolete/rls/Makefile Removed: misc/obsolete/rls/README Removed: misc/obsolete/rls/db_rls.c Removed: misc/obsolete/rls/doc/Makefile Removed: misc/obsolete/rls/doc/functions.xml Removed: misc/obsolete/rls/doc/params.xml Removed: misc/obsolete/rls/doc/rls.xml Removed: misc/obsolete/rls/doc/rls_base.xml Removed: misc/obsolete/rls/doc/rls_incl.xml Removed: misc/obsolete/rls/doc/xcap.xml Removed: misc/obsolete/rls/result_codes.h Removed: misc/obsolete/rls/rl_subscription.c Removed: misc/obsolete/rls/rl_subscription.h Removed: misc/obsolete/rls/rlmi_doc.c Removed: misc/obsolete/rls/rlmi_doc.h Removed: misc/obsolete/rls/rls.sql Removed: misc/obsolete/rls/rls_auth.c Removed: misc/obsolete/rls/rls_auth.h Removed: misc/obsolete/rls/rls_data.c Removed: misc/obsolete/rls/rls_data.h Removed: misc/obsolete/rls/rls_handler.c Removed: misc/obsolete/rls/rls_handler.h Removed: misc/obsolete/rls/rls_mod.c Removed: misc/obsolete/rls/rls_mod.h Removed: misc/obsolete/rls/rpc.c Removed: misc/obsolete/rls/rpc.h Removed: misc/obsolete/rls/subscription_manager.c Removed: misc/obsolete/rls/subscription_manager.h Removed: misc/obsolete/rls/time_event_manager.c Removed: misc/obsolete/rls/time_event_manager.h Removed: misc/obsolete/rls/trace.h Removed: misc/obsolete/rls/uri_ops.c Removed: misc/obsolete/rls/uri_ops.h Removed: misc/obsolete/rls/virtual_subscription.c Removed: misc/obsolete/rr/Makefile Removed: misc/obsolete/rr/README Removed: misc/obsolete/rr/avp_cookie.c Removed: misc/obsolete/rr/avp_cookie.h Removed: misc/obsolete/rr/doc/Makefile Removed: misc/obsolete/rr/doc/functions.xml Removed: misc/obsolete/rr/doc/loose_vs_strict_routing.dia Removed: misc/obsolete/rr/doc/loose_vs_strict_routing.png Removed: misc/obsolete/rr/doc/params.xml Removed: misc/obsolete/rr/doc/rr.xml Removed: misc/obsolete/rr/fix_lumps.h Removed: misc/obsolete/rr/loose.c Removed: misc/obsolete/rr/loose.h Removed: misc/obsolete/rr/record.c Removed: misc/obsolete/rr/record.h Removed: misc/obsolete/rr/rr_mod.c Removed: misc/obsolete/rr/rr_mod.h Removed: misc/obsolete/speeddial/Makefile Removed: misc/obsolete/speeddial/README Removed: misc/obsolete/speeddial/doc/Makefile Removed: misc/obsolete/speeddial/doc/faq.xml Removed: misc/obsolete/speeddial/doc/functions.xml Removed: misc/obsolete/speeddial/doc/params.xml Removed: misc/obsolete/speeddial/doc/speeddial.cfg Removed: misc/obsolete/speeddial/doc/speeddial.sql Removed: misc/obsolete/speeddial/doc/speeddial.xml Removed: misc/obsolete/speeddial/sdlookup.c Removed: misc/obsolete/speeddial/sdlookup.h Removed: misc/obsolete/speeddial/speeddial.c Removed: misc/obsolete/speeddial/speeddial.h Removed: misc/obsolete/textops/Makefile Removed: misc/obsolete/textops/README Removed: misc/obsolete/textops/doc/Makefile Removed: misc/obsolete/textops/doc/functions.xml Removed: misc/obsolete/textops/doc/params.xml Removed: misc/obsolete/textops/doc/textops.xml Removed: misc/obsolete/textops/textops.c Removed: misc/obsolete/uac/Makefile Removed: misc/obsolete/uac/README Removed: misc/obsolete/uac/auth.c Removed: misc/obsolete/uac/auth.h Removed: misc/obsolete/uac/auth_alg.c Removed: misc/obsolete/uac/auth_alg.h Removed: misc/obsolete/uac/auth_hdr.c Removed: misc/obsolete/uac/auth_hdr.h Removed: misc/obsolete/uac/doc/Makefile Removed: misc/obsolete/uac/doc/functions.xml Removed: misc/obsolete/uac/doc/params.xml Removed: misc/obsolete/uac/doc/replace_from.patch Removed: misc/obsolete/uac/doc/uac.xml Removed: misc/obsolete/uac/from.c Removed: misc/obsolete/uac/from.h Removed: misc/obsolete/uac/uac.c Removed: misc/obsolete/unixsock/Makefile Removed: misc/obsolete/unixsock/README Removed: misc/obsolete/unixsock/unixsock.c Removed: misc/obsolete/unixsock/unixsock_server.c Removed: misc/obsolete/unixsock/unixsock_server.h Removed: misc/obsolete/uri/Makefile Removed: misc/obsolete/uri/README Removed: misc/obsolete/uri/checks.c Removed: misc/obsolete/uri/checks.h Removed: misc/obsolete/uri/doc/Makefile Removed: misc/obsolete/uri/doc/functions.xml Removed: misc/obsolete/uri/doc/params.xml Removed: misc/obsolete/uri/doc/uri.xml Removed: misc/obsolete/uri/uri_mod.c Removed: misc/obsolete/uri/uri_mod.h Removed: misc/obsolete/uri_radius/Makefile Removed: misc/obsolete/uri_radius/README Removed: misc/obsolete/uri_radius/checks.c Removed: misc/obsolete/uri_radius/checks.h Removed: misc/obsolete/uri_radius/doc/Makefile Removed: misc/obsolete/uri_radius/doc/functions.xml Removed: misc/obsolete/uri_radius/doc/params.xml Removed: misc/obsolete/uri_radius/doc/uri_radius.xml Removed: misc/obsolete/uri_radius/urirad_mod.c Removed: misc/obsolete/uri_radius/urirad_mod.h Removed: misc/obsolete/usrloc/Makefile Removed: misc/obsolete/usrloc/README Removed: misc/obsolete/usrloc/dlist.c Removed: misc/obsolete/usrloc/dlist.h Removed: misc/obsolete/usrloc/doc/Makefile Removed: misc/obsolete/usrloc/doc/api.xml Removed: misc/obsolete/usrloc/doc/functions.xml Removed: misc/obsolete/usrloc/doc/params.xml Removed: misc/obsolete/usrloc/doc/usrloc.xml Removed: misc/obsolete/usrloc/doc/usrloc_states_w_zombie.png Removed: misc/obsolete/usrloc/doc/usrloc_states_w_zombie.vsd Removed: misc/obsolete/usrloc/hslot.c Removed: misc/obsolete/usrloc/hslot.h Removed: misc/obsolete/usrloc/notify.c Removed: misc/obsolete/usrloc/notify.h Removed: misc/obsolete/usrloc/reg_avps.c Removed: misc/obsolete/usrloc/reg_avps.h Removed: misc/obsolete/usrloc/reg_avps_db.c Removed: misc/obsolete/usrloc/reg_avps_db.h Removed: misc/obsolete/usrloc/ucontact.c Removed: misc/obsolete/usrloc/ucontact.h Removed: misc/obsolete/usrloc/udomain.c Removed: misc/obsolete/usrloc/udomain.h Removed: misc/obsolete/usrloc/ul_callback.c Removed: misc/obsolete/usrloc/ul_callback.h Removed: misc/obsolete/usrloc/ul_mod.c Removed: misc/obsolete/usrloc/ul_mod.h Removed: misc/obsolete/usrloc/ul_rpc.c Removed: misc/obsolete/usrloc/ul_rpc.h Removed: misc/obsolete/usrloc/urecord.c Removed: misc/obsolete/usrloc/urecord.h Removed: misc/obsolete/usrloc/usrloc.c Removed: misc/obsolete/usrloc/usrloc.h Removed: misc/obsolete/usrloc/utime.c Removed: misc/obsolete/usrloc/utime.h Removed: misc/obsolete/xcap/ChangeLog Removed: misc/obsolete/xcap/Makefile Removed: misc/obsolete/xcap/README Removed: misc/obsolete/xcap/doc/Makefile Removed: misc/obsolete/xcap/doc/functions.xml Removed: misc/obsolete/xcap/doc/params.xml Removed: misc/obsolete/xcap/doc/xcap.xml Removed: misc/obsolete/xcap/xcap_mod.c Removed: misc/obsolete/xcap/xcap_mod.h Removed: misc/obsolete/xcap/xcap_params.c Removed: misc/obsolete/xcap/xcap_params.h --- Diff: https://github.com/kamailio/kamailio/commit/eff1e2c6a2ccceae1ddfc81298cbdcc… Patch: https://github.com/kamailio/kamailio/commit/eff1e2c6a2ccceae1ddfc81298cbdcc…

1 0

git:master:8deecb1a: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: 8deecb1aef4ee33d12ee0da68bf3585162284820 URL: https://github.com/kamailio/kamailio/commit/8deecb1aef4ee33d12ee0da68bf3585… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-09T09:16:30+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/8deecb1aef4ee33d12ee0da68bf3585… Patch: https://github.com/kamailio/kamailio/commit/8deecb1aef4ee33d12ee0da68bf3585… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 07362dd852..581aaca80a 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -134,7 +134,8 @@ Sven Knoblich 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) - 7.3. acc_diam_request(comment) + 7.3. acc_request(comment, table) + 7.4. acc_diam_request(comment) 2. Frequently Asked Questions @@ -192,7 +193,8 @@ Sven Knoblich 1.50. cdr_on_failed 1.51. acc_log_request usage 1.52. acc_db_request usage - 1.53. acc_diam_request usage + 1.53. acc_db_request usage + 1.54. acc_diam_request usage Chapter 1. Admin Guide @@ -292,7 +294,8 @@ Chapter 1. Admin Guide 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) - 7.3. acc_diam_request(comment) + 7.3. acc_request(comment, table) + 7.4. acc_diam_request(comment) 1. Overview @@ -1342,7 +1345,8 @@ modparam("acc", "cdr_on_failed", 0) 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) - 7.3. acc_diam_request(comment) + 7.3. acc_request(comment, table) + 7.4. acc_diam_request(comment) 7.1. acc_log_request(comment) @@ -1386,7 +1390,31 @@ acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); acc_db_request("$var(code) Error: $avp(reason)", "SomeTable"); ... -7.3. acc_diam_request(comment) +7.3. acc_request(comment, table) + + Warapper around acc_log_request and acc_db_request functions, writing + the accounting record to LOG and DATABASE backends. If “db_url” + parameter is not set, the acc record is written only to LOG backend. + + Meaning of the parameters is as follows: + * comment - Comment to be used for generating the SIP response code + and text fields, if in the format “CODE TEXT”. The CODE should be a + valid SIP response code (100..699). The TEXT can be one or many + words. If CODE is missing, then 0 is used. The parameter can + contain pseudo-variables. + * table - Database table to be used. It can contain config variables + that are evaluated at runtime. + + This function can be used from ANY_ROUTE. + + Example 1.53. acc_db_request usage +... +acc_request("100 Received", "acc"); +acc_request("100 Received", "acc_$time(year)_$time(mon)"); +acc_db_request("$var(code) $avp(reason)", "acc"); +... + +7.4. acc_diam_request(comment) Like acc_log_request, acc_diam_request reports on a request. It reports to the configured Diameter server. @@ -1397,7 +1425,7 @@ acc_db_request("$var(code) Error: $avp(reason)", "SomeTable"); This function can be used from ANY_ROUTE. - Example 1.53. acc_diam_request usage + Example 1.54. acc_diam_request usage ... acc_diam_request("Some comment"); acc_diam_request("$var(code) Error: $avp(reason)");

1 0

git:master:4a545bac: acc: documented acc_request() function
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: 4a545bacf6517663830ca455b61a12ff38b22fe8 URL: https://github.com/kamailio/kamailio/commit/4a545bacf6517663830ca455b61a12f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T09:12:50+02:00 acc: documented acc_request() function --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a545bacf6517663830ca455b61a12f… Patch: https://github.com/kamailio/kamailio/commit/4a545bacf6517663830ca455b61a12f…

1 0

git:master:42bdac92: acc: added acc_request(reason, table)
by Daniel-Constantin Mierla 09 Aug '17

09 Aug '17

Module: kamailio Branch: master Commit: 42bdac92d1ad2f58d7c21f98c3b8483e86a39fb8 URL: https://github.com/kamailio/kamailio/commit/42bdac92d1ad2f58d7c21f98c3b8483… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-09T08:59:00+02:00 acc: added acc_request(reason, table) - wrapper around acc_log_request() and acc_db_request(), writting acc record to log and db backend (if db_url is set) --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_logic.c Modified: src/modules/acc/acc_logic.h Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42bdac92d1ad2f58d7c21f98c3b8483… Patch: https://github.com/kamailio/kamailio/commit/42bdac92d1ad2f58d7c21f98c3b8483…

1 0

[kamailio/kamailio] path: rr_callback wrong dst uri (#1205)
by Rick 09 Aug '17

09 Aug '17

### Description Im using the path module on loadbalancer, the update to the path module, seems to break the default behavior.  ### Troubleshooting #### Reproduction ``` /* ----- rr params --------------------------------------------------------- */ /** add value to ;lr param (helps with some UAs) */ modparam("rr", "enable_full_lr", 1) modparam("rr", "append_fromtag", 1) /* ----- maxfwd params ----------------------------------------------------- */ modparam("maxfwd", "max_limit", 70) /* ----- path params ------------------------------------------------------- */ modparam("path", "use_received", 1) ``` #### Debugging Data #### Log Messages  ``` 2(71369) DEBUG: rr [loose.c:85]: is_preloaded(): is_preloaded: Yes 2(71369) DEBUG: <core> [core/socket_info.c:564]: grep_sock_info(): checking if host==us: 12==12 && [x.x.x.126] == [x.x.x.126] 2(71369) DEBUG: <core> [core/socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 0) matches port 5060 2(71369) DEBUG: rr [loose.c:788]: after_loose(): Topmost route URI: 'sip:x.x.x.126;lr;received=sip:y.y.y.y:47056%3Btransport%3Dtls' is me 2(71369) DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header 2(71369) DEBUG: rr [loose.c:180]: find_next_route(): No next Route HF found 2(71369) DEBUG: rr [loose.c:813]: after_loose(): No next URI found 2(71369) DEBUG: rr [rr_cb.c:95]: run_rr_callbacks(): callback id 0 entered with <lr;received=sip:y.y.y.y:47056%3Btransport%3Dtls> 2(71369) DEBUG: <core> [core/strutils.c:214]: unescape_user(): unescaped string is <sip:y.y.y.y:47056;transport=tls> 2(71369) DEBUG: path [path.c:424]: path_rr_callback(): setting dst uri: sip:sip:y.y.y.y:47056%3Btranspo 2(71369) DEBUG: pv [pv_core.c:951]: pv_get_useragent(): no User-Agent header 2(71369) DEBUG: rr [loose.c:1068]: check_route_param(): route params checking against [;lr;received=sip:y.y.y.y:47056%3Btransport%3Dtls] (orig: [lr;received=sip:y.y.y.y:47056%3Btransport%3Dtls]) 2(71369) DEBUG: rr [loose.c:1073]: check_route_param(): params are <;lr;received=sip:y.y.y.y:47056%3Btransport%3Dtls> 2(71369) DEBUG: tm [t_lookup.c:1302]: t_newtran(): msg id=4 , global msg id=4 , T on entrance=0x0 2(71369) DEBUG: tm [t_lookup.c:459]: t_lookup_request(): start searching: hash=16463, isACK=0 2(71369) DEBUG: tm [t_lookup.c:417]: matching_3261(): RFC3261 transaction matching failed 2(71369) DEBUG: tm [t_lookup.c:641]: t_lookup_request(): no transaction found 2(71369) DEBUG: <core> [core/md5utils.c:67]: MD5StringArray(): MD5 calculated: 076837eff630cf1e80bed191da066432 2(71369) DEBUG: <core> [core/parser/parse_uri.c:1262]: parse_uri(): parse_uri: bad char ':' in state 3 parsed: <sip:sip:y.y.y.y> (21) / <sip:sip:y.y.y.y:47056%3Btranspo> (37) 2(71369) ERROR: tm [./ut.h:245]: uri2dst2(): bad_uri: [sip:sip:y.y.y.y:47056%3Btranspo] 2(71369) ERROR: tm [t_fwd.c:1735]: t_forward_nonack(): failure to add branches 2(71369) DEBUG: tm [t_funcs.c:330]: t_relay_to(): t_forward_nonack returned error -478 (-478) 2(71369) DEBUG: tm [t_funcs.c:348]: t_relay_to(): -478 error reply generation delayed 2(71369) DEBUG: <core> [core/msg_translator.c:159]: check_via_address(): (x.x.x.124, x.x.x.124, 0) 2(71369) ERROR: sl [sl_funcs.c:362]: sl_reply_error(): stateless error reply used: Unresolvable destination (478/SL) 2(71369) DEBUG: <core> [core/receive.c:283]: receive_msg(): request-route executed in: 2594 usec 2(71369) DEBUG: tm [t_lookup.c:1458]: t_unref(): delayed error reply generation(-478) 2(71369) DEBUG: <core> [core/msg_translator.c:159]: check_via_address(): (x.x.x.124, x.x.x.124, 0) 2(71369) DEBUG: tm [t_reply.c:1631]: cleanup_uac_timers(): RETR/FR timers reset 2(71369) DEBUG: tm [t_reply.c:598]: _reply_light(): reply sent out. buf=0x8018e77b0: SIP/2.0 478 Unresolv..., shmem=0x8086bbc30: SIP/2.0 478 Unresolv 2(71369) DEBUG: tm [t_reply.c:608]: _reply_light(): finished ``` #### SIP Traffic  ``` 2017/08/04 10:27:55.690224 x.x.x.124:5060 -> x.x.x.126:5060 OPTIONS sip:user@y.y.y.y:43098;transport=TLS SIP/2.0 Via: SIP/2.0/UDP x.x.x.124:5060;branch=z9hG4bK2840489 Route: <sip:x.x.x.126;lr;received=sip:y.y.y.y:43098%3Btransport%3Dtls> From: sip:pinger@hostname-xxx;tag=uloc-7c-5982da6d-4c09-11-0-7d68 To: sip:user@y.y.y.y:43098;transport=TLS Call-ID: 1e57ca12-c3d5f614-8b5c49(a)5.159.56.124 CSeq: 1 OPTIONS Content-Length: 0 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.1.0-dev5 (x86_64/freebsd) 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, 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, select, kqueue. id: unknown compiled on 23:35:16 Aug 3 2017 with clang 3.8 ``` * **Operating System**:  ``` # uname -a FreeBSD hostname-xxx 11.0-RELEASE-p9 FreeBSD 11.0-RELEASE-p9 #0: Tue Apr 11 08:48:40 UTC 2017 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 ``` -- 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/1205

2 9

git:master:5989ab74: path: fix offset to set ending 0 for received_format=1
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 5989ab742685840019dea65c34df7a535d3950b8 URL: https://github.com/kamailio/kamailio/commit/5989ab742685840019dea65c34df7a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T21:35:06+02:00 path: fix offset to set ending 0 for received_format=1 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/5989ab742685840019dea65c34df7a5… Patch: https://github.com/kamailio/kamailio/commit/5989ab742685840019dea65c34df7a5… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 01d49253ec..2f1d84e8e2 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -387,7 +387,7 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) strncpy(dst_uri_buf, "sip:", 4); strncpy(dst_uri_buf+4, hooks.contact.received->body.s, hooks.contact.received->body.len); - dst_uri_buf[hooks.contact.received->body.len] = '\0'; + dst_uri_buf[4+hooks.contact.received->body.len] = '\0'; p = dst_uri_buf + 4; n = 0; while(*p!='\0') {

1 0

git:master:557bbe30: http_async_client: named addition processes http async worker
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 557bbe3042b31b8087d40a41b9d304e731ce06b9 URL: https://github.com/kamailio/kamailio/commit/557bbe3042b31b8087d40a41b9d304e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T17:19:47+02:00 http_async_client: named addition processes http async worker - reflects better the module --- Modified: src/modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/557bbe3042b31b8087d40a41b9d304e… Patch: https://github.com/kamailio/kamailio/commit/557bbe3042b31b8087d40a41b9d304e… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index c1f0f1d1df..ed52110d04 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -346,7 +346,7 @@ static int child_init(int rank) LM_ERR("failed to initialize worker process: %d\n", i); return -1; } - pid=fork_process(PROC_RPC, "Http Worker", 1); + pid=fork_process(PROC_RPC, "Http Async Worker", 1); if (pid<0) return -1; /* error */ if(pid==0) {

1 0

git:master:5f5697ea: http_async_client: safety check for shm malloc and do cfg_update()
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 5f5697eac0089e9e2bc72323c6afa839b472ccbd URL: https://github.com/kamailio/kamailio/commit/5f5697eac0089e9e2bc72323c6afa83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T17:20:33+02:00 http_async_client: safety check for shm malloc and do cfg_update() --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/5f5697eac0089e9e2bc72323c6afa83… Patch: https://github.com/kamailio/kamailio/commit/5f5697eac0089e9e2bc72323c6afa83… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 5c1d249ff3..5057908478 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -70,6 +70,10 @@ int async_http_init_worker(int prank, async_http_worker_t* worker) LM_DBG("base event %p created\n", worker->evbase); worker->g = shm_malloc(sizeof(struct http_m_global)); + if(worker->g==NULL) { + LM_ERR("out of shared memory\n"); + return -1; + } memset(worker->g, 0, sizeof(http_m_global_t)); LM_DBG("initialized global struct %p\n", worker->g); @@ -189,6 +193,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) strncpy(q_id, aq->id, strlen(aq->id)); act = (cfg_action_t*)aq->param; + cfg_update(); if (aq->query_params.suspend_transaction) { tindex = aq->tindex;

1 0

git:master:f4fa3104: topos: link sip message attributes before PRACK handling
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: f4fa310479ce824c9fd68a7ef443102c30a0c171 URL: https://github.com/kamailio/kamailio/commit/f4fa310479ce824c9fd68a7ef443102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T17:02:38+02:00 topos: link sip message attributes before PRACK handling --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/f4fa310479ce824c9fd68a7ef443102… Patch: https://github.com/kamailio/kamailio/commit/f4fa310479ce824c9fd68a7ef443102… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 8adfa31129..ca360a975c 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -763,6 +763,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) tps_storage_lock_get(&lkey); if((get_cseq(msg)->method_id)&(METHOD_PRACK)) { + if(tps_storage_link_msg(msg, &mtsd, TPS_DIR_DOWNSTREAM)<0) { + goto error; + } if(tps_storage_load_branch(msg, &mtsd, &stsd, 1)<0) { goto error; } diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 2336687a75..c10c3f2699 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -102,6 +102,8 @@ int tps_storage_lock_get(str *lkey); int tps_storage_lock_release(str *lkey); int tps_storage_lock_set_destroy(void); +int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir); + void tps_storage_clean(unsigned int ticks, void* param); #endif

1 0

git:master:39a72c3c: core: mem_safety enabled by default
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 39a72c3c000aef00a937863a221ecc7245e1c43a URL: https://github.com/kamailio/kamailio/commit/39a72c3c000aef00a937863a221ecc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T14:54:06+02:00 core: mem_safety enabled by default --- Modified: src/core/cfg_core.c --- Diff: https://github.com/kamailio/kamailio/commit/39a72c3c000aef00a937863a221ecc7… Patch: https://github.com/kamailio/kamailio/commit/39a72c3c000aef00a937863a221ecc7… --- diff --git a/src/core/cfg_core.c b/src/core/cfg_core.c index 5f7f2d7dde..f0e39548f9 100644 --- a/src/core/cfg_core.c +++ b/src/core/cfg_core.c @@ -113,7 +113,7 @@ struct cfg_group_core default_core_cfg = { L_DBG+1, /*!< memlog */ 3, /*!< mem_summary -flags: 0 off, 1 pkg_status, 2 shm_status, 4 pkg_sums, 8 shm_sums, 16 short_status */ - 0, /*!< mem_safety - 0 disabled */ + 1, /*!< mem_safety - 0 disabled; 1 enabled */ 0, /*!< mem_join - 0 disabled */ 0, /*!< mem_status_mode - 0 only free fragments, 1 all fragements */ L_ERR, /*!< corelog */

1 0

[kamailio/kamailio] alias=forward.ng-voice.com doesn't work (#1207)
by ng-voice GmbH 08 Aug '17

08 Aug '17

### Description I am currently implementing a dynamic forwarding server in Kamailio. As a logic consequence, I wanted to name it "forward.ng-voice.com" and I added it as an Alias: alias=forward.ng-voice.com #### Reproduction Add any Alias with the "forward" in it's domain-name (e.g. "ims.forward.ng-voice.com" fails too). #### Log Messages ``` 0(20620) CRITICAL: <core> [core/cfg.y:3427]: yyerror_at(): parse error in config file forward.cfg, line 11, column 7-13: syntax error 0(20620) CRITICAL: <core> [core/cfg.y:3427]: yyerror_at(): parse error in config file forward.cfg, line 11, column 7-13: hostname expected 0(20620) CRITICAL: <core> [core/cfg.y:3430]: yyerror_at(): parse error in config file forward.cfg, line 11, column 14: ``` ### Possible Solutions Use a different Domain-Name like "fwd" or "forwarder". ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.0-dev5 (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 4.9.2 ``` * **Operating System**: Debian 8 -- 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/1207

3 5

git:master:b84e680f: topos_redis: update the signature for branch record loading function
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: b84e680f9ccb7b6f1e2fa917ced3d5d82147d9ea URL: https://github.com/kamailio/kamailio/commit/b84e680f9ccb7b6f1e2fa917ced3d5d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T14:21:55+02:00 topos_redis: update the signature for branch record loading function --- Modified: src/modules/topos_redis/topos_redis_storage.c Modified: src/modules/topos_redis/topos_redis_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/b84e680f9ccb7b6f1e2fa917ced3d5d… Patch: https://github.com/kamailio/kamailio/commit/b84e680f9ccb7b6f1e2fa917ced3d5d… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index e32fd445b1..7753cd89c8 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -440,7 +440,8 @@ int tps_redis_clean_branches(void) /** * */ -int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) +int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, + uint32_t mode) { char* argv[TPS_REDIS_NR_KEYS]; size_t argvlen[TPS_REDIS_NR_KEYS]; diff --git a/src/modules/topos_redis/topos_redis_storage.h b/src/modules/topos_redis/topos_redis_storage.h index 674b50d39a..aa4631bddb 100644 --- a/src/modules/topos_redis/topos_redis_storage.h +++ b/src/modules/topos_redis/topos_redis_storage.h @@ -36,7 +36,8 @@ int tps_redis_insert_dialog(tps_data_t *td); int tps_redis_clean_dialogs(void); int tps_redis_insert_branch(tps_data_t *td); int tps_redis_clean_branches(void); -int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); +int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, + uint32_t mode); int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, uint32_t mode);

1 0

git:master:4c5419d6: topos: load INVITE transaction record when processing PRACK
by Daniel-Constantin Mierla 08 Aug '17

08 Aug '17

Module: kamailio Branch: master Commit: 4c5419d6f9a9a7a7b48ba1269b52d95923582083 URL: https://github.com/kamailio/kamailio/commit/4c5419d6f9a9a7a7b48ba1269b52d95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-08T14:21:15+02:00 topos: load INVITE transaction record when processing PRACK --- Modified: src/modules/topos/api.h Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/4c5419d6f9a9a7a7b48ba1269b52d95… Patch: https://github.com/kamailio/kamailio/commit/4c5419d6f9a9a7a7b48ba1269b52d95…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev