sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:master:ba647bb1: Merge pull request #398 from grumvalski/cnxcc_deadlock_fix
by Carlos Ruiz DÃaz 15 Nov '15

15 Nov '15

Module: kamailio Branch: master Commit: ba647bb171e1e15024342a56fb7d42eadd0347fd URL: https://github.com/kamailio/kamailio/commit/ba647bb171e1e15024342a56fb7d42e… Author: Carlos Ruiz DÃaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz DÃaz <carlos.ruizdiaz(a)gmail.com> Date: 2015-11-15T08:48:35-06:00 Merge pull request #398 from grumvalski/cnxcc_deadlock_fix cnxcc: make cnxcc locks re-entrant --- Modified: modules/cnxcc/cnxcc_check.c Modified: modules/cnxcc/cnxcc_mod.c Modified: modules/cnxcc/cnxcc_mod.h Modified: modules/cnxcc/cnxcc_redis.c Modified: modules/cnxcc/cnxcc_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ba647bb171e1e15024342a56fb7d42e… Patch: https://github.com/kamailio/kamailio/commit/ba647bb171e1e15024342a56fb7d42e…

1 0

git:master:a4cdd61a: cnxcc: make cnxcc locks re-entrant
by Federico Cabiddu 15 Nov '15

15 Nov '15

Module: kamailio Branch: master Commit: a4cdd61afad027c9bb431ceda4e71941274610ce URL: https://github.com/kamailio/kamailio/commit/a4cdd61afad027c9bb431ceda4e7194… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-11-15T08:21:45+01:00 cnxcc: make cnxcc locks re-entrant --- Modified: modules/cnxcc/cnxcc_check.c Modified: modules/cnxcc/cnxcc_mod.c Modified: modules/cnxcc/cnxcc_mod.h Modified: modules/cnxcc/cnxcc_redis.c Modified: modules/cnxcc/cnxcc_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a4cdd61afad027c9bb431ceda4e7194… Patch: https://github.com/kamailio/kamailio/commit/a4cdd61afad027c9bb431ceda4e7194…

1 0

git:master:3b7c6198: htable: readme file was regenerated
by Daniel-Constantin Mierla 13 Nov '15

13 Nov '15

Module: kamailio Branch: master Commit: 3b7c61980c3dc34d16a0e6ae5376fd81b0a2ce5e URL: https://github.com/kamailio/kamailio/commit/3b7c61980c3dc34d16a0e6ae5376fd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-13T09:20:42+01:00 htable: readme file was regenerated --- Modified: modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/3b7c61980c3dc34d16a0e6ae5376fd8… Patch: https://github.com/kamailio/kamailio/commit/3b7c61980c3dc34d16a0e6ae5376fd8…

1 0

git:master:3a723206: htable: updated the documentation for timer_procs parameter
by Daniel-Constantin Mierla 13 Nov '15

13 Nov '15

Module: kamailio Branch: master Commit: 3a723206adaa99cf22aee8fead569d9a96e21a7b URL: https://github.com/kamailio/kamailio/commit/3a723206adaa99cf22aee8fead569d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-13T09:19:46+01:00 htable: updated the documentation for timer_procs parameter --- Modified: modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3a723206adaa99cf22aee8fead569d9… Patch: https://github.com/kamailio/kamailio/commit/3a723206adaa99cf22aee8fead569d9… --- diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index b17fb7f..42a77fa 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -637,10 +637,10 @@ modparam("htable", "enable_dmq", 1) <section id="htable.p.timer_procs"> <title><varname>timer_procs</varname> (integer)</title> <para> - If set to 1, the module will create its own timer process to scan - for expired items in hash tables. If set to zero, it will use the - core timer for this task. Set it to 1 if you store a lot of items - with autoexpire property. + If set to 1 or greater, the module will create its own timer + processes to scan for expired items in hash tables. If set to zero, + it will use the core timer for this task. Set it to 1 if you store + a lot of items with autoexpire property. </para> <para> <emphasis> @@ -651,7 +651,7 @@ modparam("htable", "enable_dmq", 1) <title>Set <varname>timer_procs</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("htable", "timer_procs", 1) +modparam("htable", "timer_procs", 4) ... </programlisting> </example>

1 0

git:master:30b85032: htable: removed inexistent timer_mode parameter from docs
by Daniel-Constantin Mierla 13 Nov '15

13 Nov '15

Module: kamailio Branch: master Commit: 30b85032e23b69cb0e355ba796545daa23dc705a URL: https://github.com/kamailio/kamailio/commit/30b85032e23b69cb0e355ba796545da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-13T09:18:18+01:00 htable: removed inexistent timer_mode parameter from docs --- Modified: modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/30b85032e23b69cb0e355ba796545da… Patch: https://github.com/kamailio/kamailio/commit/30b85032e23b69cb0e355ba796545da… --- diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index ea82a3e..b17fb7f 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -581,27 +581,6 @@ modparam("htable", "timer_interval", 10) </programlisting> </example> </section> - <section id="htable.p.timer_mode"> - <title><varname>timer_mode</varname> (integer)</title> - <para> - If set to 1, the module will start a new timer process. If set to 0 - will use the default timer process to check for expired htable - values. - </para> - <para> - <emphasis> - Default value is 0. - </emphasis> - </para> - <example> - <title>Set <varname>timer_mode</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("htable", "timer_mode", 1) -... -</programlisting> - </example> - </section> <section id="htable.p.db_expires"> <title><varname>db_expires</varname> (integer)</title> <para>

1 0

git:master:d8b78bfa: htable: ability to create more than one timer process
by Daniel-Constantin Mierla 13 Nov '15

13 Nov '15

Module: kamailio Branch: master Commit: d8b78bfaab25f9a73a67d813cfa930a6eb754bfa URL: https://github.com/kamailio/kamailio/commit/d8b78bfaab25f9a73a67d813cfa930a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-13T09:16:35+01:00 htable: ability to create more than one timer process --- Modified: modules/htable/ht_api.c Modified: modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/d8b78bfaab25f9a73a67d813cfa930a… Patch: https://github.com/kamailio/kamailio/commit/d8b78bfaab25f9a73a67d813cfa930a… --- diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index 4e272cc..bc20c08 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -964,6 +964,8 @@ int ht_has_autoexpire(void) return 0; } +extern int ht_timer_procs; + void ht_timer(unsigned int ticks, void *param) { ht_t *ht; @@ -971,18 +973,24 @@ void ht_timer(unsigned int ticks, void *param) ht_cell_t *it0; time_t now; int i; + int istart; + int istep; if(_ht_root==NULL) return; now = time(NULL); - + + istart = (int)(long)param; + if(ht_timer_procs<=0) istep = 1; + else istep = ht_timer_procs; + ht = _ht_root; while(ht) { if(ht->htexpire>0) { - for(i=0; i<ht->htsize; i++) + for(i=istart; i<ht->htsize; i+=istep) { /* free entries */ ht_slot_lock(ht, i); diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 3e803fe..7f55be1 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -212,7 +212,7 @@ static int mod_init(void) return -1; } } else { - register_sync_timers(1); + register_sync_timers(ht_timer_procs); } } @@ -232,15 +232,18 @@ static int child_init(int rank) struct sip_msg *fmsg; struct run_act_ctx ctx; int rtb, rt; + int i; LM_DBG("rank is (%d)\n", rank); if(rank==PROC_MAIN) { if(ht_timer_procs>0) { - if(fork_sync_timer(PROC_TIMER, "HTable Timer", 1 /*socks flag*/, - ht_timer, NULL, ht_timer_interval)<0) { - LM_ERR("failed to start timer routine as process\n"); - return -1; /* error */ + for(i=0; i<ht_timer_procs; i++) { + if(fork_sync_timer(PROC_TIMER, "HTable Timer", 1 /*socks flag*/, + ht_timer, (void*)(long)i, ht_timer_interval)<0) { + LM_ERR("failed to start timer routine as process\n"); + return -1; /* error */ + } } } }

1 0

git:master:8940cf95: modules/sdpops: added sloppy option to sdp_content function
by Juha Heinanen 13 Nov '15

13 Nov '15

Module: kamailio Branch: master Commit: 8940cf950cb763ba5145a35d80ffc71f64f450ca URL: https://github.com/kamailio/kamailio/commit/8940cf950cb763ba5145a35d80ffc71… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-11-13T08:50:01+02:00 modules/sdpops: added sloppy option to sdp_content function --- Modified: modules/sdpops/README Modified: modules/sdpops/doc/sdpops_admin.xml Modified: modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8940cf950cb763ba5145a35d80ffc71… Patch: https://github.com/kamailio/kamailio/commit/8940cf950cb763ba5145a35d80ffc71…

1 0

faster sdp_content() test
by Juha Heinanen 12 Nov '15

12 Nov '15

i wrote new version of sdp_content() test that does not parse the whole sdp like the current one does. instead it checks if request has a body and content type is either missing or it is application/sdp or content type is multipart/mixed and boxy has string application/sdp. could this one replace the current one or do i need to invent a new name for it? the implementation also includes new general purpose function strnistr, equivalent of which i did not find in kamailio source. -- juha ------------------------------------------------------------------ /* * Find the first case insensitive occurrence of find in s, where the * search is limited to the first slen characters of s. Idea stolen from * FreeBSD. */ char* strnistr(const char *s, const char *find, size_t slen) { char c, sc; size_t len; if ((c = *find++) != '\0') { len = strlen(find); do { do { if ((sc = *s++) == '\0' || slen-- < 1) return (NULL); } while (sc != c); if (len > slen) return (NULL); } while (strncasecmp(s, find, len) != 0); s--; } return ((char *)s); } /** * */ static int w_sdp_content(sip_msg_t* msg, char* foo, char *bar) { str body; int mime; body.s = get_body(msg); if (body.s == NULL) return -1; body.len = msg->len - (int)(body.s - msg->buf); if (body.len == 0) return -1; mime = parse_content_type_hdr(msg); if (mime < 0) return -1; /* error */ if (mime == 0) return 1; /* default is application/sdp */ switch (((unsigned int)mime) >> 16) { case TYPE_APPLICATION: if ((mime & 0x00ff) == SUBTYPE_SDP) return 1; else return -1; case TYPE_MULTIPART: if ((mime & 0x00ff) == SUBTYPE_MIXED) { if (strnistr(body.s, "application/sdp", body.len) == NULL) { return -1; } else { return 1; } } else { return -1; } default: return -1; } }

2 4

git:master:4baf5760: tls: option to match TLS client config profile based on server_id
by Daniel-Constantin Mierla 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: 4baf576076735018f1fe9812e6d7c64333ee62bf URL: https://github.com/kamailio/kamailio/commit/4baf576076735018f1fe9812e6d7c64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-12T14:42:12+01:00 tls: option to match TLS client config profile based on server_id - server_id can be any string that uniquely identifies a client config profile, overriding the attempt to match on ip:port (+sni). This makes it easier to select the desired config profile, because the port is hard to guess for stream connections - prameter xavp_cfg has to be enabled and inner xavp 'server_id' has to be set before relaying the sip message (before opening the client connection) --- Modified: modules/tls/tls_cfg.c Modified: modules/tls/tls_cfg.h Modified: modules/tls/tls_config.c Modified: modules/tls/tls_domain.c Modified: modules/tls/tls_domain.h Modified: modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/4baf576076735018f1fe9812e6d7c64… Patch: https://github.com/kamailio/kamailio/commit/4baf576076735018f1fe9812e6d7c64…

1 0

git:master:138b776e: tls: refreshed the content of readme
by Daniel-Constantin Mierla 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: 138b776e5f5d37d9a78857d1506ffe09a5f4d704 URL: https://github.com/kamailio/kamailio/commit/138b776e5f5d37d9a78857d1506ffe0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-12T14:42:12+01:00 tls: refreshed the content of readme --- Modified: modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/138b776e5f5d37d9a78857d1506ffe0… Patch: https://github.com/kamailio/kamailio/commit/138b776e5f5d37d9a78857d1506ffe0…

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015