sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

[kamailio/kamailio] Debian repository is down (#769)
by Alberto López Doñaque 06 Sep '16

06 Sep '16

http://deb.kamailio.org/ It's down since last Friday. Some news about it? Thanks -- 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/769

2 2

[kamailio/kamailio] Permissions module RPC array issue (#747)
by kelchy 06 Sep '16

06 Sep '16

using 4.4.2 on kamctl kamcmd permissions.addressDump { table: 80 group: 5 item: { ip: 6x.x4.1x7.10 port: 50060 tag: 0 } table: 120 group: 8 item: { ip: 1x8.1x4.1x6.19 port: 50060 tag: 0 } table: 122 group: 7 item: { ip: 1x8.1x4.1x6.17 port: 50060 tag: 0 } table: 122 group: 6 item: { ip: 1x8.1x4.1x6.17 port: 50060 tag: 0 } } on jsonrpc-s { jsonrpc: '2.0', result: { table: 122, group: 6, item: { ip: '1x8.1x4.1x6.17', port: 50060, tag: '0' } } } -- 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/747

2 3

git: new commits in branch master
by GitHub 06 Sep '16

06 Sep '16

- URL: https://github.com/kamailio/kamailio/commit/1e1c1ed02bfa8454c9ff6d32cc2cde5… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-08-29T11:12:42-04:00 Merge remote-tracking branch 'refs/remotes/kamailio/master' - URL: https://github.com/kamailio/kamailio/commit/421ec8fd32ea3766329a7f37420ab5d… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-08-29T12:13:49-04:00 sca: terminate all error and debug messages with a new line - issue reported by oej, GH #580 also whitespace cleanup - URL: https://github.com/kamailio/kamailio/commit/4a50b819fc620dada28b8e5c40962c2… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-08-29T15:17:22-04:00 sca: removed non-documented modparam 'outbound_proxy' - issue reported by oej, GH #580. Modparam outbound_proxy was defined in sca.c and sca.h but never used in the module. - URL: https://github.com/kamailio/kamailio/commit/e3c572ded584f82219f70054417eb05… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-08-30T07:50:26-04:00 Revert "sca: removed non-documented modparam 'outbound_proxy'" This reverts commit 4a50b819fc620dada28b8e5c40962c2c22c689bc. - URL: https://github.com/kamailio/kamailio/commit/672ea9bd7434a5b01479da8ebe59a1a… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-08-30T07:50:50-04:00 Revert "sca: terminate all error and debug messages with a new line" This reverts commit 421ec8fd32ea3766329a7f37420ab5d93e23e05e. - URL: https://github.com/kamailio/kamailio/commit/a8fae373c1b197012a33bb0b8114fc2… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-08-31T15:32:49-04:00 sca: terminate all error and debug messages with a new line - issue reported by oej, FH #580 Commmit also includes whitespace cleanup.. - URL: https://github.com/kamailio/kamailio/commit/aadc09287544df64f0d8452160f725e… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-02T12:18:11-04:00 sca: remove a unused variable - Eclipse was giving me errors on the log_stderr that is part of the LM_ statements. I was adding them to each file so I could see if I was creating syntax errors. This one got overlooked. - URL: https://github.com/kamailio/kamailio/commit/890b37ff24289c24f255c638890c70e… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-02T15:21:09-04:00 Merge remote-tracking branch 'refs/remotes/kamailio/master' - URL: https://github.com/kamailio/kamailio/commit/f9c78192ace7768d814322135398e3f… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-02T15:26:52-04:00 Revert "sca: remove a unused variable" This reverts commit aadc09287544df64f0d8452160f725ee6de06f75. - URL: https://github.com/kamailio/kamailio/commit/e28af9593de8a816f30c8199b16ba84… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-02T15:39:26-04:00 sca: remvoed unused variable 'log_stderr' - When coding the new line terminators for the last commit, I defined a varaible to remove the "symbol 'log_stderr' cound not be resolved" messages I was getting in Eclipse. This was to make sure I did not introduce errors into the code. I forgot to remove this one. - URL: https://github.com/kamailio/kamailio/commit/14704bf239c67a24d496287738840d3… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-02T16:01:42-04:00 sca: added some additional debug statements - Needed some additional debug statements to figure out the issues with the SCA module. - URL: https://github.com/kamailio/kamailio/commit/308adadbe7edcf5972e13f989be690f… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-02T16:19:32-04:00 sca: reversed the from_tag and to_tag variables in the function call - The function sca_dialog_build_from_tags() has the following parameter listing...(sca_dialog *dialog, int maxlen, str *call_id, str *from_tag, str *to_tag). The call to this function in the sca_call_info_uri_update function had the 'to_tag' variable in the 'from_tag' parameter space and the 'from_tag' variable in the 'to_tag' parameter space. Reversing them resolved the issue of multiple appearance showing up on a held and seize events. - URL: https://github.com/kamailio/kamailio/commit/26bc742f0b238822891e4820fafaebc… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-02T17:03:59-04:00 Revert "sca: reversed the from_tag and to_tag variables in the function call" This reverts commit 308adadbe7edcf5972e13f989be690fd09893c65. - URL: https://github.com/kamailio/kamailio/commit/57c4ec824fdd6c6c797bd7d6bfb3d65… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-02T17:16:38-04:00 sca: reversed the from_tag and to_tag variables in the function call - Part of the issue reported by Kevin Scott Adams, GH #341. The function sca_dialog_build_from_tags() has the following parameter listing...(sca_dialog *dialog, int maxlen, str *call_id, str *from_tag, str *to_tag). The call to this function in the sca_call_info_uri_update() function had the âto_tagâ variable in the âfrom_tagâ parameter position and the âfrom_tagâ variable in the âto_tagâ parameter position. Reversing the âto_tagâ and âfrom_tagâ variables in the function call resolved the issue of multiple appearance showing up on held and seize events. - URL: https://github.com/kamailio/kamailio/commit/dc10e8e0bb0ea906a61c6efd0cd38c5… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-03T11:03:47-04:00 sca: Fix the CID on seizing a held call from a different SCA AOR UA. - Part of the issue reported by Kevin Scott Adams, GH #341. On seizing a held call from another SCA subscriber UA, the Caller ID becomes the actual AOR of the SCA. In reviewing the SIP traces the INVITE and REPLY of seizing a held call as the 'from' and 'to' URI's set to the AOR. In the sca_call_info_is_line_seize_reinvite() function this is handled but was not handled when a 200 reply was issued. Uploaded, compiled and tested. - URL: https://github.com/kamailio/kamailio/commit/c6740876ecc73b1b6cc704e0c95f463… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-03T11:25:55-04:00 sca: Fixed SCA owner on seizing a held call from a different SCA UA. - Part of the issue reported by Kevin Scott Adams, GH #341. When using 'kamcmd sca.all_appearances' to display the appearances the owner and the callee became the same. I think the owner should be a SCA endpoint of the call and not a non-SCA endpoint. Uploaded compiled and tested inbound and outbound calls. - URL: https://github.com/kamailio/kamailio/commit/7485875c25a8b2c08271f6fed8b7342… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Date: 2016-09-03T11:41:14-04:00 sca: REALLY fix the CID on seizing a held call from a different SCA UA - This should be the end of the issues reported by Kevin Scott Adams, GH #341. I tested but tested with the wrong code branch. Made sure I uploaded and compiled from the *master*. - URL: https://github.com/kamailio/kamailio/commit/2929255df3e7aeec9c3633329c64a4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-06T08:28:10+02:00 Merge pull request #768 from TheGrandWazoo/master sca: fix seized lines on seizing held lines, SCA owner and correct CID on seizing held lines

1 0

[kamailio/kamailio] sca: fix seized lines on seizing held lines, SCA owner and correct CID on seizing held lines (#768)
by Kevin Scott Adams 06 Sep '16

06 Sep '16

Fixes all the issue reported in GH #341 plus some other debug lines. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/768 -- Commit Summary -- * Merge remote-tracking branch 'refs/remotes/kamailio/master' * sca: terminate all error and debug messages with a new line * sca: removed non-documented modparam 'outbound_proxy' * Revert "sca: removed non-documented modparam 'outbound_proxy'" * Revert "sca: terminate all error and debug messages with a new line" * sca: terminate all error and debug messages with a new line * sca: remove a unused variable * Merge remote-tracking branch 'refs/remotes/kamailio/master' * Revert "sca: remove a unused variable" * sca: remvoed unused variable 'log_stderr' * sca: added some additional debug statements * sca: reversed the from_tag and to_tag variables in the function call * Revert "sca: reversed the from_tag and to_tag variables in the function call" * sca: reversed the from_tag and to_tag variables in the function call * sca: Fix the CID on seizing a held call from a different SCA AOR UA. * sca: Fixed SCA owner on seizing a held call from a different SCA UA. * sca: REALLY fix the CID on seizing a held call from a different SCA UA -- File Changes -- M modules/sca/sca_call_info.c (59) M modules/sca/sca_dialog.c (5) M modules/sca/sca_notify.c (14) M modules/sca/sca_util.c (892) -- Patch Links -- https://github.com/kamailio/kamailio/pull/768.patch https://github.com/kamailio/kamailio/pull/768.diff -- 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/pull/768

2 1

git:master:5f780a20: topos: more appropriate error log when attepting to delete header
by Daniel-Constantin Mierla 05 Sep '16

05 Sep '16

Module: kamailio Branch: master Commit: 5f780a202b2132c4d622859a388432f0f6cbb3c7 URL: https://github.com/kamailio/kamailio/commit/5f780a202b2132c4d622859a388432f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-05T09:23:57+02:00 topos: more appropriate error log when attepting to delete header --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/5f780a202b2132c4d622859a388432f… Patch: https://github.com/kamailio/kamailio/commit/5f780a202b2132c4d622859a388432f… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index 37347ab..4757c0b 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -121,7 +121,7 @@ int tps_remove_headers(sip_msg_t *msg, uint32_t hdr) continue; l=del_lump(msg, hf->name.s-msg->buf, hf->len, 0); if (l==0) { - LM_ERR("no memory\n"); + LM_ERR("failed to remove the header\n"); return -1; } }

1 0

[kamailio/kamailio] sca: sca_utils.c Pull request (#767)
by Kevin Scott Adams 02 Sep '16

02 Sep '16

I defined a variable to rid of the error messages I received in Eclipse. I forgot to remove this one. I also had a conflict on the merge so I had to clean my side up for the pull request to work correctly. Thanks, You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/767 -- Commit Summary -- * Merge remote-tracking branch 'refs/remotes/kamailio/master' * sca: terminate all error and debug messages with a new line * sca: removed non-documented modparam 'outbound_proxy' * Revert "sca: removed non-documented modparam 'outbound_proxy'" * Revert "sca: terminate all error and debug messages with a new line" * sca: terminate all error and debug messages with a new line * sca: remove a unused variable * Merge remote-tracking branch 'refs/remotes/kamailio/master' * Revert "sca: remove a unused variable" * sca: remvoed unused variable 'log_stderr' -- File Changes -- M modules/sca/sca_util.c (892) -- Patch Links -- https://github.com/kamailio/kamailio/pull/767.patch https://github.com/kamailio/kamailio/pull/767.diff -- 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/pull/767

1 3

[kamailio/kamailio] 4.3 (#758)
by Kevin Scott Adams 02 Sep '16

02 Sep '16

Terminated all LM_-based statement messages with new line characters You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/758 -- Commit Summary -- * Code formatting changes. * Terminate all LM_* statement messages with a new line. -- File Changes -- M modules/sca/sca.c (567) M modules/sca/sca.h (36) M modules/sca/sca_appearance.c (2242) M modules/sca/sca_appearance.h (187) M modules/sca/sca_call_info.c (3555) M modules/sca/sca_call_info.h (42) M modules/sca/sca_common.h (7) M modules/sca/sca_db.c (250) M modules/sca/sca_db.h (71) M modules/sca/sca_dialog.c (151) M modules/sca/sca_dialog.h (18) M modules/sca/sca_event.c (73) M modules/sca/sca_event.h (16) M modules/sca/sca_hash.c (450) M modules/sca/sca_hash.h (78) M modules/sca/sca_notify.c (597) M modules/sca/sca_notify.h (6) M modules/sca/sca_reply.c (54) M modules/sca/sca_reply.h (2) M modules/sca/sca_rpc.c (809) M modules/sca/sca_rpc.h (44) M modules/sca/sca_subscribe.c (2662) M modules/sca/sca_subscribe.h (71) M modules/sca/sca_util.c (718) M modules/sca/sca_util.h (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/758.patch https://github.com/kamailio/kamailio/pull/758.diff -- 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/pull/758

2 8

VUC - SER-Kamailio At 15 Years - On Friday, Sep 2, 2016
by Daniel-Constantin Mierla 02 Sep '16

02 Sep '16

Hello, on September 3, 2001, the first line of code was committed to SIP Express Router (SER) project, since 2008 turning into Kamailio project. >From pioneering large scale deployments of using SIP for Voice over IP in early 2000s, the project impacted the evolution of real time communications, disrupted the telecom vendors with its open source model and enabled many businesses to grow and innovate. Let's get together to a VUC session later this week, on Friday, Sep2, 2016, to share the good or bad stories while using SER or Kamailio during the past 15 years. If it made your life easy or a nightmare, it's time to tell it. If you have a funny photo or video, no matter is old or recent, join us and show it. More details about VUC and how one can join or watch the session are available at: - https://vuc.me If you want to actively participate during the session, email me shortly to coordinate a bit. If you cannot participate but you have something interesting to share (story, media files, etc...) email me as well and I will present it. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com - http://www.kamailio.org http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 1

git:master:3a161655: Merge pull request #766 from kamailio/transform_escape_csv
by GitHub 02 Sep '16

02 Sep '16

Module: kamailio Branch: master Commit: 3a16165542fb92949e40b877fd52bc5cb0b66ddd URL: https://github.com/kamailio/kamailio/commit/3a16165542fb92949e40b877fd52bc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-09-02T14:28:45+02:00 Merge pull request #766 from kamailio/transform_escape_csv pv: add s.escape.csv transformation --- Modified: lib/kcore/strcommon.c Modified: lib/kcore/strcommon.h Modified: modules/pv/pv_trans.c Modified: modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/3a16165542fb92949e40b877fd52bc5… Patch: https://github.com/kamailio/kamailio/commit/3a16165542fb92949e40b877fd52bc5… --- diff --git a/lib/kcore/strcommon.c b/lib/kcore/strcommon.c index ccc135c..3ae237c 100644 --- a/lib/kcore/strcommon.c +++ b/lib/kcore/strcommon.c @@ -373,3 +373,32 @@ int escape_param(str *sin, str *sout) return 0; } +/*! \brief + * escapes a string to use as a CSV field, as specified in RFC4180: + * - enclose sting in double quotes + * - escape double quotes with a second double quote + */ +int escape_csv(str *sin, str *sout) +{ + char *at, *p; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 2*sin->len+3) + return -1; + + at = sout->s; + p = sin->s; + *at++ = '"'; + while (p < sin->s+sin->len) { + if(*p == '"') { + *at++ = '"'; + } + *at++ = *p++; + } + *at++ = '"'; + *at = 0; + sout->len = at - sout->s; + LM_DBG("escaped string is <%s>\n", sout->s); + + return 0; +} diff --git a/lib/kcore/strcommon.h b/lib/kcore/strcommon.h index a1edc3a..e412884 100644 --- a/lib/kcore/strcommon.h +++ b/lib/kcore/strcommon.h @@ -46,5 +46,7 @@ int escape_param(str *sin, str *sout); int unescape_param(str *sin, str *sout); +int escape_csv(str *sin, str *sout); + #endif diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 17ad35d..6836b42 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -514,6 +514,17 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->flags = PV_VAL_STR; val->rs = st; break; + case TR_S_ESCAPECSV: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if (escape_csv(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; case TR_S_SUBSTR: if(tp==NULL || tp->next==NULL) { @@ -2093,6 +2104,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==14 && strncasecmp(name.s, "unescape.param", 14)==0) { t->subtype = TR_S_UNESCAPEPARAM; goto done; + } else if(name.len==10 && strncasecmp(name.s, "escape.csv", 10)==0) { + t->subtype = TR_S_ESCAPECSV; + goto done; } else if(name.len==8 && strncasecmp(name.s, "prefixes", 8)==0) { t->subtype = TR_S_PREFIXES; if(*p!=TR_PARAM_MARKER) diff --git a/modules/pv/pv_trans.h b/modules/pv/pv_trans.h index 0d61c8b..c6a702c 100644 --- a/modules/pv/pv_trans.h +++ b/modules/pv/pv_trans.h @@ -40,7 +40,7 @@ enum _tr_s_subtype { TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, - TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC + TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

git:master:15187339: pv: add s.escape.csv transformation
by Camille Oudot 02 Sep '16

02 Sep '16

Module: kamailio Branch: master Commit: 151873397c9614731087d38834f8712efe47c67b URL: https://github.com/kamailio/kamailio/commit/151873397c9614731087d38834f8712… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-09-01T18:50:00+02:00 pv: add s.escape.csv transformation escapes a string to use as a CSV field, as specified in RFC4180: - enclose sting in double quotes - escape double quotes with a second double quote --- Modified: lib/kcore/strcommon.c Modified: lib/kcore/strcommon.h Modified: modules/pv/pv_trans.c Modified: modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/151873397c9614731087d38834f8712… Patch: https://github.com/kamailio/kamailio/commit/151873397c9614731087d38834f8712… --- diff --git a/lib/kcore/strcommon.c b/lib/kcore/strcommon.c index ccc135c..3ae237c 100644 --- a/lib/kcore/strcommon.c +++ b/lib/kcore/strcommon.c @@ -373,3 +373,32 @@ int escape_param(str *sin, str *sout) return 0; } +/*! \brief + * escapes a string to use as a CSV field, as specified in RFC4180: + * - enclose sting in double quotes + * - escape double quotes with a second double quote + */ +int escape_csv(str *sin, str *sout) +{ + char *at, *p; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 2*sin->len+3) + return -1; + + at = sout->s; + p = sin->s; + *at++ = '"'; + while (p < sin->s+sin->len) { + if(*p == '"') { + *at++ = '"'; + } + *at++ = *p++; + } + *at++ = '"'; + *at = 0; + sout->len = at - sout->s; + LM_DBG("escaped string is <%s>\n", sout->s); + + return 0; +} diff --git a/lib/kcore/strcommon.h b/lib/kcore/strcommon.h index a1edc3a..e412884 100644 --- a/lib/kcore/strcommon.h +++ b/lib/kcore/strcommon.h @@ -46,5 +46,7 @@ int escape_param(str *sin, str *sout); int unescape_param(str *sin, str *sout); +int escape_csv(str *sin, str *sout); + #endif diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 17ad35d..6836b42 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -514,6 +514,17 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->flags = PV_VAL_STR; val->rs = st; break; + case TR_S_ESCAPECSV: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + st.s = _tr_buffer; + st.len = TR_BUFFER_SIZE; + if (escape_csv(&val->rs, &st)) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs = st; + break; case TR_S_SUBSTR: if(tp==NULL || tp->next==NULL) { @@ -2093,6 +2104,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==14 && strncasecmp(name.s, "unescape.param", 14)==0) { t->subtype = TR_S_UNESCAPEPARAM; goto done; + } else if(name.len==10 && strncasecmp(name.s, "escape.csv", 10)==0) { + t->subtype = TR_S_ESCAPECSV; + goto done; } else if(name.len==8 && strncasecmp(name.s, "prefixes", 8)==0) { t->subtype = TR_S_PREFIXES; if(*p!=TR_PARAM_MARKER) diff --git a/modules/pv/pv_trans.h b/modules/pv/pv_trans.h index 0d61c8b..c6a702c 100644 --- a/modules/pv/pv_trans.h +++ b/modules/pv/pv_trans.h @@ -40,7 +40,7 @@ enum _tr_s_subtype { TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, - TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC + TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016