sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

git:master:83cf034c: modules/presence: prevent segfault on deref. of empty hashtable entry list

by jaybeepee

Module: kamailio Branch: master Commit: 83cf034c20137a81dbd4b3572467b7b1f2f6929f URL: https://github.com/kamailio/kamailio/commit/83cf034c20137a81dbd4b3572467b7b… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-28T17:36:42+02:00 modules/presence: prevent segfault on deref. of empty hashtable entry list --- Modified: modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/83cf034c20137a81dbd4b3572467b7b… Patch: https://github.com/kamailio/kamailio/commit/83cf034c20137a81dbd4b3572467b7b… --- diff --git a/modules/presence/hash.c b/modules/presence/hash.c index bfce59d..32f1f94 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -112,7 +112,7 @@ subs_t* search_shtable(shtable_t htable,str callid,str to_tag, { subs_t* s; - s= htable[hash_code].entries->next; + s= htable[hash_code].entries?htable[hash_code].entries->next:NULL; while(s) { @@ -292,7 +292,7 @@ int delete_shtable(shtable_t htable,unsigned int hash_code,subs_t* subs) lock_get(&htable[hash_code].lock); ps= htable[hash_code].entries; - s= ps->next; + s= ps?ps->next:NULL; while(s) {

7 years, 7 months

git:master:470a554d: modules/ims_charging: removed static identifier

by jaybeepee

Module: kamailio Branch: master Commit: 470a554d3842c8d78770b2a23c935a201ae972af URL: https://github.com/kamailio/kamailio/commit/470a554d3842c8d78770b2a23c935a2… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-28T17:31:21+02:00 modules/ims_charging: removed static identifier --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/470a554d3842c8d78770b2a23c935a2… Patch: https://github.com/kamailio/kamailio/commit/470a554d3842c8d78770b2a23c935a2… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 15172d4..6093237 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -92,7 +92,7 @@ void credit_control_session_callback(int event, void* session) { * @param func - the name of the calling function, for debugging purposes * @returns 1 on success or 0 on failure */ -static inline int Ro_add_avp_list(AAA_AVP_LIST *list, char *d, int len, int avp_code, +inline int Ro_add_avp_list(AAA_AVP_LIST *list, char *d, int len, int avp_code, int flags, int vendorid, int data_do, const char *func) { AAA_AVP *avp; if (vendorid != 0) flags |= AAA_AVP_FLAG_VENDOR_SPECIFIC;

7 years, 7 months

git:master:46f18882: modules/ims_charging: add support for final_unit_indication and redirect fn'ality in CCA

by jaybeepee

Module: kamailio Branch: master Commit: 46f188825d7ecd3ca6b11cd74b43e3abeadb51dc URL: https://github.com/kamailio/kamailio/commit/46f188825d7ecd3ca6b11cd74b43e3a… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-28T17:11:39+02:00 modules/ims_charging: add support for final_unit_indication and redirect fn'ality in CCA --- Modified: modules/ims_charging/Ro_data.c Modified: modules/ims_charging/Ro_data.h Modified: modules/ims_charging/ccr.c Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/mod.h --- Diff: https://github.com/kamailio/kamailio/commit/46f188825d7ecd3ca6b11cd74b43e3a… Patch: https://github.com/kamailio/kamailio/commit/46f188825d7ecd3ca6b11cd74b43e3a…

7 years, 7 months

git:master:3f9969d1: dialog: no need to release the dialog when refreshing cseq

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3f9969d1790dd8d9349c0fa450c589f8038c43cc URL: https://github.com/kamailio/kamailio/commit/3f9969d1790dd8d9349c0fa450c589f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-28T16:42:22+02:00 dialog: no need to release the dialog when refreshing cseq - no direct reference was triggered inside the function --- Modified: modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/3f9969d1790dd8d9349c0fa450c589f… Patch: https://github.com/kamailio/kamailio/commit/3f9969d1790dd8d9349c0fa450c589f… --- diff --git a/modules/dialog/dlg_cseq.c b/modules/dialog/dlg_cseq.c index 7aaad02..4d60180 100644 --- a/modules/dialog/dlg_cseq.c +++ b/modules/dialog/dlg_cseq.c @@ -247,11 +247,9 @@ int dlg_cseq_refresh(sip_msg_t *msg, dlg_cell_t *dlg, sr_hdr_add_zs(msg, "P-K-CSeq-Refresh", &nval); done: - if(dlg!=NULL) dlg_release(dlg); return 0; error: - if(dlg!=NULL) dlg_release(dlg); return -1; }

7 years, 7 months

git:master:0965c904: core: from/to/callid/cseq headers are parsed before logging prefix is used

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0965c90471932936a8e66c1ebd9299ca7be02721 URL: https://github.com/kamailio/kamailio/commit/0965c90471932936a8e66c1ebd9299c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-28T16:42:22+02:00 core: from/to/callid/cseq headers are parsed before logging prefix is used --- Modified: receive.c --- Diff: https://github.com/kamailio/kamailio/commit/0965c90471932936a8e66c1ebd9299c… Patch: https://github.com/kamailio/kamailio/commit/0965c90471932936a8e66c1ebd9299c… --- diff --git a/receive.c b/receive.c index fc938e5..11918ed 100644 --- a/receive.c +++ b/receive.c @@ -181,6 +181,8 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) } else if(ret == NONSIP_MSG_DROP) goto error02; } + + parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0); LM_DBG("--- received sip message - %s - call-id: [%.*s] - cseq: [%.*s]\n", (msg->first_line.type==SIP_REQUEST)?"request":"reply", (msg->callid && msg->callid->body.s)?msg->callid->body.len:0,

7 years, 7 months

git:master:be77f340: dialog: wrapper defines for ref/unref operations to get file name and line

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: be77f34091f63042b4df4d5445fc16c1da3ddcd9 URL: https://github.com/kamailio/kamailio/commit/be77f34091f63042b4df4d5445fc16c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-28T16:42:22+02:00 dialog: wrapper defines for ref/unref operations to get file name and line --- Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/be77f34091f63042b4df4d5445fc16c… Patch: https://github.com/kamailio/kamailio/commit/be77f34091f63042b4df4d5445fc16c… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 98c0ee5..b2cf707 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -896,10 +896,12 @@ void link_dlg(struct dlg_cell *dlg, int n, int mode) * \param dlg dialog * \param cnt increment for the reference counter */ -void dlg_ref(dlg_cell_t *dlg, unsigned int cnt) +void dlg_ref_helper(dlg_cell_t *dlg, unsigned int cnt, const char *fname, + int fline) { dlg_entry_t *d_entry; + LM_DBG("ref op on %p with %d from %s:%d\n", dlg, cnt, fname, fline); d_entry = &(d_table->entries[dlg->h_entry]); dlg_lock( d_table, d_entry); @@ -914,10 +916,12 @@ void dlg_ref(dlg_cell_t *dlg, unsigned int cnt) * \param dlg dialog * \param cnt decrement for the reference counter */ -void dlg_unref(dlg_cell_t *dlg, unsigned int cnt) +void dlg_unref_helper(dlg_cell_t *dlg, unsigned int cnt, const char *fname, + int fline) { dlg_entry_t *d_entry; + LM_DBG("unref op on %p with %d from %s:%d\n", dlg, cnt, fname, fline); d_entry = &(d_table->entries[dlg->h_entry]); dlg_lock( d_table, d_entry); diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index 12c09e0..daa5221 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -389,8 +389,10 @@ void link_dlg(struct dlg_cell *dlg, int n, int mode); * \param dlg dialog * \param cnt decrement for the reference counter */ -void dlg_unref(dlg_cell_t *dlg, unsigned int cnt); +void dlg_unref_helper(dlg_cell_t *dlg, unsigned int cnt, const char *fname, + int fline); +#define dlg_unref(dlg, cnt) dlg_unref_helper((dlg), (cnt), __FILE__, __LINE__) /*! * \brief Refefence a dialog with locking @@ -398,8 +400,10 @@ void dlg_unref(dlg_cell_t *dlg, unsigned int cnt); * \param dlg dialog * \param cnt increment for the reference counter */ -void dlg_ref(dlg_cell_t *dlg, unsigned int cnt); +void dlg_ref_helper(dlg_cell_t *dlg, unsigned int cnt, const char *fname, + int fline); +#define dlg_ref(dlg, cnt) dlg_ref_helper((dlg), (cnt), __FILE__, __LINE__) /*! * \brief Release a dialog from ref counter by 1

7 years, 7 months

git:master:cedae42f: modules/ims_registrar_pcscf: fix mem leak (libxml2 structure not being freed)

by jaybeepee

Module: kamailio Branch: master Commit: cedae42fa89948297e855427aae1ddc51c8e8976 URL: https://github.com/kamailio/kamailio/commit/cedae42fa89948297e855427aae1ddc… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-28T12:26:26+02:00 modules/ims_registrar_pcscf: fix mem leak (libxml2 structure not being freed) --- Modified: modules/ims_registrar_pcscf/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/cedae42fa89948297e855427aae1ddc… Patch: https://github.com/kamailio/kamailio/commit/cedae42fa89948297e855427aae1ddc…

7 years, 7 months

git:master:9d793bb6: modules/cdp: cater for missing granted service unit in CCA - prevent segfault

by jaybeepee

Module: kamailio Branch: master Commit: 9d793bb6290d5ff857068f9554268f68b3f5e3ff URL: https://github.com/kamailio/kamailio/commit/9d793bb6290d5ff857068f9554268f6… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-28T10:49:16+02:00 modules/cdp: cater for missing granted service unit in CCA - prevent segfault --- Modified: modules/cdp/acctstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/9d793bb6290d5ff857068f9554268f6… Patch: https://github.com/kamailio/kamailio/commit/9d793bb6290d5ff857068f9554268f6… --- diff --git a/modules/cdp/acctstatemachine.c b/modules/cdp/acctstatemachine.c index 777971d..29536fb 100644 --- a/modules/cdp/acctstatemachine.c +++ b/modules/cdp/acctstatemachine.c @@ -30,6 +30,7 @@ void update_gsu_response_timers(cdp_cc_acc_session_t* session, AAAMessage* msg) AAA_AVP_LIST y; AAA_AVP *z; + y.head = y.tail = 0; avp = AAAFindMatchingAVP(msg, 0, AVP_Multiple_Services_Credit_Control, 0, 0); if (!avp) { LM_WARN("Trying to update GSU timers but there is no MSCC AVP in the CCA response\n"); @@ -76,8 +77,11 @@ void update_gsu_response_timers(cdp_cc_acc_session_t* session, AAAMessage* msg) mscc_avp = mscc_avp->next; } - AAAFreeAVPList(&mscc_avp_list); - AAAFreeAVPList(&y); + if (mscc_avp_list.head); + AAAFreeAVPList(&mscc_avp_list); + + if (y.head) + AAAFreeAVPList(&y); }

7 years, 7 months

git:master:004b9d53: core: debug message with details of callid and cseq when a sip message is received

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 004b9d5350c62764e1da60ed6062b39e6fbc9434 URL: https://github.com/kamailio/kamailio/commit/004b9d5350c62764e1da60ed6062b39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-28T09:57:50+02:00 core: debug message with details of callid and cseq when a sip message is received --- Modified: receive.c --- Diff: https://github.com/kamailio/kamailio/commit/004b9d5350c62764e1da60ed6062b39… Patch: https://github.com/kamailio/kamailio/commit/004b9d5350c62764e1da60ed6062b39… --- diff --git a/receive.c b/receive.c index 8ddf3e9..fc938e5 100644 --- a/receive.c +++ b/receive.c @@ -178,10 +178,15 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port, (int)msg->rcv.proto); sr_core_ert_run(msg, SR_CORE_ERT_RECEIVE_PARSE_ERROR); - } + } else if(ret == NONSIP_MSG_DROP) goto error02; } - LM_DBG("After parse_msg...\n"); + LM_DBG("--- received sip message - %s - call-id: [%.*s] - cseq: [%.*s]\n", + (msg->first_line.type==SIP_REQUEST)?"request":"reply", + (msg->callid && msg->callid->body.s)?msg->callid->body.len:0, + (msg->callid && msg->callid->body.s)?msg->callid->body.s:"", + (msg->cseq && msg->cseq->body.s)?msg->cseq->body.len:0, + (msg->cseq && msg->cseq->body.s)?msg->cseq->body.s:""); /* set log prefix */ log_prefix_set(msg);

7 years, 7 months

[kamailio/kamailio] dispatcher: Call load distribution forces maxload attribute (#800)

by Carlos Cruz Luengo

Hi Daniel, I am using call load distribution algorithm calling _ds_select_dst_ function with '10' as second argument, as described in [dispatcher module doc files](http://kamailio.org/docs/modules/4.4.x/modules/dispatcher.html#dispa…. The problem I notice is that **all gateways without maxload attribute are discarded**, even though the documentation says that if maxload is set to 0, no active call limit is used. The same thing happens if I set maxload to 0. Reading the code I think the problem is in [_ds_get_leastloaded_ function in dispatch.c file](https://github.com/kamailio/kamailio/blob/4.4/modules/dispatcher/disp…. This is the patch I have used: ``` diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index c1a831b..1e0064d 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -1449,7 +1449,8 @@ int ds_get_leastloaded(ds_set_t *dset) for(j=0; j<dset->nr; j++) { if(!ds_skip_dst(dset->dlist[j].flags) - && dset->dlist[j].dload<dset->dlist[j].attrs.maxload) + && (dset->dlist[j].attrs.maxload == 0 + || dset->dlist[j].dload < dset->dlist[j].attrs.maxload)) { if(dset->dlist[j].dload<t) { ``` I have done my tests with this version: ``` # kamailio -v version: kamailio 4.4.3 (x86_64/linux) e43d82-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, 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: e43d82 -dirty compiled on 12:38:36 Sep 27 2016 with gcc 4.7.2 ``` Thank you and regards, -- 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/800

7 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016