sr-dev August 2015

sr-dev@lists.kamailio.org

30 participants
191 discussions

git:master:a620bfec: mem: safety prev free checks for f_malloc extract operation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a620bfec37cdcdc5c5debcdfb5219b09464065fe URL: https://github.com/kamailio/kamailio/commit/a620bfec37cdcdc5c5debcdfb5219b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-27T15:38:03+02:00 mem: safety prev free checks for f_malloc extract operation - following a report by Alex Balashov --- Modified: mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/a620bfec37cdcdc5c5debcdfb5219b0… Patch: https://github.com/kamailio/kamailio/commit/a620bfec37cdcdc5c5debcdfb5219b0… --- diff --git a/mem/f_malloc.c b/mem/f_malloc.c index fa8cb49..a4def82 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -179,6 +179,29 @@ static inline void fm_extract_free(struct fm_block* qm, struct fm_frag* frag) pf = frag->prv_free; hash = GET_HASH(frag->size); + if(unlikely(pf==0)) { + /* try to discover previous fragment (safety review) */ + LM_WARN("missing prev info for fragment %p from %p [%d]\n", + frag, qm, hash); + if(likely(qm->free_hash[hash].first)) { + if(likely(qm->free_hash[hash].first==frag)) { + pf = &(qm->free_hash[hash].first); + } else { + for(pf=&(qm->free_hash[hash].first); (*pf); pf=&((*pf)->u.nxt_free)) { + if((*pf)->u.nxt_free==frag) { + break; + } + } + } + } + if(unlikely(pf==0)) { + LM_ALERT("attemting to extract inexistent fragment %p from %p [%d]\n", + frag, qm, hash); + return; + } + frag->prv_free = pf; + } + *pf=frag->u.nxt_free; if(frag->u.nxt_free) frag->u.nxt_free->prv_free = pf;

8 years, 8 months

[kamailio] Uac module , disable registration with l_uuid , value type problem on RPC (#290)

by Yasin

Hello; when i test to uac module , can't disable registration . after long time , i find the problem that rpc gives wrong value or uac module gives wrong value type so it nevers matches so it never disable registration. `` file : modules/uac/uac_reg.c `` `` function : rpc_uac_reg_update_flag `` `` line : if(rpc->scan(ctx, "S.S", &attr, &val)<2) `` value is "18446744073622652910" that must be 85030AXXXX like this. i tried to change "S.S" value but couldn't be success. `` kamailio V 4.2.6 `` `` 2.6.32-431.23.3.el6.x86_64 #1 `` calling command like `` kamcmd uac.reg_disable l_uuid 85030AXXXX `` on shell Could you check it. Thanks. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/290

8 years, 8 months

git:master:cba555e2: Merge pull request #306 from zxcpoiu/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cba555e2ea8309e510bd830747caf8beb3c370fc URL: https://github.com/kamailio/kamailio/commit/cba555e2ea8309e510bd830747caf8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-27T13:39:11+02:00 Merge pull request #306 from zxcpoiu/master usrloc: really do the ignore location record if it's a non-local socket --- Modified: modules/usrloc/doc/usrloc_admin.xml Modified: modules/usrloc/udomain.c Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/cba555e2ea8309e510bd830747caf8b… Patch: https://github.com/kamailio/kamailio/commit/cba555e2ea8309e510bd830747caf8b… --- diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index 6e65399..1d2b0c8 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -1064,6 +1064,28 @@ modparam("usrloc", "db_insert_null", 1) </example> </section> + <section id="usrloc.p.skip_remote_socket"> + <title><varname>skip_remote_socket</varname> (int)</title> + <para> + If set to 1, Kamailio will skip location record when loading from + database, if socket value of the record does not in kamailio + listening socket list. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>skip_remote_socket</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "skip_remote_socket", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 9b31a3b..6d135da 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -311,6 +311,9 @@ static inline ucontact_info_t* dbrow2info(db_val_t *vals, str *contact, int rcon ci.sock = grep_sock_info( &host, (unsigned short)port, proto); if (ci.sock==0) { LM_DBG("non-local socket <%s>...ignoring\n", p); + if (skip_remote_socket) { + return 0; + } } } @@ -477,7 +480,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { - LM_ERR("sipping record for %.*s in table %s\n", + LM_ERR("skipping record for %.*s in table %s\n", user.len, user.s, _d->name->s); continue; } diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index fc54f46..1b41f26 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -161,6 +161,7 @@ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ int handle_lost_tcp = 0; /*!< By default do not remove contacts before expiration time */ int close_expired_tcp = 0; /*!< By default do not close TCP connections for expired contacts */ +int skip_remote_socket = 0; /*!< By default do not skip remote socket */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 10; @@ -221,6 +222,7 @@ static param_export_t params[] = { {"nat_bflag", INT_PARAM, &nat_bflag }, {"handle_lost_tcp", INT_PARAM, &handle_lost_tcp }, {"close_expired_tcp", INT_PARAM, &close_expired_tcp }, + {"skip_remote_socket", INT_PARAM, &skip_remote_socket }, {"preload", PARAM_STRING|USE_FUNC_PARAM, (void*)ul_preload_param}, {"db_update_as_insert", INT_PARAM, &ul_db_update_as_insert}, {"timer_procs", INT_PARAM, &ul_timer_procs}, diff --git a/modules/usrloc/ul_mod.h b/modules/usrloc/ul_mod.h index b8a20ec..e038762 100644 --- a/modules/usrloc/ul_mod.h +++ b/modules/usrloc/ul_mod.h @@ -86,6 +86,7 @@ extern int ul_db_check_update; extern int ul_keepalive_timeout; extern int handle_lost_tcp; extern int close_expired_tcp; +extern int skip_remote_socket; /*! nat branch flag */

8 years, 8 months

git:master:e737942f: usrloc: new param to skip non-local location record

by zxcpoiu

Module: kamailio Branch: master Commit: e737942fbabc1f5d6d50a51c667cc0533cfe5777 URL: https://github.com/kamailio/kamailio/commit/e737942fbabc1f5d6d50a51c667cc05… Author: zxcpoiu <zxcpoiu(a)gmail.com> Committer: zxcpoiu <zxcpoiu(a)gmail.com> Date: 2015-08-27T16:34:42+08:00 usrloc: new param to skip non-local location record - If set, kamailio will skip record if socket value doesn't in listening socket list when loading record from database. --- Modified: modules/usrloc/doc/usrloc_admin.xml Modified: modules/usrloc/udomain.c Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/e737942fbabc1f5d6d50a51c667cc05… Patch: https://github.com/kamailio/kamailio/commit/e737942fbabc1f5d6d50a51c667cc05… --- diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index 6e65399..1d2b0c8 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -1064,6 +1064,28 @@ modparam("usrloc", "db_insert_null", 1) </example> </section> + <section id="usrloc.p.skip_remote_socket"> + <title><varname>skip_remote_socket</varname> (int)</title> + <para> + If set to 1, Kamailio will skip location record when loading from + database, if socket value of the record does not in kamailio + listening socket list. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>skip_remote_socket</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "skip_remote_socket", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 50592fb..6d135da 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -311,6 +311,9 @@ static inline ucontact_info_t* dbrow2info(db_val_t *vals, str *contact, int rcon ci.sock = grep_sock_info( &host, (unsigned short)port, proto); if (ci.sock==0) { LM_DBG("non-local socket <%s>...ignoring\n", p); + if (skip_remote_socket) { + return 0; + } } } diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index fc54f46..1b41f26 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -161,6 +161,7 @@ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ int handle_lost_tcp = 0; /*!< By default do not remove contacts before expiration time */ int close_expired_tcp = 0; /*!< By default do not close TCP connections for expired contacts */ +int skip_remote_socket = 0; /*!< By default do not skip remote socket */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 10; @@ -221,6 +222,7 @@ static param_export_t params[] = { {"nat_bflag", INT_PARAM, &nat_bflag }, {"handle_lost_tcp", INT_PARAM, &handle_lost_tcp }, {"close_expired_tcp", INT_PARAM, &close_expired_tcp }, + {"skip_remote_socket", INT_PARAM, &skip_remote_socket }, {"preload", PARAM_STRING|USE_FUNC_PARAM, (void*)ul_preload_param}, {"db_update_as_insert", INT_PARAM, &ul_db_update_as_insert}, {"timer_procs", INT_PARAM, &ul_timer_procs}, diff --git a/modules/usrloc/ul_mod.h b/modules/usrloc/ul_mod.h index b8a20ec..e038762 100644 --- a/modules/usrloc/ul_mod.h +++ b/modules/usrloc/ul_mod.h @@ -86,6 +86,7 @@ extern int ul_db_check_update; extern int ul_keepalive_timeout; extern int handle_lost_tcp; extern int close_expired_tcp; +extern int skip_remote_socket; /*! nat branch flag */

8 years, 8 months

git:master:53210656: usrloc: fixed typo in skipping record LM_ERR msg

by zxcpoiu

Module: kamailio Branch: master Commit: 53210656befae010a9f7e7735536c4c7b3b1e37b URL: https://github.com/kamailio/kamailio/commit/53210656befae010a9f7e7735536c4c… Author: zxcpoiu <zxcpoiu(a)gmail.com> Committer: zxcpoiu <zxcpoiu(a)gmail.com> Date: 2015-08-27T15:29:12+08:00 usrloc: fixed typo in skipping record LM_ERR msg - doing "skip" action instead "sip" action --- Modified: modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/53210656befae010a9f7e7735536c4c… Patch: https://github.com/kamailio/kamailio/commit/53210656befae010a9f7e7735536c4c… --- diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index 9b31a3b..50592fb 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -477,7 +477,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { - LM_ERR("sipping record for %.*s in table %s\n", + LM_ERR("skipping record for %.*s in table %s\n", user.len, user.s, _d->name->s); continue; }

8 years, 8 months

[kamailio] usrloc: really do the ignore location record if it's a non-local socket (#306)

by zxcpoiu

* When usrloc loading location records from database, and if the socket of the record is not matched in kamailio's listening socket list, It only throws LM_ERR ignoring message only but still store into memory. should `return 0` as well. * And the message typo sometimes confused people to distinguish that kamailio is "sipping" the record (redirct) or "skipping" the record. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/306 -- Commit Summary -- * usrloc: fix ignore location record if it's a non-local socket * usrloc: fixed typo in skipping record LM_ERR msg -- File Changes -- M modules/usrloc/udomain.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/306.patch https://github.com/kamailio/kamailio/pull/306.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/306

8 years, 8 months

git:master:ad72150a: dialog: set the db null flag properly for contact fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ad72150a09adeaff53c617bf3d729aa94ae463c7 URL: https://github.com/kamailio/kamailio/commit/ad72150a09adeaff53c617bf3d729aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-27T09:24:31+02:00 dialog: set the db null flag properly for contact fields --- Modified: modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/ad72150a09adeaff53c617bf3d729aa… Patch: https://github.com/kamailio/kamailio/commit/ad72150a09adeaff53c617bf3d729aa… --- diff --git a/modules/dialog/dlg_db_handler.c b/modules/dialog/dlg_db_handler.c index 74e1646..018e37d 100644 --- a/modules/dialog/dlg_db_handler.c +++ b/modules/dialog/dlg_db_handler.c @@ -773,10 +773,10 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) SET_STR_VALUE(values+16, cell->route_set[DLG_CALLER_LEG]); SET_STR_VALUE(values+17, cell->route_set[DLG_CALLEE_LEG]); - SET_PROPER_NULL_FLAG(cell->route_set[DLG_CALLER_LEG], values, 14); - SET_PROPER_NULL_FLAG(cell->route_set[DLG_CALLEE_LEG], values, 15); - SET_PROPER_NULL_FLAG(cell->contact[DLG_CALLER_LEG], values, 16); - SET_PROPER_NULL_FLAG(cell->contact[DLG_CALLEE_LEG], values, 17); + SET_PROPER_NULL_FLAG(cell->contact[DLG_CALLER_LEG], values, 14); + SET_PROPER_NULL_FLAG(cell->contact[DLG_CALLEE_LEG], values, 15); + SET_PROPER_NULL_FLAG(cell->route_set[DLG_CALLER_LEG], values, 16); + SET_PROPER_NULL_FLAG(cell->route_set[DLG_CALLEE_LEG], values, 17); VAL_NULL(values+18) = 0; VAL_INT(values+18) = cell->sflags;

8 years, 8 months

git:master:c885d2ee: dialog: handle malloc result for separated contact value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c885d2eed5d1a54192a9d74093abceb20eb0855f URL: https://github.com/kamailio/kamailio/commit/c885d2eed5d1a54192a9d74093abceb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-08-27T08:57:52+02:00 dialog: handle malloc result for separated contact value --- Modified: modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/c885d2eed5d1a54192a9d74093abceb… Patch: https://github.com/kamailio/kamailio/commit/c885d2eed5d1a54192a9d74093abceb… --- diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 6fb3e72..78093d8 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -519,7 +519,8 @@ int dlg_set_leg_info(struct dlg_cell *dlg, str* tag, str *rr, str *contact, dlg->contact[leg].s = (char*)shm_malloc( contact->len ); } - if ( dlg->tag[leg].s==NULL || dlg->cseq[leg].s==NULL) { + if ( dlg->tag[leg].s==NULL || dlg->cseq[leg].s==NULL + || dlg->contact[leg].s==NULL) { LM_ERR("no more shm mem\n"); if (dlg->tag[leg].s) { @@ -531,6 +532,12 @@ int dlg_set_leg_info(struct dlg_cell *dlg, str* tag, str *rr, str *contact, shm_free(dlg->cseq[leg].s); dlg->cseq[leg].s = NULL; } + if (dlg->contact[leg].s) + { + shm_free(dlg->contact[leg].s); + dlg->contact[leg].s = NULL; + } + return -1; } p = dlg->tag[leg].s;

8 years, 8 months

[kamailio] modules/sipcapture: adds insertion of request, From, and To URI domain part (#305)

by Mikko Lehto

ruri_domain, from_domain and to_domain have existed since SQL schema version 3 -> no DB schema changes needed You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/305 -- Commit Summary -- * modules/sipcapture: indentation and whitespace fixes * modules/sipcapture: stores From and To domain part * modules/sipcapture: stores request URI domain part -- File Changes -- M modules/sipcapture/sipcapture.c (256) M modules/sipcapture/sipcapture.h (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/305.patch https://github.com/kamailio/kamailio/pull/305.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/305

8 years, 8 months

git:master:8d8e1b95: Merge pull request #305 from mslehto/sipcapture-domain

by Alexandr Dubovikov

Module: kamailio Branch: master Commit: 8d8e1b957d9461d80b15b8e52464322a4e2b5fb1 URL: https://github.com/kamailio/kamailio/commit/8d8e1b957d9461d80b15b8e52464322… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2015-08-26T21:57:21+02:00 Merge pull request #305 from mslehto/sipcapture-domain modules/sipcapture: adds insertion of request, From, and To URI domain part --- Modified: modules/sipcapture/sipcapture.c Modified: modules/sipcapture/sipcapture.h --- Diff: https://github.com/kamailio/kamailio/commit/8d8e1b957d9461d80b15b8e52464322… Patch: https://github.com/kamailio/kamailio/commit/8d8e1b957d9461d80b15b8e52464322…

8 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2015