sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

git:master:ee6b0607: ims_auth: print ck in readable form for debug reasons and init hbody to 0 to avoid printing gibberish in the log
by Dragos Oancea 19 Jul '16

19 Jul '16

Module: kamailio Branch: master Commit: ee6b060701f5a05958fc1822ccf8b62920bb0124 URL: https://github.com/kamailio/kamailio/commit/ee6b060701f5a05958fc1822ccf8b62… Author: Dragos Oancea <dragos.oancea(a)athonet.com> Committer: Dragos Oancea <dragos.oancea(a)athonet.com> Date: 2016-07-15T14:54:37+02:00 ims_auth: print ck in readable form for debug reasons and init hbody to 0 to avoid printing gibberish in the log --- Modified: modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/ee6b060701f5a05958fc1822ccf8b62… Patch: https://github.com/kamailio/kamailio/commit/ee6b060701f5a05958fc1822ccf8b62… --- diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c index 595132f..8343de4 100644 --- a/modules/ims_auth/authorize.c +++ b/modules/ims_auth/authorize.c @@ -727,7 +727,7 @@ int authenticate(struct sip_msg* msg, char* _realm, char* str2, int is_proxy_aut str nonce, response16, nc, cnonce, qop_str = {0, 0}, auts = {0, 0}, body, *next_nonce = &empty_s; enum qop_type qop = QOP_UNSPEC; str uri = {0, 0}; - HASHHEX expected, ha1, hbody, rspauth; + HASHHEX expected, ha1, hbody = {0}, rspauth; int expected_len = 32; int expires = 0; auth_vector *av = 0; @@ -1152,6 +1152,8 @@ void auth_data_destroy() { auth_vector * new_auth_vector(int item_number, str auth_scheme, str authenticate, str authorization, str ck, str ik) { auth_vector *x = 0; + char base16_ck[32+1] = {0}; + int base16_ck_len = 0; x = shm_malloc(sizeof (auth_vector)); if (!x) { LM_ERR("error allocating mem\n"); @@ -1305,7 +1307,9 @@ auth_vector * new_auth_vector(int item_number, str auth_scheme, str authenticate x->status = AUTH_VECTOR_UNUSED; x->expires = 0; - LM_DBG("new auth-vector with ck [%.*s] with status %d\n", x->ck.len, x->ck.s, x->status); + base16_ck_len = bin_to_base16(x->ck.s, 16, base16_ck); + if (base16_ck_len) + LM_DBG("new auth-vector with ck [%s] with status %d\n", base16_ck, x->status); done: return x;

1 0

[kamailio/kamailio] ims_auth: print ck in readable form and init var to 0 to avoid printing gibberish in the log (#711)
by Dragos Oancea 19 Jul '16

19 Jul '16

These changes help with debugging , for example I may need to grep for ck in the scscf log in my environment. Also, hbody prints gibberish when qop=auth . You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/711 -- Commit Summary -- * ims_auth: print ck in readable form for debug reasons and init hbody to 0 to avoid printing gibberish in the log -- File Changes -- M modules/ims_auth/authorize.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/711.patch https://github.com/kamailio/kamailio/pull/711.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/711

2 1

git:master:134fcbd3: presence: fix potential double free in shutdown routine
by IMS root 19 Jul '16

19 Jul '16

Module: kamailio Branch: master Commit: 134fcbd3b2fbb91e4206cceb1de9d1a3a0690ef6 URL: https://github.com/kamailio/kamailio/commit/134fcbd3b2fbb91e4206cceb1de9d1a… Author: IMS root <root@IMS> Committer: IMS root <root@IMS> Date: 2016-07-19T18:08:47+02:00 presence: fix potential double free in shutdown routine --- Modified: modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/134fcbd3b2fbb91e4206cceb1de9d1a… Patch: https://github.com/kamailio/kamailio/commit/134fcbd3b2fbb91e4206cceb1de9d1a… --- diff --git a/modules/presence/hash.c b/modules/presence/hash.c index 5c30291..50657e0 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -318,9 +318,14 @@ int delete_shtable(shtable_t htable,unsigned int hash_code,subs_t* subs) { found= s->local_cseq +1; ps->next= s->next; - if(s->contact.s!=NULL) + if(s->contact.s!=NULL) { shm_free(s->contact.s); - shm_free(s); + s->contact.s = NULL; + } + if (s) { + shm_free(s); + s = NULL; + } break; } ps= s;

1 0

git:master:3f92119f: Merge pull request #717 from athonet-open/fix_shutdown_presence
by GitHub 19 Jul '16

19 Jul '16

Module: kamailio Branch: master Commit: 3f92119fe168baf516738be4be8142bd2c467760 URL: https://github.com/kamailio/kamailio/commit/3f92119fe168baf516738be4be8142b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-19T22:01:01+02:00 Merge pull request #717 from athonet-open/fix_shutdown_presence presence: fix potential double free in shutdown routine --- Modified: modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/3f92119fe168baf516738be4be8142b… Patch: https://github.com/kamailio/kamailio/commit/3f92119fe168baf516738be4be8142b… --- diff --git a/modules/presence/hash.c b/modules/presence/hash.c index 5c30291..50657e0 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -318,9 +318,14 @@ int delete_shtable(shtable_t htable,unsigned int hash_code,subs_t* subs) { found= s->local_cseq +1; ps->next= s->next; - if(s->contact.s!=NULL) + if(s->contact.s!=NULL) { shm_free(s->contact.s); - shm_free(s); + s->contact.s = NULL; + } + if (s) { + shm_free(s); + s = NULL; + } break; } ps= s;

1 0

[kamailio/kamailio] presence: fix potential double free in shutdown routine (#717)
by Dragos Oancea 19 Jul '16

19 Jul '16

Attempt to fix this (crash at shutdown) : I observed some of these while working with daemontools (svc) . Program terminated with signal 6, Aborted. #0 0x00007f43e6fd5125 in raise () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) (gdb) (gdb) bt #0 0x00007f43e6fd5125 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f43e6fd83a0 in abort () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x0000000000628b52 in qm_free (qm=0x7f43d547e000, p=0x7f43d57f5208, file=0x7f43e02d60a0 "presence: hash.c", func=0x7f43e02d69aa "delete_shtable", line=316) at mem/q_malloc.c:455 #3 0x00007f43e0244504 in delete_shtable (htable=0x7f43d5782e00, hash_code=431, subs=0x7fffda33b830) at hash.c:316 #4 0x00007f43d4507856 in free_subscriber (s=0x7f43d57f8390) at subscribe.c:391 #5 0x00007f43d44ec7db in free_impurecord (_r=0x7f43d57f1268) at impurecord.c:192 #6 0x00007f43d44e7ef3 in deinit_slot (_s=0x7f43d57ddc98) at hslot.c:172 #7 0x00007f43d451018d in free_udomain (_d=0x7f43d57db308) at udomain.c:136 #8 0x00007f43d44e6f23 in free_all_udomains () at dlist.c:361 #9 0x00007f43d45215db in destroy () at ul_mod.c:476 #10 0x000000000059bf98 in destroy_modules () at sr_module.c:817 #11 0x00000000004a113a in cleanup (show_status=1) at main.c:513 #12 0x00000000004a272e in shutdown_children (sig=15, show_status=1) at main.c:655 #13 0x00000000004a30d3 in handle_sigs () at main.c:685 #14 0x00000000004acbac in main_loop () at main.c:1705 #15 0x00000000004b21b2 in main (argc=14, argv=0x7fffda33c208) at main.c:2553 (gdb) bt full #0 0x00007f43e6fd5125 in raise () from /lib/x86_64-linux-gnu/libc.so.6 No symbol table info available. #1 0x00007f43e6fd83a0 in abort () from /lib/x86_64-linux-gnu/libc.so.6 No symbol table info available. #2 0x0000000000628b52 in qm_free (qm=0x7f43d547e000, p=0x7f43d57f5208, file=0x7f43e02d60a0 "presence: hash.c", func=0x7f43e02d69aa "delete_shtable", line=316) at mem/q_malloc.c:455 f = 0x7f43d57f51d8 size = 140736854210624 next = 0x400 prev = 0x7fffda33b750 __FUNCTION__ = "qm_free" #3 0x00007f43e0244504 in delete_shtable (htable=0x7f43d5782e00, hash_code=431, subs=0x7fffda33b830) at hash.c:316 s = 0x7f43d57efba0 ps = 0x7f43d57b1838 found = 1 __FUNCTION__ = "delete_shtable" #4 0x00007f43d4507856 in free_subscriber (s=0x7f43d57f8390) at subscribe.c:391 hash_code = 431 subs = {pres_uri = {s = 0x7f43d57f84f2 "sip:214010000050069@ims.mnc001.mcc214.3gppnetwork.org1\300\300\300\300", len = 53}, to_user = {s = 0x0, len = 0}, to_domain = {s = 0x0, len = 0}, from_user = {s = 0x0, len = 0}, from_domain = {s = 0x0, len = 0}, watcher_user = {s = 0x0, len = 0}, watcher_domain = {s = 0x0, len = 0}, event = 0x0, event_id = {s = 0x0, len = 0}, to_tag = { s = 0x7f43d57f8462 "cb50c8efee1a044116f39e700af3e3ce-d61e55392518-578E4CA500085B76-8364E700tel:+12450069sip:172.17.140.164:5080;transport=udpudp:172.17.140.163:5060sip:214010000050069@ims.mnc001.mcc214.3gppnetwork.org1\300\300"..., len = 37}, from_tag = { s = 0x7f43d57f8487 "55392518-578E4CA500085B76-8364E700tel:+12450069sip:172.17.140.164:5080;transport=udpudp:172.17.140.163:5060sip:214010000050069@ims.mnc001.mcc214.3gppnetwork.org1\300\300\300\300", len = 34}, callid = { s = 0x7f43d57f8440 "69ADAB12-578E4CA500085B8C-8364E700cb50c8efee1a044116f39e700af3e3ce-d61e55392518-578E4CA500085B76-8364E700tel:+12450069sip:172.17.140.164:5080;transport=udpudp:172.17.140.163:5060sip:214010000050069@im"..., len = 34}, sockinfo_str = {s = 0x0, len = 0}, remote_cseq = 0, local_cseq = 0, contact = {s = 0x0, len = 0}, local_contact = {s = 0x0, len = 0}, record_route = {s = 0x0, len = 0}, expires = 0, status = 0, reason = {s = 0x0, len = 0}, version = 0, send_on_cback = 0, db_flag = 0, auth_rules_doc = 0x0, recv_event = 0, internal_update_flag = 0, updated = 0, updated_winfo = 0, next = 0x0} __FUNCTION__ = "free_subscriber" #5 0x00007f43d44ec7db in free_impurecord (_r=0x7f43d57f1268) at impurecord.c:192 cbp = 0x418a10 cbp_tmp = 0x7f43d5779680 subscriber = 0x7f43d57f8390 s_tmp = 0x0 __FUNCTION__ = "free_impurecord" #6 0x00007f43d44e7ef3 in deinit_slot (_s=0x7f43d57ddc98) at hslot.c:172 ptr = 0x7f43d57f1268 #7 0x00007f43d451018d in free_udomain (_d=0x7f43d57db308) at udomain.c:136 i = 219 __FUNCTION__ = "free_udomain" ---Type <return> to continue, or q <return> to quit--- #8 0x00007f43d44e6f23 in free_all_udomains () at dlist.c:361 ptr = 0x7f43d57db218 __FUNCTION__ = "free_all_udomains" #9 0x00007f43d45215db in destroy () at ul_mod.c:476 __FUNCTION__ = "destroy" #10 0x000000000059bf98 in destroy_modules () at sr_module.c:817 t = 0x7f43e30097c0 foo = 0x7f43e3009410 __FUNCTION__ = "destroy_modules" #11 0x00000000004a113a in cleanup (show_status=1) at main.c:513 memlog = 32579 __FUNCTION__ = "cleanup" #12 0x00000000004a272e in shutdown_children (sig=15, show_status=1) at main.c:655 __FUNCTION__ = "shutdown_children" #13 0x00000000004a30d3 in handle_sigs () at main.c:685 chld = -713157656 chld_status = 0 memlog = 0 __FUNCTION__ = "handle_sigs" #14 0x00000000004acbac in main_loop () at main.c:1705 i = 1 pid = 5816 si = 0x0 si_desc = "udp receiver child=0 sock=172.17.140.163:5060\000\000\000\000\302\063\332\377\177", '\000' <repeats 18 times>, "`\327\a\347C\177\000\000\060\000\000\000\060\000\000\000\220\337\f\343C\177\000\000\240\276\063\332\377\177\000\000(5K\325C\177\000\000\000\302\063\332\377\177\000\000\000\000\000\000\001\000\000" nrprocs = 1 __FUNCTION__ = "main_loop" #15 0x00000000004b21b2 in main (argc=14, argv=0x7fffda33c208) at main.c:2553 cfg_stream = 0x1c03010 c = -1 r = 0 tmp = 0x7fffda33df21 "" tmp_len = 0 port = 0 proto = 0 options = 0x71c738 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" ret = -1 seed = 2748507928 rfd = 4 debug_save = 0 debug_flag = 0 ---Type <return> to continue, or q <return> to quit--- dont_fork_cnt = 2 n_lst = 0x76 p = 0x0 st = {st_dev = 15, st_ino = 13169, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1468413462, tv_nsec = 449607667}, st_mtim = {tv_sec = 1468244570, tv_nsec = 131567607}, st_ctim = {tv_sec = 1468244570, tv_nsec = 131567607}, __unused = {0, 0, 0}} __FUNCTION__ = "main" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/717 -- Commit Summary -- * presence: fix potential double free in shutdown routine -- File Changes -- M modules/presence/hash.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/717.patch https://github.com/kamailio/kamailio/pull/717.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/717

2 2

Errored: kamailio/kamailio#2758 (master - ab27f98)
by Travis CI 19 Jul '16

19 Jul '16

Build Update for kamailio/kamailio ------------------------------------- Build: #2758 Status: Errored Duration: 8 minutes and 38 seconds Commit: ab27f98 (master) Author: Daniel-Constantin Mierla Message: topos: skip options from contact header check - reported by Daren Crew, GH #715 View the changeset: https://github.com/kamailio/kamailio/compare/966513b374ee...ab27f988cffc View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/145827864 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:ab27f988: topos: skip options from contact header check
by Daniel-Constantin Mierla 19 Jul '16

19 Jul '16

Module: kamailio Branch: master Commit: ab27f988cffcbd060ca84abd118050cb3c5c923f URL: https://github.com/kamailio/kamailio/commit/ab27f988cffcbd060ca84abd118050c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-19T15:36:43+02:00 topos: skip options from contact header check - reported by Daren Crew, GH #715 --- Modified: modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/ab27f988cffcbd060ca84abd118050c… Patch: https://github.com/kamailio/kamailio/commit/ab27f988cffcbd060ca84abd118050c… --- diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index 8951ee1..9d59e5a 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -298,7 +298,8 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) /* extract the contact address */ if(parse_headers(msg, HDR_CONTACT_F, 0)<0 || msg->contact==NULL) { - if(td->s_method_id == METHOD_MESSAGE) { + if(td->s_method_id == METHOD_MESSAGE + || td->s_method_id == METHOD_OPTIONS) { /* no contact required for MESSAGE - done */ return 0; }

1 0

git:master:966513b3: tls: print ssl memory functions if they cannot be set
by Daniel-Constantin Mierla 18 Jul '16

18 Jul '16

Module: kamailio Branch: master Commit: 966513b374eef598434c5310a43eac2735adfd2e URL: https://github.com/kamailio/kamailio/commit/966513b374eef598434c5310a43eac2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-18T10:43:48+02:00 tls: print ssl memory functions if they cannot be set --- Modified: modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/966513b374eef598434c5310a43eac2… Patch: https://github.com/kamailio/kamailio/commit/966513b374eef598434c5310a43eac2… --- diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 9517329..ece8863 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -478,6 +478,9 @@ static int init_tls_compression(void) */ int tls_pre_init(void) { + void *(*mf)(size_t) = NULL; + void *(*rf)(void *, size_t) = NULL; + void (*ff)(void *) = NULL; /* * this has to be called before any function calling CRYPTO_malloc, * CRYPTO_malloc will set allow_customize in openssl to 0 @@ -488,6 +491,8 @@ int tls_pre_init(void) if (!CRYPTO_set_mem_functions(ser_malloc, ser_realloc, ser_free)) { #endif ERR("Unable to set the memory allocation functions\n"); + CRYPTO_get_mem_functions(&mf, &rf, &ff); + ERR("libssl current mem functions - m: %p r: %p f: %p\n", mf, rf, ff); ERR("Be sure tls module is loaded before any other module using libssl" " (can be loaded first to be safe)\n"); return -1;

1 0

git:master:98a86787: dialplan: remove unused var from cfg reload function
by Daniel-Constantin Mierla 18 Jul '16

18 Jul '16

Module: kamailio Branch: master Commit: 98a86787bb0c8dffb737f9f8408207780fb14f0d URL: https://github.com/kamailio/kamailio/commit/98a86787bb0c8dffb737f9f84082077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-18T08:10:20+02:00 dialplan: remove unused var from cfg reload function -reported by Juha Heinanen --- Modified: modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/98a86787bb0c8dffb737f9f84082077… Patch: https://github.com/kamailio/kamailio/commit/98a86787bb0c8dffb737f9f84082077… --- diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index a0c679a..258dd53 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -455,10 +455,11 @@ static int dp_trans_fixup(void ** param, int param_no){ return E_INVALID_PARAMS; } +/** + * trigger reload of dialplan db records from config file + */ static int dp_reload_f(struct sip_msg* msg) { - struct mi_root* rpl_tree= NULL; - if (dp_connect_db() < 0) { LM_ERR("failed to reload rules fron database (db connect)\n"); return -1;

1 0

unused var
by Juha Heinanen 18 Jul '16

18 Jul '16

latest master gives this: CC (gcc) [M dialplan.so] dialplan.o dialplan.c: In function 'dp_reload_f': dialplan.c:460:18: warning: unused variable 'rpl_tree' [-Wunused-variable] struct mi_root* rpl_tree= NULL; ^ -- juha

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016