sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:446dc800: doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date

by Henning Westerholt

Module: kamailio Branch: master Commit: 446dc8006240050a1e0c13c7094e9f9739cc16c8 URL: https://github.com/kamailio/kamailio/commit/446dc8006240050a1e0c13c7094e9f9… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-29T11:39:34+02:00 doc/stylesheets: remove obselete company and e-mail address from my name, update copyright date --- Modified: doc/stylesheets/dbschema_k/bookinfo.xml --- Diff: https://github.com/kamailio/kamailio/commit/446dc8006240050a1e0c13c7094e9f9… Patch: https://github.com/kamailio/kamailio/commit/446dc8006240050a1e0c13c7094e9f9… --- diff --git a/doc/stylesheets/dbschema_k/bookinfo.xml b/doc/stylesheets/dbschema_k/bookinfo.xml index 5e4ce4bf71..e88d18761d 100644 --- a/doc/stylesheets/dbschema_k/bookinfo.xml +++ b/doc/stylesheets/dbschema_k/bookinfo.xml @@ -12,10 +12,6 @@ <editor> <firstname>Henning</firstname> <surname>Westerholt</surname> - <affiliation><orgname>1und1 Internet AG</orgname></affiliation> - <address> - <email>henning.westerholt(a)1und1.de</email> - </address> </editor> <editor> <firstname>Norman</firstname> @@ -23,7 +19,7 @@ </editor> </authorgroup> <copyright> - <year>2008-2017</year> + <year>2008-2020</year> <holder>&kamailio; Project</holder> </copyright> </bookinfo>

4 years, 8 months

git:master:d4311f3d: lib/srdb1: fix warning about wrong namespace in version.xml

by Henning Westerholt

Module: kamailio Branch: master Commit: d4311f3dfa3fc6c3836e8573fb12bc2ae4b6c264 URL: https://github.com/kamailio/kamailio/commit/d4311f3dfa3fc6c3836e8573fb12bc2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-03-29T11:27:07+02:00 lib/srdb1: fix warning about wrong namespace in version.xml --- Modified: src/lib/srdb1/schema/version.xml --- Diff: https://github.com/kamailio/kamailio/commit/d4311f3dfa3fc6c3836e8573fb12bc2… Patch: https://github.com/kamailio/kamailio/commit/d4311f3dfa3fc6c3836e8573fb12bc2… --- diff --git a/src/lib/srdb1/schema/version.xml b/src/lib/srdb1/schema/version.xml index 42734bb2b9..2b65f68dae 100644 --- a/src/lib/srdb1/schema/version.xml +++ b/src/lib/srdb1/schema/version.xml @@ -6,7 +6,7 @@ ]> -<table id="version" xmlns:xi="http://www.w3.org/2001/XInclude"> +<table id="version" xmlns:db="http://docbook.org/ns/docbook">> <name>version</name> <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type>

4 years, 8 months

git:master:91c1b9a0: modules: readme files regenerated - usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 91c1b9a0e68c8a76a84fc7696b755cc1c8205aa5 URL: https://github.com/kamailio/kamailio/commit/91c1b9a0e68c8a76a84fc7696b755cc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-28T10:31:12+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/91c1b9a0e68c8a76a84fc7696b755cc… Patch: https://github.com/kamailio/kamailio/commit/91c1b9a0e68c8a76a84fc7696b755cc… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 5f3592be47..5ec1281c47 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -94,6 +94,8 @@ Carsten Bock 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) + 3.55. ka_loglevel (int) + 3.56. ka_logmsg (str) 4. RPC Commands @@ -195,6 +197,8 @@ Carsten Bock 1.52. ka_from parameter usage 1.53. ka_domain parameter usage 1.54. ka_filter parameter usage + 1.55. ka_loglevel parameter usage + 1.56. ka_logmsg parameter usage Chapter 1. Admin Guide @@ -265,6 +269,8 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) + 3.55. ka_loglevel (int) + 3.56. ka_logmsg (str) 4. RPC Commands @@ -398,6 +404,8 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) + 3.55. ka_loglevel (int) + 3.56. ka_logmsg (str) 3.1. nat_bflag (int) @@ -1155,6 +1163,35 @@ modparam("usrloc", "ka_domain", "mydomain.com") modparam("usrloc", "ka_filter", 1) ... +3.55. ka_loglevel (int) + + The level to print the log message when the keepalive response is + received. It should be a value between LOG_ALERT + + Default value is “kamailio.org”. + + Example 1.55. ka_loglevel parameter usage +... +modparam("usrloc", "ka_loglevel", 1) +... + +3.56. ka_logmsg (str) + + The formatted log specification to be added to the message printed when + the keepalive is received and roundtrip time is computed. The log + message starts with "keepalive roundtrip: %u.%06u sec - ruid [%.*s]", + then concatenates the value of this parameter and the end of line. + + The value of this parameter can contain script variables that are + evaluated with the SIP response. + + Default value is “ to-uri: [$tu] src-uri: [$su]”. + + Example 1.56. ka_logmsg parameter usage +... +modparam("usrloc", "ka_logmsg", " to-uri: [$tu] src-uri: [$su]") +... + 4. RPC Commands 4.1. ul.dump

4 years, 8 months

git:master:54bce5c7: usrloc: docs for ka_loglevel and ka_logmsg params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 54bce5c707feb91b2de90abe64e75952972816f0 URL: https://github.com/kamailio/kamailio/commit/54bce5c707feb91b2de90abe64e7595… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-28T10:11:54+01:00 usrloc: docs for ka_loglevel and ka_logmsg params --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/54bce5c707feb91b2de90abe64e7595… Patch: https://github.com/kamailio/kamailio/commit/54bce5c707feb91b2de90abe64e7595… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 7b945a76bb..a6d9654d51 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1424,6 +1424,50 @@ modparam("usrloc", "ka_filter", 1) </example> </section> + <section id="usrloc.p.ka_loglevel"> + <title><varname>ka_loglevel</varname> (int)</title> + <para> + The level to print the log message when the keepalive response is + received. It should be a value between LOG_ALERT + </para> + <para> + Default value is <quote>kamailio.org</quote>. + </para> + <example> + <title><varname>ka_loglevel</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_loglevel", 1) +... + </programlisting> + </example> + </section> + + <section id="usrloc.p.ka_logmsg"> + <title><varname>ka_logmsg</varname> (str)</title> + <para> + The formatted log specification to be added to the message printed when + the keepalive is received and roundtrip time is computed. The log + message starts with "keepalive roundtrip: %u.%06u sec - ruid [%.*s]", + then concatenates the value of this parameter and the end of line. + </para> + <para> + The value of this parameter can contain script variables that are + evaluated with the SIP response. + </para> + <para> + Default value is <quote> to-uri: [$tu] src-uri: [$su]</quote>. + </para> + <example> + <title><varname>ka_logmsg</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_logmsg", " to-uri: [$tu] src-uri: [$su]") +... + </programlisting> + </example> + </section> + </section> <section>

4 years, 8 months

git:master:0d912f11: usrloc: fexible logging for roundtrip details

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0d912f11c9618ea399b81fe7d38faf335fe911c7 URL: https://github.com/kamailio/kamailio/commit/0d912f11c9618ea399b81fe7d38faf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-28T10:11:54+01:00 usrloc: fexible logging for roundtrip details - new params ka_loglevel and ka_logmsg --- Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0d912f11c9618ea399b81fe7d38faf3… Patch: https://github.com/kamailio/kamailio/commit/0d912f11c9618ea399b81fe7d38faf3… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 7955efa14b..0addb21a42 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -32,6 +32,7 @@ #include "../../core/resolve.h" #include "../../core/forward.h" #include "../../core/globals.h" +#include "../../core/pvar.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" @@ -71,6 +72,9 @@ extern str ul_ka_domain; extern str ul_ka_method; extern int ul_ka_mode; extern int ul_ka_filter; +extern int ul_ka_loglevel; +extern pv_elem_t *ul_ka_logfmt; + extern unsigned int nat_bflag; static unsigned int _ul_ka_counter = 0; @@ -417,11 +421,19 @@ int ul_ka_reply_received(sip_msg_t *msg) gettimeofday(&tvn, NULL); tvdiff = (tvn.tv_sec - tvm.tv_sec) * 1000000 + (tvn.tv_usec - tvm.tv_usec); + ul_update_keepalive(aorhash, &ruid, tvn.tv_sec, tvdiff); - LM_DBG("reply for keepalive of [%.*s:%u] roundtrip: %u.%06usec\n", - ruid.len, ruid.s, aorhash, tvdiff/1000000, tvdiff%1000000); + if(ul_ka_loglevel != 255 && ul_ka_logfmt != NULL) { + if (pv_printf_s(msg, ul_ka_logfmt, &tok) == 0) { + LOG(ul_ka_loglevel, "keepalive roundtrip: %u.%06u sec - ruid [%.*s]%.*s\n", + tvdiff/1000000, tvdiff%1000000, ruid.len, ruid.s, + tok.len, tok.s); + return 0; + } + } - ul_update_keepalive(aorhash, &ruid, tvn.tv_sec, tvdiff); + LM_DBG("response of keepalive for ruid [%.*s] aorhash [%u] roundtrip: %u.%06u secs\n", + ruid.len, ruid.s, aorhash, tvdiff/1000000, tvdiff%1000000); return 0; } diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 0cceb0b0e5..8d3cfffdbf 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -123,6 +123,9 @@ str ul_ka_domain = str_init("kamailio.org"); str ul_ka_method = str_init("OPTIONS"); int ul_ka_mode = 0; int ul_ka_filter = 0; +int ul_ka_loglevel = 255; +str ul_ka_logmsg = str_init(" to-uri: [$tu] src-uri: [$su]"); +pv_elem_t *ul_ka_logfmt = NULL; /* sruid to get internal uid for mi/rpc commands */ sruid_t _ul_sruid; @@ -255,6 +258,7 @@ static param_export_t params[] = { {"ka_domain", PARAM_STR, &ul_ka_domain}, {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, + {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {0, 0, 0} }; @@ -396,9 +400,17 @@ static int mod_init(void) ul_set_xavp_contact_clone(1); } - /* set max partition number for timers processing of db records */ - if((ul_ka_mode != ULKA_NONE) && (ul_timer_procs > 1)) { - ul_set_max_partition((unsigned int)ul_timer_procs); + if(ul_ka_mode != ULKA_NONE) { + /* set max partition number for timers processing of db records */ + if (ul_timer_procs > 1) { + ul_set_max_partition((unsigned int)ul_timer_procs); + } + if(ul_ka_logmsg.len > 0) { + if(pv_parse_format(&ul_ka_logmsg, &ul_ka_logfmt) < 0) { + LM_ERR("failed parsing ka log message format\n"); + return -1; + } + } } init_flag = 1;

4 years, 8 months

[kamailio/kamailio] pv: remove urlencode/urldecode functions (moved to core/strutils) (#2265)

by Armen Babikyan

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2265 -- Commit Summary -- * pv: remove urlencode/urldecode functions; moved to core/strutils -- File Changes -- M src/modules/pv/pv_trans.c (80) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2265.patch https://github.com/kamailio/kamailio/pull/2265.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/2265

4 years, 8 months

git:master:7883a5e4: Merge pull request #2265 from armenb/pv_remove_urlencode_urldecode

by GitHub

Module: kamailio Branch: master Commit: 7883a5e417d10e88d187c7d88f61e28506483b7d URL: https://github.com/kamailio/kamailio/commit/7883a5e417d10e88d187c7d88f61e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-28T08:31:03+01:00 Merge pull request #2265 from armenb/pv_remove_urlencode_urldecode pv: remove urlencode/urldecode functions (moved to core/strutils) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/7883a5e417d10e88d187c7d88f61e28… Patch: https://github.com/kamailio/kamailio/commit/7883a5e417d10e88d187c7d88f61e28… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 36dbcf24b5..826fa9c2ef 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -107,78 +107,6 @@ char *tr_set_crt_buffer(void) /* -- helper functions */ -/* Converts a hex character to its integer value */ -static char pv_from_hex(char ch) -{ - return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10; -} - -/* Converts an integer value to its hex character */ -static char pv_to_hex(char code) -{ - static char hex[] = "0123456789abcdef"; - return hex[code & 15]; -} - -/*! \brief - * URL Encodes a string for use in a HTTP query - */ -static int urlencode_param(str *sin, str *sout) -{ - char *at, *p; - - if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || - sin->len<0 || sout->len < 3*sin->len+1) - return -1; - - at = sout->s; - p = sin->s; - - while (p < sin->s+sin->len) { - if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') - *at++ = *p; - else if (*p == ' ') - *at++ = '+'; - else - *at++ = '%', *at++ = pv_to_hex(*p >> 4), *at++ = pv_to_hex(*p & 15); - p++; - } - - *at = 0; - sout->len = at - sout->s; - LM_DBG("urlencoded string is <%s>\n", sout->s); - - return 0; -} - -/* URL Decode a string */ -static int urldecode_param(str *sin, str *sout) { - char *at, *p; - - at = sout->s; - p = sin->s; - - while (p < sin->s+sin->len) { - if (*p == '%') { - if (p[1] && p[2]) { - *at++ = pv_from_hex(p[1]) << 4 | pv_from_hex(p[2]); - p += 2; - } - } else if (*p == '+') { - *at++ = ' '; - } else { - *at++ = *p; - } - p++; - } - - *at = 0; - sout->len = at - sout->s; - - LM_DBG("urldecoded string is <%s>\n", sout->s); - return 0; -} - /* Encode 7BIT PDU */ static int pdu_7bit_encode(str sin) { int i, j; @@ -215,8 +143,8 @@ static int pdu_7bit_decode(str sin) { unsigned char oldfill = 0; j = 0; for(i = 0; i < sin.len; i += 2) { - _tr_buffer[j] = (unsigned char)pv_from_hex(sin.s[i]) << 4; - _tr_buffer[j] |= (unsigned char)pv_from_hex(sin.s[i+1]); + _tr_buffer[j] = (unsigned char)hex_to_char(sin.s[i]) << 4; + _tr_buffer[j] |= (unsigned char)hex_to_char(sin.s[i+1]); fill = (unsigned char)_tr_buffer[j]; fill >>= (8 - nleft); _tr_buffer[j] <<= (nleft -1 ); @@ -1246,7 +1174,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, return -1; st.s = _tr_buffer; st.len = TR_BUFFER_SIZE; - if (urlencode_param(&val->rs, &st) < 0) + if (urlencode(&val->rs, &st) < 0) return -1; memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; @@ -1260,7 +1188,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, return -1; st.s = _tr_buffer; st.len = TR_BUFFER_SIZE; - if (urldecode_param(&val->rs, &st) < 0) + if (urldecode(&val->rs, &st) < 0) return -1; memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR;

4 years, 8 months

git:master:c2ddf608: pv: remove urlencode/urldecode functions; moved to core/strutils

by Armen Babikyan

Module: kamailio Branch: master Commit: c2ddf608dd3cdb3a071763769e336157f9e831c9 URL: https://github.com/kamailio/kamailio/commit/c2ddf608dd3cdb3a071763769e33615… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2020-03-27T14:14:53-07:00 pv: remove urlencode/urldecode functions; moved to core/strutils --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/c2ddf608dd3cdb3a071763769e33615… Patch: https://github.com/kamailio/kamailio/commit/c2ddf608dd3cdb3a071763769e33615… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 36dbcf24b5..826fa9c2ef 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -107,78 +107,6 @@ char *tr_set_crt_buffer(void) /* -- helper functions */ -/* Converts a hex character to its integer value */ -static char pv_from_hex(char ch) -{ - return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10; -} - -/* Converts an integer value to its hex character */ -static char pv_to_hex(char code) -{ - static char hex[] = "0123456789abcdef"; - return hex[code & 15]; -} - -/*! \brief - * URL Encodes a string for use in a HTTP query - */ -static int urlencode_param(str *sin, str *sout) -{ - char *at, *p; - - if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || - sin->len<0 || sout->len < 3*sin->len+1) - return -1; - - at = sout->s; - p = sin->s; - - while (p < sin->s+sin->len) { - if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') - *at++ = *p; - else if (*p == ' ') - *at++ = '+'; - else - *at++ = '%', *at++ = pv_to_hex(*p >> 4), *at++ = pv_to_hex(*p & 15); - p++; - } - - *at = 0; - sout->len = at - sout->s; - LM_DBG("urlencoded string is <%s>\n", sout->s); - - return 0; -} - -/* URL Decode a string */ -static int urldecode_param(str *sin, str *sout) { - char *at, *p; - - at = sout->s; - p = sin->s; - - while (p < sin->s+sin->len) { - if (*p == '%') { - if (p[1] && p[2]) { - *at++ = pv_from_hex(p[1]) << 4 | pv_from_hex(p[2]); - p += 2; - } - } else if (*p == '+') { - *at++ = ' '; - } else { - *at++ = *p; - } - p++; - } - - *at = 0; - sout->len = at - sout->s; - - LM_DBG("urldecoded string is <%s>\n", sout->s); - return 0; -} - /* Encode 7BIT PDU */ static int pdu_7bit_encode(str sin) { int i, j; @@ -215,8 +143,8 @@ static int pdu_7bit_decode(str sin) { unsigned char oldfill = 0; j = 0; for(i = 0; i < sin.len; i += 2) { - _tr_buffer[j] = (unsigned char)pv_from_hex(sin.s[i]) << 4; - _tr_buffer[j] |= (unsigned char)pv_from_hex(sin.s[i+1]); + _tr_buffer[j] = (unsigned char)hex_to_char(sin.s[i]) << 4; + _tr_buffer[j] |= (unsigned char)hex_to_char(sin.s[i+1]); fill = (unsigned char)_tr_buffer[j]; fill >>= (8 - nleft); _tr_buffer[j] <<= (nleft -1 ); @@ -1246,7 +1174,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, return -1; st.s = _tr_buffer; st.len = TR_BUFFER_SIZE; - if (urlencode_param(&val->rs, &st) < 0) + if (urlencode(&val->rs, &st) < 0) return -1; memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; @@ -1260,7 +1188,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, return -1; st.s = _tr_buffer; st.len = TR_BUFFER_SIZE; - if (urldecode_param(&val->rs, &st) < 0) + if (urldecode(&val->rs, &st) < 0) return -1; memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR;

4 years, 8 months

[kamailio/kamailio] core: strutils - add urlencode and urldecode functions (#2264)

by Armen Babikyan

- moved from modules/pv/pv_trans.c and exported, so they can be used in other modules - genericized fn names You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2264 -- Commit Summary -- * core: strutils - add urlencode and urldecode functions -- File Changes -- M src/core/strutils.c (73) M src/core/strutils.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2264.patch https://github.com/kamailio/kamailio/pull/2264.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/2264

4 years, 8 months

git:master:c5bac154: Merge pull request #2264 from armenb/core_strutils_urlencode_urldecode

by GitHub

Module: kamailio Branch: master Commit: c5bac15472ad7db452e35f000a3236a839f14cf8 URL: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-28T08:30:16+01:00 Merge pull request #2264 from armenb/core_strutils_urlencode_urldecode core: strutils - add urlencode and urldecode functions --- Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… Patch: https://github.com/kamailio/kamailio/commit/c5bac15472ad7db452e35f000a3236a… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index b06fa44175..7df31727cb 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -701,3 +701,76 @@ int reg_replace(char *pattern, char *replacement, char *string, str *result) return replace(&pmatch[0], string, replacement, result); } + +/* Converts a hex character to its integer value */ +char hex_to_char(char hex_code) +{ + return isdigit(hex_code) ? hex_code - '0' : tolower(hex_code) - 'a' + 10; +} + +/* Converts an integer value to its hex character */ +char char_to_hex(char char_code) +{ + static char hex[] = "0123456789abcdef"; + return hex[char_code & 15]; +} + +/*! \brief + * URL Encodes a string + */ +int urlencode(str *sin, str *sout) +{ + char *at, *p; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 3*sin->len+1) + return -1; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') + *at++ = *p; + else + *at++ = '%', *at++ = char_to_hex(*p >> 4), *at++ = char_to_hex(*p & 15); + p++; + } + + *at = 0; + sout->len = at - sout->s; + LM_DBG("urlencoded string is <%s>\n", sout->s); + + return 0; +} + +/*! \brief + * URL Decodes a string + */ +int urldecode(str *sin, str *sout) +{ + char *at, *p; + + at = sout->s; + p = sin->s; + + while (p < sin->s+sin->len) { + if (*p == '%') { + if (p[1] && p[2]) { + *at++ = hex_to_char(p[1]) << 4 | hex_to_char(p[2]); + p += 2; + } + } else if (*p == '+') { + *at++ = ' '; + } else { + *at++ = *p; + } + p++; + } + + *at = 0; + sout->len = at - sout->s; + + LM_DBG("urldecoded string is <%s>\n", sout->s); + return 0; +} diff --git a/src/core/strutils.h b/src/core/strutils.h index 37152dd18d..8b20f72e44 100644 --- a/src/core/strutils.h +++ b/src/core/strutils.h @@ -61,4 +61,8 @@ int escape_param(str *sin, str *sout); int unescape_param(str *sin, str *sout); int escape_csv(str *sin, str *sout); +char hex_to_char(char hex_code); +char char_to_hex(char char_code); +int urlencode(str *sin, str *sout); +int urldecode(str *sin, str *sout); #endif

4 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020