sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

[kamailio] Presence module should support a 32bit unsigned expire value (#521)

by foucse

Hello, ``` kamailio -v version: kamailio 4.4.0-pre0 (i386/linux) f39d14-dirty flags: STATS: Off, EXTRA_DEBUG, 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: f39d14 -dirty compiled on 17:01:22 Feb 12 2016 with gcc 4.9.3 ``` If I read well the RFC 3261 section 20.19 [https://tools.ietf.org/html/rfc3261#section-20.19] a SUBSCRIBE or a PUBLISH may have an Expires value of 2**32-1 = (4294967295). But it appears to me that this value is not supported in Kamailio even if I allow it as a max_expires option in configuration (modparam("presence", "max_expires", 4294967295)). Kamailio answers with the following: ``` 2016/02/29 09:02:59.343750 192.168.100.1:5060 -> 192.168.2.2:5062 SIP/2.0 423 Interval Too Brief via: SIP/2.0/UDP 192.168.2.2:5062;branch=z9hG4bK-11535-1-9;rport=5062 From: "User1" <sip:user1@example.com>;tag=11535-1 To: "User1" <sip:user1@example.com>;tag=dfba6eee28f067076993264b7e466d4e.151a Call-ID: 1-11545(a)192.168.1.1-user1 CSeq: 3 PUBLISH Expires: -2147483648 SIP-ETag: a.1456732971.11285.1.0 Server: kamailio (4.4.0-pre0 (i386/linux)) Content-Length: 0 ``` Which is not compliant with the RFC, the Expires value should not be signed. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/521

7 years, 7 months

[kamailio/kamailio] sca module (#580)

by Olle E. Johansson

The README needs to be up to date with the source code. I noted that the "Outbound proxy" modparam is not documented. --- 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/580

7 years, 7 months

Q: (markup) language for defining structures and function prototypes

by Daniel-Constantin Mierla

Hello, writing to see if anyone is aware of any (well known) markup language for defining structures and function prototypes. The goal is to use it for specifying the functions exported by KEMI (https://www.kamailio.org/wiki/devel/config-engines) so we can generate C code for the exported structure, but more important, to get at least the index with the functions available over the KEMI. I feel it's going to be a big burden to write C code and docs in two places, even worse, to keep both of them sync'ed over the time. At this moment, there are many functions exported via KEMI, but not documented anywhere (apart of the C code). It should allow defining the name of the function, the parameters with their associated types, return code and eventually the description for each of them. At the end we could invent one based on xml format (or something similar), but I would better use something that already exists there. I searched quickly, but couldn't find anything straightaway. A hint could be a format that is used to document the RPC commands. Once the format is decided, we may have to write a tool to generate C code to be compiled with the module and the xml docbook file to be included in the documentation. Any idea to solve this welcome! Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, Oct 24-26, 2016 - http://www.asipto.com

7 years, 7 months

[kamailio/kamailio] dmq_usrloc has "location" table name hardcoded (#796)

by bayan9

dmq_usrloc has "location" hardcoded as the table name. If usrloc module is using a different table name for save() and lookup(), dmq_usrloc fails. One potential solution could be to have a modparam for dmq_usrloc to specify the tables to sync -- 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/796

7 years, 7 months

git:master:8c4b538f: modules: readme files regenerated - db_unixodbc ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 8c4b538fc4279a47894f591d451ba294096c07be URL: https://github.com/kamailio/kamailio/commit/8c4b538fc4279a47894f591d451ba29… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-10-10T12:46:12+02:00 modules: readme files regenerated - db_unixodbc ... --- Modified: modules/db_unixodbc/README --- Diff: https://github.com/kamailio/kamailio/commit/8c4b538fc4279a47894f591d451ba29… Patch: https://github.com/kamailio/kamailio/commit/8c4b538fc4279a47894f591d451ba29… --- diff --git a/modules/db_unixodbc/README b/modules/db_unixodbc/README index 72e4b8f..eae1e11 100644 --- a/modules/db_unixodbc/README +++ b/modules/db_unixodbc/README @@ -27,6 +27,7 @@ Marco Lorrai 3.2. auto_reconnect (int) 3.3. use_escape_common (int) 3.4. replace_query (int) + 3.5. quote_char (str) 4. Functions 5. Installation and Running @@ -42,6 +43,7 @@ Marco Lorrai 1.2. Set the “auto_reconnect” parameter 1.3. Set the “use_escape_common” parameter 1.4. Set the “replace_query” parameter + 1.5. Set the “quote_char” parameter Chapter 1. Admin Guide @@ -59,6 +61,7 @@ Chapter 1. Admin Guide 3.2. auto_reconnect (int) 3.3. use_escape_common (int) 3.4. replace_query (int) + 3.5. quote_char (str) 4. Functions 5. Installation and Running @@ -100,6 +103,7 @@ Chapter 1. Admin Guide 3.2. auto_reconnect (int) 3.3. use_escape_common (int) 3.4. replace_query (int) + 3.5. quote_char (str) 3.1. ping_interval (int) @@ -152,6 +156,18 @@ modparam("db_unixodbc", "use_escape_common", 1) modparam("db_unixodbc", "replace_query", 0) ... +3.5. quote_char (str) + + The character to be used for quoting the table and column names in + database queries. + + Default value: “not set” (no quoting). + + Example 1.5. Set the “quote_char” parameter +... +modparam("db_unixodbc", "quote_char", "`") +... + 4. Functions NONE

7 years, 7 months

Re: [sr-dev] [kamailio/kamailio] inserting contact into database failed (#791)

by Daniel-Constantin Mierla

Commit 38038b90a7a3cc05fa7b248d6e16cfcdf29d25e7 adds support in master branch for quoting table and column names to db_unixodbc. -- 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/791#issuecomment-252584606

7 years, 7 months

Re: [sr-dev] [kamailio/kamailio] inserting contact into database failed (#791)

by Daniel-Constantin Mierla

Closed #791. -- 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/791#event-817844525

7 years, 7 months

git:master:38038b90: db_unixodbc: documentation for parameter quote_char

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38038b90a7a3cc05fa7b248d6e16cfcdf29d25e7 URL: https://github.com/kamailio/kamailio/commit/38038b90a7a3cc05fa7b248d6e16cfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:43:28+02:00 db_unixodbc: documentation for parameter quote_char --- Modified: modules/db_unixodbc/doc/db_unixodbc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/38038b90a7a3cc05fa7b248d6e16cfc… Patch: https://github.com/kamailio/kamailio/commit/38038b90a7a3cc05fa7b248d6e16cfc… --- diff --git a/modules/db_unixodbc/doc/db_unixodbc_admin.xml b/modules/db_unixodbc/doc/db_unixodbc_admin.xml index 85d36d9..b20ebf1 100644 --- a/modules/db_unixodbc/doc/db_unixodbc_admin.xml +++ b/modules/db_unixodbc/doc/db_unixodbc_admin.xml @@ -150,6 +150,28 @@ modparam("db_unixodbc", "replace_query", 0) </programlisting> </example> </section> + + <section id="db_unixodbc.p.quote_char"> + <title><varname>quote_char</varname> (str)</title> + <para> + The character to be used for quoting the table and column names in + database queries. + </para> + <para> + <emphasis> + Default value: <quote>not set</quote> (no quoting). + </emphasis> + </para> + <example> + <title>Set the <quote>quote_char</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_unixodbc", "quote_char", "`") +... +</programlisting> + </example> + </section> + </section> <section>

7 years, 7 months

git:master:dab5615c: db_unixodbc: added new parameter - quote_char

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dab5615c3f513d350c86e86bd5acbdc1bf2a0193 URL: https://github.com/kamailio/kamailio/commit/dab5615c3f513d350c86e86bd5acbdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:39:43+02:00 db_unixodbc: added new parameter - quote_char - specify the character to be used for quoting column and table names in database query --- Modified: modules/db_unixodbc/db_unixodbc.c Modified: modules/db_unixodbc/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/dab5615c3f513d350c86e86bd5acbdc… Patch: https://github.com/kamailio/kamailio/commit/dab5615c3f513d350c86e86bd5acbdc… --- diff --git a/modules/db_unixodbc/db_unixodbc.c b/modules/db_unixodbc/db_unixodbc.c index 020ea5e..84aadc7 100644 --- a/modules/db_unixodbc/db_unixodbc.c +++ b/modules/db_unixodbc/db_unixodbc.c @@ -1,6 +1,4 @@ -/* - * $Id$ - * +/* * UNIXODBC module interface * * Copyright (C) 2005-2006 Marco Lorrai @@ -18,14 +16,11 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * - * History: - * -------- - * 2005-12-01 initial commit (chgen) */ #include "../../sr_module.h" @@ -39,6 +34,8 @@ int auto_reconnect = 1; /* Default is enabled */ int use_escape_common = 0; /* Enable common escaping */ int replace_query = 1; /* Enable ODBC replace query */ +char *db_unixodbc_tquote = NULL; + MODULE_VERSION int db_unixodbc_bind_api(db_func_t *dbb); @@ -60,12 +57,13 @@ static param_export_t params[] = { {"ping_interval", INT_PARAM, &ping_interval}, {"auto_reconnect", INT_PARAM, &auto_reconnect}, {"use_escape_common", INT_PARAM, &use_escape_common}, - {"replace_query", INT_PARAM, &replace_query}, + {"replace_query", INT_PARAM, &replace_query}, + {"quote_char", PARAM_STRING, &db_unixodbc_tquote}, {0, 0, 0} }; -struct module_exports exports = { +struct module_exports exports = { "db_unixodbc", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, @@ -95,7 +93,7 @@ int db_unixodbc_bind_api(db_func_t *dbb) dbb->raw_query = db_unixodbc_raw_query; dbb->free_result = db_unixodbc_free_result; dbb->insert = db_unixodbc_insert; - dbb->delete = db_unixodbc_delete; + dbb->delete = db_unixodbc_delete; dbb->update = db_unixodbc_update; if (replace_query) dbb->replace = db_unixodbc_replace; diff --git a/modules/db_unixodbc/dbase.c b/modules/db_unixodbc/dbase.c index 3cddfff..38dea56 100644 --- a/modules/db_unixodbc/dbase.c +++ b/modules/db_unixodbc/dbase.c @@ -169,6 +169,7 @@ static int db_unixodbc_submit_query(const db1_con_t* _h, const str* _s) } +extern char *db_unixodbc_tquote; /* * Initialize database module @@ -176,7 +177,10 @@ static int db_unixodbc_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_unixodbc_init(const str* _url) { - return db_do_init(_url, (void*)db_unixodbc_new_connection); + db1_con_t *c; + c = db_do_init(_url, (void*)db_unixodbc_new_connection); + if(c && db_unixodbc_tquote) CON_TQUOTE(c) = db_unixodbc_tquote; + return c; } /*

7 years, 7 months

git:4.4:e91aec21: websocket: catch CRLFCRLF pings over websocket connections

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: e91aec21e7f7a6f86120d1c9167b04d420369294 URL: https://github.com/kamailio/kamailio/commit/e91aec21e7f7a6f86120d1c9167b04d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-10T12:16:10+02:00 websocket: catch CRLFCRLF pings over websocket connections - reported by GH #810 (cherry picked from commit 8fa51e52e9cf9dbae45069c9354cfeb36997dff9) --- Modified: modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/e91aec21e7f7a6f86120d1c9167b04d… Patch: https://github.com/kamailio/kamailio/commit/e91aec21e7f7a6f86120d1c9167b04d… --- diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index e8653eb..833af22 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -686,8 +686,10 @@ int ws_frame_receive(void *data) frame.payload_data); update_stat(ws_sip_received_frames, 1); - if(frame.payload_len==CRLF_LEN + if((frame.payload_len==CRLF_LEN && strncmp(frame.payload_data, CRLF, CRLF_LEN)==0) + || (frame.payload_len==CRLFCRLF_LEN + && strncmp(frame.payload_data, CRLFCRLF, CRLFCRLF_LEN)==0)) { ws_send_crlf(frame.wsc, opcode); wsconn_put(frame.wsc);

7 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016