sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
231 discussions

git:master: pdt: refactored prefix-domain translation
by Elena-Ramona Modroiu 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: eaa899bc5ca5b0331e83a849b7ce0abf214eb364 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eaa899b… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Tue Dec 20 17:58:42 2011 +0100 pdt: refactored prefix-domain translation - use internally a function that can take the source domain as parameter - new function to config pd_translate(sdomain, flags) to allow source domain to be given from config file --- modules_k/pdt/Makefile | 1 + modules_k/pdt/pdt.c | 218 +++++++++++++++++++++++++---------------------- 2 files changed, 117 insertions(+), 102 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=eaa…

1 0

kamailio 3.1.0 crash on ssl-dos attack
by Jijo 20 Dec '11

20 Dec '11

Hi All, Kamailio is resetting when we do TLS renegotiation dos attack using the tool available at http://www.thc.org/thc-ssl-dos/. Anybody looked at this issue? How we could resolve it. Any idea? The core generated for 3 pid's as below Pid 1: Core was generated by `/usr/sbin/kamailio -u swrun -g sw -m 120 -f /etc/kamailio/kamailio.cfg'. Program terminated with signal 11, Segmentation fault. #0 atomic_inc_int () at atomic/atomic_x86.h:225 (gdb) bt #0 atomic_inc_int () at atomic/atomic_x86.h:225 #1 cfg_update_local () at cfg/cfg_struct.h:228 #2 timer_main () at timer.c:994 #3 0x080b0579 in main_loop () at main.c:1632 #4 0x080b1be4 in main (argc=9, argv=0xbfd61e54) at main.c:2446 Pid 2: Core was generated by `/usr/sbin/kamailio -u swrun -g sw -m 120 -f /etc/kamailio/kamailio.cfg'. Program terminated with signal 11, Segmentation fault. #0 0x0819bfe8 in qm_insert_free (qm=0xaf6c5000, p=0xb05eec30, file=0xb6fb4140 "tls: tls_init.c", func=0xb6fb4ce0 "ser_free", line=296) at mem/q_malloc.c:184 184 if (frag->size <= f->size) break; (gdb) bt #0 0x0819bfe8 in qm_insert_free (qm=0xaf6c5000, p=0xb05eec30, file=0xb6fb4140 "tls: tls_init.c", func=0xb6fb4ce0 "ser_free", line=296) at mem/q_malloc.c:184 #1 qm_free (qm=0xaf6c5000, p=0xb05eec30, file=0xb6fb4140 "tls: tls_init.c", func=0xb6fb4ce0 "ser_free", line=296) at mem/q_malloc.c:518 #2 0xb6f95404 in ser_free (ptr=0xb05eec30) at tls_init.c:296 #3 0xb732e9ba in CRYPTO_free (str=0xb05eec30) at mem.c:391 #4 0xb7330bee in int_new_ex_data (class_index=5, obj=0xbfd414f4, ad=0xbfd41574) at ex_data.c:440 #5 0xb7330443 in CRYPTO_new_ex_data (class_index=5, obj=0xbfd414f4, ad=0xbfd41574) at ex_data.c:575 #6 0xb73dfde3 in X509_STORE_CTX_init (ctx=0xbfd414f4, store=0xafd8b3d0, x509=0xafe08ff0, chain=0x0) at x509_vfy.c:2114 #7 0xb74b0f31 in ssl3_output_cert_chain (s=0xb0553a10, x=0xafe08ff0) at s3_both.c:349 #8 0xb74a4728 in ssl3_send_server_certificate (s=0xb0553a10) at s3_srvr.c:3034 #9 0xb74a5879 in ssl3_accept (s=0xb0553a10) at s3_srvr.c:353 #10 0xb74afa8f in ssl3_read_bytes (s=0xb0553a10, type=23, buf=0xb0ad44ec "", len=4095, peek=0) at s3_pkt.c:1266 #11 0xb74ac9c9 in ssl3_read_internal (s=0xb0553a10, buf=0xb0ad44ec, len=4095, peek=0) at s3_lib.c:3265 #12 0xb74c24a9 in SSL_read (s=0xb0553a10, buf=0xb0ad44ec, num=4095) at ssl_lib.c:954 #13 0xb6fad1c3 in tls_read_f (c=0xb0ad431c, flags=0xbfd619c4) at tls_server.c:1058 #14 0x08171c0e in tcp_read_headers (c=0xb0ad431c, read_flags=0xbfd619c4) at tcp_read.c:406 #15 0x08171db8 in tcp_read_req (con=0xb0ad431c, bytes_read=0xbfd619cc, read_flags=0xbfd619c4) at tcp_read.c:885 #16 0x08172f67 in handle_io (fm=<value optimized out>, events=1, idx=<value optimized out>) at tcp_read.c:1234 #17 0x0817583b in io_wait_loop_epoll (unix_sock=89) at io_wait.h:1092 #18 tcp_receive_loop (unix_sock=89) at tcp_read.c:1345 #19 0x0816e2e9 in tcp_init_children () at tcp_main.c:4867 #20 0x080affb1 in main_loop () at main.c:1646 #21 0x080b1be4 in main (argc=9, argv=0xbfd61e54) at main.c:2446 Pid 3: Core was generated by `/usr/sbin/kamailio -u swrun -g sw -m 120 -f /etc/kamailio/kamailio.cfg'. Program terminated with signal 11, Segmentation fault. #0 0xb76c9e7c in memmove () from /lib/libc.so.6 (gdb) bt #0 0xb76c9e7c in memmove () from /lib/libc.so.6 #1 0x081724e7 in tcp_read_req (con=0xb022c8f0, bytes_read=0xbfd619cc, read_flags=0xbfd619c4) at tcp_read.c:1026 #2 0x08172f67 in handle_io (fm=<value optimized out>, events=1, idx=<value optimized out>) at tcp_read.c:1234 #3 0x0817583b in io_wait_loop_epoll (unix_sock=93) at io_wait.h:1092 #4 tcp_receive_loop (unix_sock=93) at tcp_read.c:1345 #5 0x0816e2e9 in tcp_init_children () at tcp_main.c:4867 #6 0x080affb1 in main_loop () at main.c:1646 #7 0x080b1be4 in main (argc=9, argv=0xbfd61e54) at main.c:2446

2 13

git:master: textopsx: added fnmatch(value, expr, flags) function
by Daniel-Constantin Mierla 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: 0c830402b517f3e4194dd28b0383e57b8a803d21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c83040… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 19 22:08:57 2011 +0100 textopsx: added fnmatch(value, expr, flags) function - shell-style pattern matching (via file selection wildcards), using C function fnmatch() --- modules/textopsx/README | 20 +++++++++ modules/textopsx/doc/functions.xml | 29 ++++++++++++ modules/textopsx/textopsx.c | 84 +++++++++++++++++++++++++++++++++++- 3 files changed, 131 insertions(+), 2 deletions(-) diff --git a/modules/textopsx/README b/modules/textopsx/README index d4e51e8..104638a 100644 --- a/modules/textopsx/README +++ b/modules/textopsx/README @@ -19,6 +19,7 @@ Daniel-Constantin Mierla 1.2.2. change_reply_status(code, reason) 1.2.3. remove_body() 1.2.4. keep_hf(regexp) + 1.2.5. fnmatch(value, expr [, flags]) 1.1. Overview @@ -95,3 +96,22 @@ remove_body(); ... keep_hf("User-Agent"); ... + +1.2.5. fnmatch(value, expr [, flags]) + + Match the value against the expr using the shell-style pattern for file + name matching (see man page for C function fnmatch()). It is known to + be faster and uses less-memory than regexp. + + Parameters flags is optional and can be 'i' to do case insensitive + matching. + + This function can be used from ANY_ROUTE. + + Example 5. fnmatch() usage +... +if(fnmatch("$rU", "123*")) +{ + ... +} +... diff --git a/modules/textopsx/doc/functions.xml b/modules/textopsx/doc/functions.xml index eec3144..ab4eb06 100644 --- a/modules/textopsx/doc/functions.xml +++ b/modules/textopsx/doc/functions.xml @@ -117,4 +117,33 @@ keep_hf("User-Agent"); </example> </section> + <section id="textopsx.fnmatch"> + <title> + <function moreinfo="none">fnmatch(value, expr [, flags])</function> + </title> + <para> + Match the value against the expr using the shell-style pattern + for file name matching (see man page for C function fnmatch()). + It is known to be faster and uses less-memory than regexp. + </para> + <para> + Parameters flags is optional and can be 'i' to do case insensitive + matching. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>fnmatch()</function> usage</title> + <programlisting format="linespecific"> +... +if(fnmatch("$rU", "123*")) +{ + ... +} +... +</programlisting> + </example> + </section> + </section> diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index 687cce4..7dddf8b 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <fnmatch.h> #include "../../sr_module.h" #include "../../dprint.h" @@ -40,10 +41,14 @@ MODULE_VERSION static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); -static int change_reply_status_f(struct sip_msg*, char*, char *); +static int change_reply_status_f(sip_msg_t*, char*, char*); static int change_reply_status_fixup(void** param, int param_no); -static int w_keep_hf_f(struct sip_msg*, char*, char *); +static int w_keep_hf_f(sip_msg_t*, char*, char*); + +static int w_fnmatch2_f(sip_msg_t*, char*, char*); +static int w_fnmatch3_f(sip_msg_t*, char*, char*, char*); +static int fixup_fnmatch(void** param, int param_no); static int w_remove_body_f(struct sip_msg*, char*, char *); static int bind_textopsx(textopsx_api_t *tob); @@ -58,6 +63,10 @@ static cmd_export_t cmds[] = { 0, ANY_ROUTE }, {"keep_hf", (cmd_function)w_keep_hf_f, 1, fixup_regexp_null, ANY_ROUTE }, + {"fnmatch", (cmd_function)w_fnmatch2_f, 2, + fixup_fnmatch, ANY_ROUTE }, + {"fnmatch", (cmd_function)w_fnmatch3_f, 3, + fixup_fnmatch, ANY_ROUTE }, {"bind_textopsx", (cmd_function)bind_textopsx, 1, 0, ANY_ROUTE }, @@ -323,6 +332,77 @@ static int w_keep_hf_f(struct sip_msg* msg, char* key, char* foo) return -1; } +/** + * + */ +static int w_fnmatch(str *val, str *match, str *flags) +{ + int i; + i = 0; +#ifdef FNM_CASEFOLD + if(flags && (flags->s[0]=='i' || flags->s[0]=='I')) + i = FNM_CASEFOLD; +#endif + if(fnmatch(match->s, val->s, i)==0) + return 0; + return -1; +} + +/** + * + */ +static int w_fnmatch2_f(sip_msg_t *msg, char *val, char *match) +{ + str sval; + str smatch; + if(get_str_fparam(&sval, msg, (fparam_t*)val)<0 + || get_str_fparam(&smatch, msg, (fparam_t*)match)<0) + { + LM_ERR("invalid parameters"); + return -1; + } + if(w_fnmatch(&sval, &smatch, NULL)<0) + return -1; + return 1; +} + +/** + * + */ +static int w_fnmatch3_f(sip_msg_t *msg, char *val, char *match, char *flags) +{ + str sval; + str smatch; + str sflags; + if(get_str_fparam(&sval, msg, (fparam_t*)val)<0 + || get_str_fparam(&smatch, msg, (fparam_t*)match)<0 + || get_str_fparam(&sflags, msg, (fparam_t*)flags)<0) + { + LM_ERR("invalid parameters"); + return -1; + } + if(w_fnmatch(&sval, &smatch, &sflags)<0) + return -1; + return 1; +} + +/** + * + */ +static int fixup_fnmatch(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_var_pve_12(param, param_no); + } else if (param_no == 2) { + return fixup_var_pve_12(param, param_no); + } else if (param_no == 3) { + return fixup_var_pve_12(param, param_no); + } else { + return 0; + } + +} + /* * Function to load the textops api. */

2 2

git:master: tcp: fix for ENOTCONN on newer FreeBSDs
by Andrei Pelinescu-Onciul 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: 3d4a59421a284afbf8bdf8e87357f07d9cd554e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d4a594… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Nov 22 12:55:39 2011 +0100 tcp: fix for ENOTCONN on newer FreeBSDs Newer FreeBSDs return ENOTCONN instead of EAGAIN/EWOULDBLOCK when trying to send on a non-blocking socket which is not yet fully connected (the connect is still pending). Reported-by: Dmitry Petrakoff dimon dprs-consulting com --- tcp_main.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index 0986207..e21821c 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -2716,7 +2716,10 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, n=_tcpconn_write_nb(fd, c, buf, len); if (unlikely(n<(int)len)){ - if ((n>=0) || errno==EAGAIN || errno==EWOULDBLOCK){ + /* on EAGAIN or ENOTCONN return success. + ENOTCONN appears on newer FreeBSD versions (non-blocking socket, + connect() & send immediately) */ + if ((n>=0) || errno==EAGAIN || errno==EWOULDBLOCK || errno==ENOTCONN){ DBG("pending write on new connection %p " " (%d/%d bytes written)\n", c, n, len); if (unlikely(n<0)) n=0;

1 0

git:master: dialplan: added fnmatch (2) matching operator
by Daniel-Constantin Mierla 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: a6da2035c27d1026357bd5ed54c0fce434b162ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6da203… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 20 11:27:14 2011 +0100 dialplan: added fnmatch (2) matching operator - if match_op=2, the matching of the rule is done using fnmatch function which does shell-like pattern matching --- modules/dialplan/README | 51 +++++++++++++++++-------------- modules/dialplan/dialplan.h | 5 ++- modules/dialplan/doc/dialplan_admin.xml | 12 +++++-- modules/dialplan/dp_db.c | 8 +++-- modules/dialplan/dp_repl.c | 18 +++++++++-- 5 files changed, 60 insertions(+), 34 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a6d…

1 0

git:master: core/tcp: init max_tls_connections in tcp options check
by Daniel-Constantin Mierla 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: 3ab8db548c0f2aedf5bba4eae48da660defd510b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ab8db5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 20 09:20:40 2011 +0100 core/tcp: init max_tls_connections in tcp options check --- tcp_options.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tcp_options.c b/tcp_options.c index 2705d5b..ce3a381 100644 --- a/tcp_options.c +++ b/tcp_options.c @@ -375,8 +375,10 @@ void tcp_options_check() MAX_TCP_CON_LIFETIME, MAX_TCP_CON_LIFETIME); #ifdef USE_TCP tcp_default_cfg.max_connections=tcp_max_connections; + tcp_default_cfg.max_tls_connections=tls_max_connections; #else /* USE_TCP */ tcp_default_cfg.max_connections=0; + tcp_default_cfg.max_tls_connections=0; #endif /* USE_TCP */ tcp_cfg_def_fix("rd_buf_size", (int*)&tcp_default_cfg.rd_buf_size); tcp_cfg_def_fix("wq_blk_size", (int*)&tcp_default_cfg.wq_blk_size);

1 0

git:master: core/tcp: proper init of parameter tls_max_connections
by Daniel-Constantin Mierla 20 Dec '11

20 Dec '11

Module: sip-router Branch: master Commit: a38ff36df9e802b129f1b52427a9ed4959197d29 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a38ff36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 20 00:33:39 2011 +0100 core/tcp: proper init of parameter tls_max_connections - the fixup function was setting to tcp value --- tcp_options.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/tcp_options.c b/tcp_options.c index dc5df93..2705d5b 100644 --- a/tcp_options.c +++ b/tcp_options.c @@ -51,6 +51,7 @@ static int fix_connect_to(void* cfg_h, str* gname, str* name, void** val); static int fix_send_to(void* cfg_h, str* gname, str* name, void** val); static int fix_con_lt(void* cfg_h, str* gname, str* name, void** val); static int fix_max_conns(void* cfg_h, str* gname, str* name, void** val); +static int fix_max_tls_conns(void* cfg_h, str* gname, str* name, void** val); @@ -71,7 +72,7 @@ static cfg_def_t tcp_cfg_def[] = { fix_max_conns, 0, "maximum tcp connections number, soft limit"}, { "max_tls_connections", CFG_VAR_INT | CFG_ATOMIC, 0, (1U<<31)-1, - fix_max_conns, 0, + fix_max_tls_conns,0, "maximum tls connections number, soft limit"}, { "no_connect", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set only accept new connections, never actively open new ones"}, @@ -138,6 +139,7 @@ void init_tcp_options() tcp_default_cfg.max_tls_connections=tls_max_connections; #else /*USE_TCP*/ tcp_default_cfg.max_connections=0; + tcp_default_cfg.max_tls_connections=0; #endif /*USE_TCP*/ #ifdef TCP_ASYNC tcp_default_cfg.async=1; @@ -258,6 +260,27 @@ static int fix_max_conns(void* cfg_h, str* gname, str* name, void** val) return 0; } +static int fix_max_tls_conns(void* cfg_h, str* gname, str* name, void** val) +{ + int v; + v=(int)(long)*val; +#ifdef USE_TLS + if (v>tls_max_connections){ + INFO("cannot override hard tls_max_connections limit, please" + " restart and increase tls_max_connections in the cfg.\n"); + v=tls_max_connections; + } +#else /* USE_TLS */ + if (v){ + ERR("TLS support disabled at compile-time, tls_max_connection is" + " hardwired to 0.\n"); + v=0; + } +#endif /*USE_TLS */ + *val=(void*)(long)v; + return 0; +} + /** fix *val according to the cfg entry "name".

1 0

git:master: core: added function to help fixup of PVE, string and expressions
by Daniel-Constantin Mierla 19 Dec '11

19 Dec '11

Module: sip-router Branch: master Commit: 4c52cf0577636fe6a202c255c3872e45b841dc06 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c52cf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 19 21:58:24 2011 +0100 core: added function to help fixup of PVE, string and expressions - existing function could convert single pv PVE in PVAR, which can cause troubles as PVE value should be always zero terminated --- sr_module.c | 37 +++++++++++++++++++++++++++++++++++++ sr_module.h | 3 +++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/sr_module.c b/sr_module.c index 853c7a2..8bc52d9 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1385,6 +1385,43 @@ int fixup_var_str_2(void** param, int param_no) else return 0; } +/** fixup variable-pve-only-string. + * The parameter can be a PVE (pv based format string) + * or string. + * non-static PVEs identifiers will be resolved to + * their values during runtime. + * The parameter value will be converted to fparam structure + * @param param - double pointer to param, as for normal fixup functions. + * @param param_no - parameter number, ignored. + * @return -1 on an error, 0 on success. + */ +int fixup_var_pve_12(void** param, int param_no) +{ + int ret; + fparam_t* fp; + if (fixup_get_param_type(param) != STRING_RVE_ST) { + /* if called with a RVE already converted to string => + don't try PVE again (to avoid double + deref., e.g.: $foo="$bar"; f($foo) ) */ + if ((ret = fix_param(FPARAM_PVE, param)) <= 0) { + if (ret < 0) + return ret; + /* check if it resolved to a dynamic or "static" PVE. + If the resulting PVE is static (normal string), discard + it and use the normal string fixup (faster at runtime) */ + fp = (fparam_t*)*param; + if (fp->v.pve->spec.getf == 0) + fparam_free_restore(param); /* fallback to STR below */ + else + return ret; /* dynamic PVE => return */ + } + + } + if ((ret = fix_param(FPARAM_STR, param)) <= 0) return ret; + ERR("Error while fixing parameter - PVE or str conversions failed\n"); + return -1; +} + /** fixup variable-pve-string. diff --git a/sr_module.h b/sr_module.h index ce8c781..810008f 100644 --- a/sr_module.h +++ b/sr_module.h @@ -542,6 +542,9 @@ int fixup_var_str_1(void** param, int param_no); /** Same as fixup_var_str_12 but applies to the 2nd parameter only */ int fixup_var_str_2(void** param, int param_no); +/** fixup variable-pve-only-string. */ +int fixup_var_pve_12(void** param, int param_no); + /** fixup variable-pve-string. * The parameter can be a PVAR, AVP, SELECT, PVE (pv based format string) * or string.

1 0

git:tma0/iptrtpproxy-v2: Support for dash in hostname
by Tomas Mandys 19 Dec '11

19 Dec '11

Module: sip-router Branch: tma0/iptrtpproxy-v2 Commit: 7655e9bdc9457aa3f562f9af499fe47e93731480 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7655e9b… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Mon Dec 19 13:57:57 2011 +0100 Support for dash in hostname - overriden section parser to allow less strict syntax --- modules/iptrtpproxy/iptrtpproxy.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/modules/iptrtpproxy/iptrtpproxy.c b/modules/iptrtpproxy/iptrtpproxy.c index 63e38c0..685bd2c 100644 --- a/modules/iptrtpproxy/iptrtpproxy.c +++ b/modules/iptrtpproxy/iptrtpproxy.c @@ -2332,6 +2332,9 @@ static cfg_option_t section_dummy_options[] = { static int parse_section_name(void* param, cfg_parser_t* st, unsigned int flags) { cfg_token_t t; int ret, fl; + str tok; + char buf[MAX_TOKEN_LEN]; + ret = safe_parsed_values(); if (ret != 0) return ret; @@ -2354,8 +2357,31 @@ static int parse_section_name(void* param, cfg_parser_t* st, unsigned int flags) if (ret != 0) return ret; if (t.type != ':') goto skip; - ret = cfg_parse_section(&parse_config_vals.name, st, CFG_STR_PKGMEM); - if (ret != 0) return ret; + + /* we need override cfg_parse_section() because of possible dash '-' in section name */ + tok.s = buf; + tok.len = 0; + while (1) { + ret = cfg_get_token(&t, st, 0); + if (ret != 0) return ret; + if (t.type == ']') + break; + if (tok.len+t.val.len >= sizeof(buf)-1) goto skip; + memcpy(tok.s+tok.len, t.val.s, t.val.len); + tok.len += t.val.len; + + } + tok.s[tok.len] = '\0'; + + ret = cfg_eat_eol(st, 0); + if (ret != 0) { + return ret; + } + + parse_config_vals.name.s = pkg_malloc(tok.len+1); + if (!parse_config_vals.name.s) return -1; + memcpy(parse_config_vals.name.s, tok.s, tok.len+1); + parse_config_vals.name.len = tok.len; if (fl==iptrtpproxy_default) { if (parse_config_vals.name.len == (sizeof(SWITCHBOARD_PREFIX)-1) && strncmp(parse_config_vals.name.s, SWITCHBOARD_PREFIX, parse_config_vals.name.len) == 0) {

1 0

[tracker] Task closed: a74f12d6 (3.2) registrar breaks save(..., 0x4) functionality
by sip-router 19 Dec '11

19 Dec '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#192 - a74f12d6 (3.2) registrar breaks save(..., 0x4) functionality User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: Patch applied on git master. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=192 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011