sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

Broken: kamailio/kamailio#8998 (master - f012c52)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #8998 Status: Broken Duration: 4 mins and 23 secs Commit: f012c52 (master) Author: Daniel-Constantin Mierla Message: db_mysql: docs for opt_ssl_mode parameter View the changeset: https://github.com/kamailio/kamailio/compare/1189d75511ba...f012c525264e View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/698161699?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 11 months

git:master:f012c525: db_mysql: docs for opt_ssl_mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f012c525264ed05fec2acb4b3924d4b9a1cd3ab9 URL: https://github.com/kamailio/kamailio/commit/f012c525264ed05fec2acb4b3924d4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-14T11:31:59+02:00 db_mysql: docs for opt_ssl_mode parameter --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f012c525264ed05fec2acb4b3924d4b… Patch: https://github.com/kamailio/kamailio/commit/f012c525264ed05fec2acb4b3924d4b… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index 26e32d8d36..68deb56cab 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -182,6 +182,36 @@ modparam("db_mysql", "update_affected_found", 1) </example> </section> </section> + <section id="db_mysql.p.opt_ssl_mode"> + <title><varname>opt_ssl_mode</varname> (integer)</title> + <para> + Control how the connection to MySQL server is done in regards to SSL/TLS. + If set to 1, SSL/TLS mode is disabled. + </para> + <para> + The 'include/mysql.h' starting with MySQL 5.7.11 defines the values for + this option as enum: 'mysql_ssl_mode { SSL_MODE_DISABLED=1, SSL_MODE_PREFERRED, + SSL_MODE_REQUIRED, SSL_MODE_VERIFY_CA, SSL_MODE_VERIFY_IDENTITY}'. + </para> + <para> + Note: if the value of this parameter is 1, it enforces SSL_MODE_DISABLED, + any other value is passed to the mysql_options(), not checking if it is + defined. + </para> + <para> + <emphasis> + Default value is 0 (0 - off). + </emphasis> + </para> + <example> + <title>Set <varname>opt_ssl_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_mysql", "opt_ssl_mode", 1) +... +</programlisting> + </example> + </section> <section> <title>Functions</title> <para>

3 years, 11 months

git:master:260e25e1: db_mysql: new parameter opt_ssl_mode - allow controling ssl mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 260e25e15c4aa68533ee560bd8fcbdd5ee7b7d6f URL: https://github.com/kamailio/kamailio/commit/260e25e15c4aa68533ee560bd8fcbdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-14T11:18:15+02:00 db_mysql: new parameter opt_ssl_mode - allow controling ssl mode - can disable or enforce use of ssl - some combinations of libmysqlclient and libssl1.1 can result in crashing when ssl/tls is used, even on 127.0.0.1, this param can be used to disable it --- Modified: src/modules/db_mysql/db_mysql.c Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/260e25e15c4aa68533ee560bd8fcbdd… Patch: https://github.com/kamailio/kamailio/commit/260e25e15c4aa68533ee560bd8fcbdd… --- diff --git a/src/modules/db_mysql/db_mysql.c b/src/modules/db_mysql/db_mysql.c index da130f1818..397372f5ac 100644 --- a/src/modules/db_mysql/db_mysql.c +++ b/src/modules/db_mysql/db_mysql.c @@ -45,6 +45,7 @@ unsigned int my_server_timezone = 0; /* Use FROM_UNIXTIME() for date conversion unsigned long my_client_ver = 0; int db_mysql_unsigned_type = 0; +int db_mysql_opt_ssl_mode = 0; struct mysql_counters_h mysql_cnts_h; counter_def_t mysql_cnt_defs[] = { @@ -100,6 +101,7 @@ static param_export_t params[] = { {"insert_delayed", INT_PARAM, &db_mysql_insert_all_delayed}, {"update_affected_found", INT_PARAM, &db_mysql_update_affected_found}, {"unsigned_type", PARAM_INT, &db_mysql_unsigned_type}, + {"opt_ssl_mode", PARAM_INT, &db_mysql_opt_ssl_mode}, {0, 0, 0} }; diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index bed21f92a7..324e707e5b 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -40,6 +40,8 @@ #include "../../core/ut.h" #include "db_mysql.h" +extern int db_mysql_opt_ssl_mode; + /*! \brief * Create a new connection structure, * open the MySQL connection and set reference count to 1 @@ -49,6 +51,8 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) struct my_con* ptr; char *host, *grp, *egrp; unsigned int connection_flag = 0; + unsigned int optuint = 0; + #if MYSQL_VERSION_ID > 50012 #if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION bool rec; @@ -112,6 +116,20 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); +#if MYSQL_VERSION_ID > 50710 + if(db_mysql_opt_ssl_mode!=0) { + if(db_mysql_opt_ssl_mode==1) { + if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { + LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", + SSL_MODE_DISABLED); + } + optuint = SSL_MODE_DISABLED; + } else { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + } + mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); + } +#endif #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ if (db_mysql_auto_reconnect) { diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index f64a90f0aa..349595ee8f 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -31,6 +31,7 @@ #include <string.h> #include <time.h> +extern int db_mysql_opt_ssl_mode; /* * Close the connection and release memory @@ -54,6 +55,7 @@ int my_con_connect(db_con_t* con) { struct my_con* mcon; struct my_uri* muri; + unsigned int optuint = 0; mcon = DB_GET_PAYLOAD(con); muri = DB_GET_PAYLOAD(con->uri); @@ -70,6 +72,20 @@ int my_con_connect(db_con_t* con) (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } +#if MYSQL_VERSION_ID > 50710 + if(db_mysql_opt_ssl_mode!=0) { + if(db_mysql_opt_ssl_mode==1) { + if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { + LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", + SSL_MODE_DISABLED); + } + optuint = SSL_MODE_DISABLED; + } else { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + } + mysql_options(mcon->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); + } +#endif #if MYSQL_VERSION_ID >= 40101 if ((my_client_ver >= 50025) ||

3 years, 11 months

git:master:150ab9d4: siputils: add quotes around contact uri if not there for param encoding

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 150ab9d445da9f7eca1c7312cb70ba176f320131 URL: https://github.com/kamailio/kamailio/commit/150ab9d445da9f7eca1c7312cb70ba1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-13T11:33:52+02:00 siputils: add quotes around contact uri if not there for param encoding --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/150ab9d445da9f7eca1c7312cb70ba1… Patch: https://github.com/kamailio/kamailio/commit/150ab9d445da9f7eca1c7312cb70ba1… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 9f3e09ca46..65168bfc45 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -638,6 +638,8 @@ int ki_contact_param_encode(sip_msg_t *msg, str *nparam, str *saddr) str nuri; char bval[MAX_URI_SIZE]; str pval; + int q; + char *p; if((msg->contact == NULL) && ((parse_headers(msg, HDR_CONTACT_F, 0) == -1) @@ -677,9 +679,19 @@ int ki_contact_param_encode(sip_msg_t *msg, str *nparam, str *saddr) PKG_MEM_ERROR; return -1; } - nuri.len = snprintf(nuri.s, MAX_URI_SIZE-1, "%.*s;%.*s=%.*s", - saddr->len, saddr->s, nparam->len, nparam->s, - pval.len, pval.s); + q = 1; + for(p = c->uri.s-1; p > msg->buf; p++) { + if(*p == '<') { + q = 0; + break; + } + if(*p != ' ' && *p != '\t' && *p != '\n' && *p != '\n') { + break; + } + } + nuri.len = snprintf(nuri.s, MAX_URI_SIZE-1, "%s%.*s;%.*s=%.*s%s", + (q)?"<":"", saddr->len, saddr->s, nparam->len, nparam->s, + pval.len, pval.s, (q)?">":""); if(nuri.len<=0 || nuri.len>=MAX_URI_SIZE) { LM_ERR("failed to build the new contact for [%.*s] uri (%d)\n", c->uri.len, c->uri.s, nuri.len);

3 years, 11 months

git:master:c7e55a33: siputils: proper use uri parameters for decoding contact

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c7e55a33e9026a4ab74170a96dc1029838a80c6e URL: https://github.com/kamailio/kamailio/commit/c7e55a33e9026a4ab74170a96dc1029… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-13T11:09:32+02:00 siputils: proper use uri parameters for decoding contact --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/c7e55a33e9026a4ab74170a96dc1029… Patch: https://github.com/kamailio/kamailio/commit/c7e55a33e9026a4ab74170a96dc1029… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 748e703bd4..9f3e09ca46 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -704,6 +704,10 @@ int ki_contact_param_decode(sip_msg_t *msg, str *nparam) { contact_body_t *cb; contact_t *c; + sip_uri_t puri; + str sparams; + param_t* params = NULL; + param_hooks_t phooks; param_t* pit; char boval[MAX_URI_SIZE]; char bnval[MAX_URI_SIZE]; @@ -726,9 +730,28 @@ int ki_contact_param_decode(sip_msg_t *msg, str *nparam) } cb = (contact_body_t *)msg->contact->parsed; - c = cb->contacts; - while(c != NULL) { - pit = c->params; + for(c = cb->contacts; c != NULL; c = c->next) { + if(c->uri.len<4) { + continue; + } + if (parse_uri(c->uri.s, c->uri.len, &puri) < 0) { + LM_ERR("failed to parse contact uri [%.*s]\n", c->uri.len, c->uri.s); + return -1; + } + if(puri.sip_params.len>0) { + sparams = puri.sip_params; + } else if(puri.params.len>0) { + sparams = puri.params; + } else { + continue; + } + + if (parse_params2(&sparams, CLASS_ANY, &phooks, &params, ';')<0) { + LM_ERR("failed to parse uri params [%.*s]\n", c->uri.len, c->uri.s); + continue; + } + + pit = params; while(pit!=NULL) { if(pit->name.len==nparam->len && strncasecmp(pit->name.s, nparam->s, nparam->len)==0) { @@ -736,46 +759,51 @@ int ki_contact_param_decode(sip_msg_t *msg, str *nparam) } pit=pit->next; } - if(pit!=NULL && pit->body.len>0) { - oval = pit->body; - if(oval.len % 4) { - if(oval.len + 4 >= MAX_URI_SIZE-1) { - LM_ERR("not enough space to insert padding [%.*s]\n", - c->uri.len, c->uri.s); - return -1; - } - memcpy(boval, oval.s, oval.len); - for(i=0; i < (4 - (oval.len % 4)); i++) { - boval[oval.len + i] = '='; - } - oval.s = boval; - oval.len += (4 - (oval.len % 4)); - /* move to next buffer */ - } - nval.len = base64url_dec(oval.s, oval.len, bnval, MAX_URI_SIZE-1); - if (nval.len <= 0) { - LM_ERR("failed to decode contact uri [%.*s]\n", - c->uri.len, c->uri.s); + if(pit==NULL || pit->body.len<=0) { + free_params(params); + continue; + } + + oval = pit->body; + if(oval.len % 4) { + if(oval.len + 4 >= MAX_URI_SIZE-1) { + LM_ERR("not enough space to insert padding [%.*s]\n", + c->uri.len, c->uri.s); + free_params(params); return -1; } - nval.s = (char*)pkg_malloc((nval.len+1)*sizeof(char)); - if(nval.s==NULL) { - PKG_MEM_ERROR; - return -1; + memcpy(boval, oval.s, oval.len); + for(i=0; i < (4 - (oval.len % 4)); i++) { + boval[oval.len + i] = '='; } - memcpy(nval.s, bnval, nval.len); - nval.s[nval.len] = '\0'; - - LM_DBG("decoded new uri [%.*s] (%d)\n", nval.len, nval.s, nval.len); - if(patch(msg, c->uri.s, c->uri.len, nval.s, nval.len) < 0) { - LM_ERR("failed to update contact uri [%.*s]\n", + oval.s = boval; + oval.len += (4 - (oval.len % 4)); + /* move to next buffer */ + } + nval.len = base64url_dec(oval.s, oval.len, bnval, MAX_URI_SIZE-1); + if (nval.len <= 0) { + free_params(params); + LM_ERR("failed to decode contact uri [%.*s]\n", c->uri.len, c->uri.s); - pkg_free(nval.s); - return -2; - } + return -1; + } + nval.s = (char*)pkg_malloc((nval.len+1)*sizeof(char)); + if(nval.s==NULL) { + free_params(params); + PKG_MEM_ERROR; + return -1; } + memcpy(nval.s, bnval, nval.len); + nval.s[nval.len] = '\0'; - c = c->next; + LM_DBG("decoded new uri [%.*s] (%d)\n", nval.len, nval.s, nval.len); + if(patch(msg, c->uri.s, c->uri.len, nval.s, nval.len) < 0) { + LM_ERR("failed to update contact uri [%.*s]\n", + c->uri.len, c->uri.s); + free_params(params); + pkg_free(nval.s); + return -2; + } } return 1;

3 years, 11 months

git:master:d35e7c1d: siputils: ensure that the contact is parsed for param encoding

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d35e7c1dd7ee82a470ad31fb2c6901627ad9e499 URL: https://github.com/kamailio/kamailio/commit/d35e7c1dd7ee82a470ad31fb2c69016… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-12T18:44:54+02:00 siputils: ensure that the contact is parsed for param encoding --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/d35e7c1dd7ee82a470ad31fb2c69016… Patch: https://github.com/kamailio/kamailio/commit/d35e7c1dd7ee82a470ad31fb2c69016… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 22d0c31eae..748e703bd4 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -646,6 +646,13 @@ int ki_contact_param_encode(sip_msg_t *msg, str *nparam, str *saddr) return 1; } + if(msg->contact->parsed == NULL) { + if(parse_contact(msg->contact) < 0 || msg->contact->parsed == NULL) { + LM_ERR("contact parsing failed\n"); + return -4; + } + } + cb = (contact_body_t *)msg->contact->parsed; c = cb->contacts; /* we visit each contact */

3 years, 11 months

git:master:1189d755: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1189d75511bad3fe235e207e72471770dedfa386 URL: https://github.com/kamailio/kamailio/commit/1189d75511bad3fe235e207e7247177… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-12T16:01:15+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/1189d75511bad3fe235e207e7247177… Patch: https://github.com/kamailio/kamailio/commit/1189d75511bad3fe235e207e7247177… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 46b5bd2b74..1e8ee06460 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -990,15 +990,14 @@ sip_p_charging_vector("g"); Meaning of the parameters is as follows: * pname - name of the new URI parameter to hold the encoded incoming URI. - * saddr - local server address, can be host part, host-port part or - host-port-params part. + * saddr - local server address in SIP URI format. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE. Example 1.42. contact_param_encode usage ... if (is_method("REGISTER") and src_ip == 10.0.0.0/8) { - contact_param_encode("ksu", "1.2.3.4:5060;transport=tcp"); + contact_param_encode("ksu", "sip:1.2.3.4:5060;transport=tcp"); } ...

3 years, 11 months

git:master:10c27864: siputils: docs - updates to contact_param_encode() saddr param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 10c278643719408957b00c6fe64b0796b6ef148e URL: https://github.com/kamailio/kamailio/commit/10c278643719408957b00c6fe64b079… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-12T15:54:23+02:00 siputils: docs - updates to contact_param_encode() saddr param --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/10c278643719408957b00c6fe64b079… Patch: https://github.com/kamailio/kamailio/commit/10c278643719408957b00c6fe64b079… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 25336cc207..13b30ba447 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1177,8 +1177,8 @@ sip_p_charging_vector("g"); </para> </listitem> <listitem> - <para><emphasis>saddr</emphasis> - local server address, can be - host part, host-port part or host-port-params part. + <para><emphasis>saddr</emphasis> - local server address in SIP + URI format. </para> </listitem> </itemizedlist> @@ -1190,7 +1190,7 @@ sip_p_charging_vector("g"); <programlisting format="linespecific"> ... if (is_method("REGISTER") and src_ip == 10.0.0.0/8) { - contact_param_encode("ksu", "1.2.3.4:5060;transport=tcp"); + contact_param_encode("ksu", "sip:1.2.3.4:5060;transport=tcp"); } ... </programlisting>

3 years, 11 months

git:master:6300f466: siputils: contact_param_encode() takes full sip uri as server address

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6300f4661747224ec16d34634d62db454630277f URL: https://github.com/kamailio/kamailio/commit/6300f4661747224ec16d34634d62db4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-12T15:52:48+02:00 siputils: contact_param_encode() takes full sip uri as server address - more debug messages --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/6300f4661747224ec16d34634d62db4… Patch: https://github.com/kamailio/kamailio/commit/6300f4661747224ec16d34634d62db4… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index be3ec21497..22d0c31eae 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -670,7 +670,7 @@ int ki_contact_param_encode(sip_msg_t *msg, str *nparam, str *saddr) PKG_MEM_ERROR; return -1; } - nuri.len = snprintf(nuri.s, MAX_URI_SIZE-1, "sip:%.*s;%.*s=%.*s", + nuri.len = snprintf(nuri.s, MAX_URI_SIZE-1, "%.*s;%.*s=%.*s", saddr->len, saddr->s, nparam->len, nparam->s, pval.len, pval.s); if(nuri.len<=0 || nuri.len>=MAX_URI_SIZE) { @@ -679,6 +679,7 @@ int ki_contact_param_encode(sip_msg_t *msg, str *nparam, str *saddr) pkg_free(nuri.s); return -2; } + LM_DBG("encoded uri [%.*s] (%d)\n", nuri.len, nuri.s, nuri.len); if(patch(msg, c->uri.s, c->uri.len, nuri.s, nuri.len) < 0) { LM_ERR("failed to update contact uri [%.*s]\n", c->uri.len, c->uri.s); @@ -758,7 +759,7 @@ int ki_contact_param_decode(sip_msg_t *msg, str *nparam) memcpy(nval.s, bnval, nval.len); nval.s[nval.len] = '\0'; - LM_DBG("new uri [%.*s]\n", nval.len, nval.s); + LM_DBG("decoded new uri [%.*s] (%d)\n", nval.len, nval.s, nval.len); if(patch(msg, c->uri.s, c->uri.len, nval.s, nval.len) < 0) { LM_ERR("failed to update contact uri [%.*s]\n", c->uri.len, c->uri.s); @@ -863,7 +864,7 @@ int ki_contact_param_decode_ruri(sip_msg_t *msg, str *nparam) memcpy(nval.s, bnval, nval.len); nval.s[nval.len] = '\0'; - LM_DBG("new uri [%.*s]\n", nval.len, nval.s); + LM_DBG("decoded new uri [%.*s] (%d)\n", nval.len, nval.s, nval.len); if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { msg->new_uri = nval;

3 years, 11 months

git:master:20c1666e: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 20c1666e24f335231900bbe7cea0b0719f14f6de URL: https://github.com/kamailio/kamailio/commit/20c1666e24f335231900bbe7cea0b07… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-12T11:16:19+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/20c1666e24f335231900bbe7cea0b07… Patch: https://github.com/kamailio/kamailio/commit/20c1666e24f335231900bbe7cea0b07… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 74344a83c1..46b5bd2b74 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -96,6 +96,9 @@ Gabriel Vasile 4.30. is_supported(option) 4.31. is_first_hop() 4.32. sip_p_charging_vector(flags) + 4.33. contact_param_encode(pname, saddr) + 4.34. contact_param_decode(pname) + 4.35. contact_param_decode_uri(pname) 5. Exported pseudo-variables @@ -148,6 +151,9 @@ Gabriel Vasile 1.39. is_supported() usage 1.40. is_first_hop() usage 1.41. sip_p_charging_vector() usage + 1.42. contact_param_encode usage + 1.43. contact_param_decode usage + 1.44. contact_param_decode_ruri usage Chapter 1. Admin Guide @@ -205,6 +211,9 @@ Chapter 1. Admin Guide 4.30. is_supported(option) 4.31. is_first_hop() 4.32. sip_p_charging_vector(flags) + 4.33. contact_param_encode(pname, saddr) + 4.34. contact_param_decode(pname) + 4.35. contact_param_decode_uri(pname) 5. Exported pseudo-variables @@ -420,6 +429,9 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.30. is_supported(option) 4.31. is_first_hop() 4.32. sip_p_charging_vector(flags) + 4.33. contact_param_encode(pname, saddr) + 4.34. contact_param_decode(pname) + 4.35. contact_param_decode_uri(pname) 4.1. ring_insert_callid() @@ -969,6 +981,63 @@ if(is_first_hop()) { ... } sip_p_charging_vector("g"); ... +4.33. contact_param_encode(pname, saddr) + + This function encodes URI inside Contact headers by building a new URI + from 'saddr' parameter and adding a parameter with the name 'pname' + containing incoming URI encoded in Base64URL format. + + Meaning of the parameters is as follows: + * pname - name of the new URI parameter to hold the encoded incoming + URI. + * saddr - local server address, can be host part, host-port part or + host-port-params part. + + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE. + + Example 1.42. contact_param_encode usage +... +if (is_method("REGISTER") and src_ip == 10.0.0.0/8) { + contact_param_encode("ksu", "1.2.3.4:5060;transport=tcp"); +} +... + +4.34. contact_param_decode(pname) + + This function decodes URI inside Contact headers by building a new URI + from 'pname' parameter, decoding its value from Base64URL. + + Meaning of the parameters is as follows: + * pname - name of the incoming URI parameter holding the encoded URI + value. + + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE. + + Example 1.43. contact_param_decode usage +... +if (is_method("REGISTER") and src_ip == 1.2.3.4) { + contact_param_decode("ksu"); +} +... + +4.35. contact_param_decode_uri(pname) + + This function decodes R-URI (request URI) by building a new R-URI from + 'pname' parameter, decoding its value from Base64URL. + + Meaning of the parameters is as follows: + * pname - name of the incoming URI parameter holding the encoded URI + value. + + This function can be used from REQUEST_ROUTE. + + Example 1.44. contact_param_decode_ruri usage +... +if (is_method("INVITE") and src_ip == 1.2.3.4) { + contact_param_decode_ruri("ksu"); +} +... + 5. Exported pseudo-variables 5.1. $pcv(all)

3 years, 11 months

← Newer
1
...
24
25
26
27
28
29
30
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020