sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:e88ea402: ims_registrar_pcscf: fix getContactP() for is_registered_fallback2ip param - so that script function pcscf_is_registered() actually finds the contact .

by Dragos Oancea

Module: kamailio Branch: master Commit: e88ea4022af341bb67e959c42d2096a42ae3796d URL: https://github.com/kamailio/kamailio/commit/e88ea4022af341bb67e959c42d2096a… Author: Dragos Oancea <dragos.oancea(a)athonet.com> Committer: Dragos Oancea <dragos.oancea(a)athonet.com> Date: 2016-05-31T10:52:18+02:00 ims_registrar_pcscf: fix getContactP() for is_registered_fallback2ip param - so that script function pcscf_is_registered() actually finds the contact . --- Modified: modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/e88ea4022af341bb67e959c42d2096a… Patch: https://github.com/kamailio/kamailio/commit/e88ea4022af341bb67e959c42d2096a… --- diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 3d29d61..bcdb368 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -228,6 +228,9 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d, enum pcontact_reg_st search_ci.received_port = _m->rcv.src_port; search_ci.received_proto = _m->rcv.proto; search_ci.searchflag = SEARCH_RECEIVED; + if (is_registered_fallback2ip == 1) { + search_ci.searchflag = SEARCH_NORMAL; + } search_ci.via_host = host; search_ci.via_port = port; search_ci.via_prot = proto; @@ -255,6 +258,7 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d, enum pcontact_reg_st LM_INFO("Contact not found based on Contact-header, trying IP/Port/Proto\n"); // received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); // received_host.s = srcip; + search_ci.searchflag = SEARCH_RECEIVED; if (ul.get_pcontact(_d, &search_ci, &c) == 1) { LM_DBG("No entry in usrloc for %.*s:%i (Proto %i) found!\n", received_host.len, received_host.s, _m->rcv.src_port, _m->rcv.proto); } else { @@ -264,6 +268,17 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d, enum pcontact_reg_st } } + if ((c == NULL) && (is_registered_fallback2ip == 2)) { + LM_INFO("Contact not found based on IP/Port/Proto, trying Contact-header\n"); + search_ci.searchflag = SEARCH_NORMAL; + if (ul.get_pcontact(_d, &search_ci, &c) == 1) { + } else { + if (checkcontact(_m, c) != 0) { + c = NULL; + } + } + } + asserted_identity = NULL; registration_contact = NULL; if (c) {

8 years, 5 months

git:master:d403c666: Merge pull request #647 from smititelu/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d403c666eb3f0b498ce948100470e93e5ec94ff6 URL: https://github.com/kamailio/kamailio/commit/d403c666eb3f0b498ce948100470e93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-01T11:08:22+02:00 Merge pull request #647 from smititelu/master mem: Add on-error log messages for q_/f_ functions --- Modified: mem/f_malloc.c Modified: mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/d403c666eb3f0b498ce948100470e93… Patch: https://github.com/kamailio/kamailio/commit/d403c666eb3f0b498ce948100470e93… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 6afe7f7..5679721 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -336,6 +336,7 @@ struct fm_block* fm_malloc_init(char* address, unsigned long size, int type) if (size < init_overhead) { /* not enough mem to create our control structures !!!*/ + LOG(L_ERR, "fm_malloc_init(%lu); No memory left to create control structures!\n", size); return 0; } end=start+size; @@ -409,6 +410,8 @@ struct fm_frag* fm_search_defrag(struct fm_block* qm, unsigned long size) frag = nxt; } + LOG(L_ERR, "fm_search_defrag(%p, %lu); Free fragment not found!\n", qm, size); + return 0; } @@ -488,6 +491,12 @@ void* fm_malloc(void* qmp, unsigned long size) if(frag) goto finish; +#ifdef DBG_F_MALLOC + LOG(L_ERR, "fm_malloc(%p, %lu) called from %s: %s(%d), module: %s; Free fragment not found!\n", qm, size, file, func, line, mname); +#else + LOG(L_ERR, "fm_malloc(%p, %lu); Free fragment not found!\n", qm, size); +#endif + return 0; found: @@ -715,6 +724,12 @@ void* fm_realloc(void* qmp, void* p, unsigned long size) if (ptr){ /* copy, need by libssl */ memcpy(ptr, p, orig_size); + } else { +#ifdef DBG_F_MALLOC + LOG(L_ERR, "fm_realloc(%p, %lu) called from %s: %s(%d), module: %s; fm_malloc() failed!\n", qm, size, file, func, line, mname); +#else + LOG(L_ERR, "fm_realloc(%p, %lu); fm_malloc() failed!\n", qm, size); +#endif } #ifdef DBG_F_MALLOC fm_free(qm, p, file, func, line, mname); diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 36cc15a..31c3ab5 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -202,6 +202,7 @@ struct qm_block* qm_malloc_init(char* address, unsigned long size, int type) if (size < init_overhead) { /* not enough mem to create our control structures !!!*/ + LOG(L_ERR, "qm_malloc_init(%lu); No memory left to create control structures!\n", size); return 0; } end=start+size; @@ -285,6 +286,7 @@ static inline struct qm_frag* qm_find_free(struct qm_block* qm, /*try in a bigger bucket*/ } /* not found */ + LOG(L_ERR, "qm_find_free(%p, %lu); Free fragment not found!\n", qm, size); return 0; } @@ -413,6 +415,13 @@ void* qm_malloc(void* qmp, unsigned long size) #endif return (char*)f+sizeof(struct qm_frag); } + +#ifdef DBG_QM_MALLOC + LOG(L_ERR, "qm_malloc(%p, %lu) called from %s: %s(%d), module: %s; Free fragment not found!\n", qm, size, file, func, line, mname); +#else + LOG(L_ERR, "qm_malloc(%p, %lu); Free fragment not found!\n", qm, size); +#endif + return 0; } @@ -653,6 +662,12 @@ void* qm_realloc(void* qmp, void* p, unsigned long size) if (ptr){ /* copy, need by libssl */ memcpy(ptr, p, orig_size); + } else { +#ifdef DBG_QM_MALLOC + LOG(L_ERR, "qm_realloc(%p, %lu) called from %s: %s(%d), module: %s; qm_malloc() failed!\n", qm, size, file, func, line, mname); +#else + LOG(L_ERR, "qm_realloc(%p, %lu); qm_malloc() failed!\n", qm, size); +#endif } #ifdef DBG_QM_MALLOC qm_free(qm, p, file, func, line, mname);

8 years, 5 months

git:master:b0dea316: mem: Add on-error log messages for q_/f_ functions

by Stefan Mititelu

Module: kamailio Branch: master Commit: b0dea316a2aa471cf92f122e3432a6549cf0ff5c URL: https://github.com/kamailio/kamailio/commit/b0dea316a2aa471cf92f122e3432a65… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-05-31T11:33:56+03:00 mem: Add on-error log messages for q_/f_ functions Log some errors in case some memory API functions fail. --- Modified: mem/f_malloc.c Modified: mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/b0dea316a2aa471cf92f122e3432a65… Patch: https://github.com/kamailio/kamailio/commit/b0dea316a2aa471cf92f122e3432a65… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 6afe7f7..5679721 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -336,6 +336,7 @@ struct fm_block* fm_malloc_init(char* address, unsigned long size, int type) if (size < init_overhead) { /* not enough mem to create our control structures !!!*/ + LOG(L_ERR, "fm_malloc_init(%lu); No memory left to create control structures!\n", size); return 0; } end=start+size; @@ -409,6 +410,8 @@ struct fm_frag* fm_search_defrag(struct fm_block* qm, unsigned long size) frag = nxt; } + LOG(L_ERR, "fm_search_defrag(%p, %lu); Free fragment not found!\n", qm, size); + return 0; } @@ -488,6 +491,12 @@ void* fm_malloc(void* qmp, unsigned long size) if(frag) goto finish; +#ifdef DBG_F_MALLOC + LOG(L_ERR, "fm_malloc(%p, %lu) called from %s: %s(%d), module: %s; Free fragment not found!\n", qm, size, file, func, line, mname); +#else + LOG(L_ERR, "fm_malloc(%p, %lu); Free fragment not found!\n", qm, size); +#endif + return 0; found: @@ -715,6 +724,12 @@ void* fm_realloc(void* qmp, void* p, unsigned long size) if (ptr){ /* copy, need by libssl */ memcpy(ptr, p, orig_size); + } else { +#ifdef DBG_F_MALLOC + LOG(L_ERR, "fm_realloc(%p, %lu) called from %s: %s(%d), module: %s; fm_malloc() failed!\n", qm, size, file, func, line, mname); +#else + LOG(L_ERR, "fm_realloc(%p, %lu); fm_malloc() failed!\n", qm, size); +#endif } #ifdef DBG_F_MALLOC fm_free(qm, p, file, func, line, mname); diff --git a/mem/q_malloc.c b/mem/q_malloc.c index 36cc15a..31c3ab5 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -202,6 +202,7 @@ struct qm_block* qm_malloc_init(char* address, unsigned long size, int type) if (size < init_overhead) { /* not enough mem to create our control structures !!!*/ + LOG(L_ERR, "qm_malloc_init(%lu); No memory left to create control structures!\n", size); return 0; } end=start+size; @@ -285,6 +286,7 @@ static inline struct qm_frag* qm_find_free(struct qm_block* qm, /*try in a bigger bucket*/ } /* not found */ + LOG(L_ERR, "qm_find_free(%p, %lu); Free fragment not found!\n", qm, size); return 0; } @@ -413,6 +415,13 @@ void* qm_malloc(void* qmp, unsigned long size) #endif return (char*)f+sizeof(struct qm_frag); } + +#ifdef DBG_QM_MALLOC + LOG(L_ERR, "qm_malloc(%p, %lu) called from %s: %s(%d), module: %s; Free fragment not found!\n", qm, size, file, func, line, mname); +#else + LOG(L_ERR, "qm_malloc(%p, %lu); Free fragment not found!\n", qm, size); +#endif + return 0; } @@ -653,6 +662,12 @@ void* qm_realloc(void* qmp, void* p, unsigned long size) if (ptr){ /* copy, need by libssl */ memcpy(ptr, p, orig_size); + } else { +#ifdef DBG_QM_MALLOC + LOG(L_ERR, "qm_realloc(%p, %lu) called from %s: %s(%d), module: %s; qm_malloc() failed!\n", qm, size, file, func, line, mname); +#else + LOG(L_ERR, "qm_realloc(%p, %lu); qm_malloc() failed!\n", qm, size); +#endif } #ifdef DBG_QM_MALLOC qm_free(qm, p, file, func, line, mname);

8 years, 5 months

[kamailio/kamailio] mem: Add on-error log messages for q_/f_ functions (#647)

by Stefan Mititelu

Log some errors in case some memory API functions fail. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/647 -- Commit Summary -- * mem: Add on-error log messages for q_/f_ functions -- File Changes -- M mem/f_malloc.c (15) M mem/q_malloc.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/647.patch https://github.com/kamailio/kamailio/pull/647.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/647

8 years, 5 months

[kamailio/kamailio] Diversion headers not parsed by sipcapture (#650)

by lcligny

Hello, I'm using kamailio 4.4 as sipcapture for homer 5 and the SIP and RTCP capture is working. I have the data on the DB and homer show me all I want, but one thing: the diversion headers. I just tested again with kamailio 4.4 nighly for debian 7. To be more precise, the diversion headers are correctly sent by hep encapsulation as I can see them into the "msg" fields of my captured SIP INVITE rows. But the diversion data is not inserted into the corresponding "diversion" field, and therefore is not searchable by Homer. I have no insertion errors on the DB side, and the INSERT statements debug shows me that the value is always empty, while I have a "Diversion: <sip:XXXXXXXXX@192.168.XX.X>;reason=unconditional" into the msg field. If you need some logs to help track, feel free to ask me. Thank you for your help. --- 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/650

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016