sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:master:93f74c22: Comments style correction
by Dmitriy N. Borisov 28 Jan '15

28 Jan '15

Module: kamailio Branch: master Commit: 93f74c228bec1ad291d0ef5c8353747315556f7d URL: https://github.com/kamailio/kamailio/commit/93f74c228bec1ad291d0ef5c8353747… Author: Dmitriy N. Borisov <bordmi(a)rarus.ru> Committer: Dmitriy N. Borisov <bordmi(a)rarus.ru> Date: 2015-01-22T14:57:58+03:00 Comments style correction --- Modified: modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/93f74c228bec1ad291d0ef5c8353747… Patch: https://github.com/kamailio/kamailio/commit/93f74c228bec1ad291d0ef5c8353747… --- diff --git a/modules/auth_radius/sterman.c b/modules/auth_radius/sterman.c index 5b51866..da644dc 100644 --- a/modules/auth_radius/sterman.c +++ b/modules/auth_radius/sterman.c @@ -89,37 +89,37 @@ static inline int extract_avp(VALUE_PAIR* vp, unsigned short *flags, r = NULL; errno = 0; if ( p == vp->strvalue && q ) { - // int name and str value + /* int name and str value */ *flags |= AVP_VAL_STR; name->n = strtol(++p,&q,10); value->s.s = ++q; value->s.len = strlen(q); } else if ( p && !r && p > vp->strvalue && !q ) { - // str name and int value + /* str name and int value */ *flags |= AVP_NAME_STR; name->s.len = p - vp->strvalue; name->s.s = vp->strvalue; value->n = strtol(++p,&r,10); } else if ( p && p != r && !q ) { - // int name and int vale + /* int name and int vale */ name->n = strtol(++p,&q,10); value->n = strtol(++r,&q,10); } else if ( (!p || p > q) && q ) { - // str name and str value + /* str name and str value */ *flags |= AVP_VAL_STR|AVP_NAME_STR; name->s.len = q - vp->strvalue; name->s.s = vp->strvalue; value->s.len = strlen(++q); value->s.s = q; - } else // error - unknown + } else /* error - unknown */ return 0; if ( errno != 0 ) return 0; } else if (vp->type == PW_TYPE_STRING) { *flags |= AVP_VAL_STR|AVP_NAME_STR; - // if start of value is the name of value + /* if start of value is the name of value */ if (vp->strvalue == strstr(vp->strvalue,vp->name)) - // then get value after name + one char delimiter + /* then get value after name + one char delimiter */ p = vp->strvalue + strlen(vp->name) + sizeof(char); else p = vp->strvalue;

1 0

git:master:e415044a: Improoved working with RADIUS AV pairs
by Dmitriy N. Borisov 28 Jan '15

28 Jan '15

Module: kamailio Branch: master Commit: e415044acaf6fa15e20d0b90b34227fb0e167bea URL: https://github.com/kamailio/kamailio/commit/e415044acaf6fa15e20d0b90b34227f… Author: Dmitriy N. Borisov <bordmi(a)rarus.ru> Committer: Dmitriy N. Borisov <bordmi(a)rarus.ru> Date: 2015-01-19T02:19:37+03:00 Improoved working with RADIUS AV pairs - added modparam import_all_avp parameter (int, true if not null) - reading all RADIUS AV-pairs to kamailio avp (not only SIP-AVP, if import_all_avp set to true) - skiping name part of value (example: from RADIUS we recieve name - h323-x-header, value - "h323-x-header=blah-blah-blah", in kamailio we have name h323-x-header, value - "blah-blah-blah"), only for non SIP-AVP --- Modified: modules/auth_radius/authrad_mod.c Modified: modules/auth_radius/authrad_mod.h Modified: modules/auth_radius/sterman.c --- Diff: https://github.com/kamailio/kamailio/commit/e415044acaf6fa15e20d0b90b34227f… Patch: https://github.com/kamailio/kamailio/commit/e415044acaf6fa15e20d0b90b34227f…

1 0

git:master:2bb9422c: ims_qos: codec_data_avp: Make length dynamic, this should not be truncated according to RFC6733
by Carsten Bock 28 Jan '15

28 Jan '15

Module: kamailio Branch: master Commit: 2bb9422cf4d2dadd83bd698635fa7ab8e1e05923 URL: https://github.com/kamailio/kamailio/commit/2bb9422cf4d2dadd83bd698635fa7ab… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-01-28T17:24:00+02:00 ims_qos: codec_data_avp: Make length dynamic, this should not be truncated according to RFC6733 --- Modified: modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/2bb9422cf4d2dadd83bd698635fa7ab… Patch: https://github.com/kamailio/kamailio/commit/2bb9422cf4d2dadd83bd698635fa7ab… --- diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 6d0867c..a1c0e74 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -683,45 +683,60 @@ AAA_AVP *rx_create_media_subcomponent_avp_register() { */ AAA_AVP* rx_create_codec_data_avp(str *raw_sdp_stream, int number, int direction) { - char data[PCC_MAX_Char4]; - char *p; - int l, len; + str data; + int l = 0; + AAA_AVP* result; + data.len = 0; switch (direction) { - - case 0: sprintf(data, "uplink\noffer\n"); + case 0: data.len = 13; break; - case 1: sprintf(data, "uplink\nanswer\n"); + case 1: data.len = 14; break; - case 2: sprintf(data, "downlink\noffer\n"); + case 2: data.len = 15; break; - case 3: sprintf(data, "downlink\nanswer\n"); + case 3: data.len = 16; break; default: break; - } + data.len += raw_sdp_stream->len + 1; // 0 Terminated. + LM_DBG("data.len is calculated %i, sdp-stream has a len of %i\n", data.len, raw_sdp_stream->len); + data.s = (char*)pkg_malloc(data.len); + memset(data.s, 0, data.len); + + switch (direction) { + case 0: memcpy(data.s, "uplink\noffer\n", 13); + l = 13; + break; + case 1: memcpy(data.s, "uplink\nanswer\n", 14); + l = 14; + break; + case 2: memcpy(data.s, "downlink\noffer\n", 15); + l = 15; + break; + case 3: memcpy(data.s, "downlink\nanswer\n", 16); + l = 16; + break; + default: + break; - l = strlen(data); - - if ((l + raw_sdp_stream->len) >= PCC_MAX_Char4) { - len = PCC_MAX_Char4 - l - 1; - } else { - len = raw_sdp_stream->len; } + // LM_DBG("data.s = \"%.*s\"\n", l, data.s); + memcpy(data.s + l, raw_sdp_stream->s, raw_sdp_stream->len); + LM_DBG("data.s = \"%.*s\"\n", data.len, data.s); - memcpy(data + l, raw_sdp_stream->s, len); - p = data + l + len; - *p = '\0'; - - return (cdpb.AAACreateAVP(AVP_IMS_Codec_Data, + result = cdpb.AAACreateAVP(AVP_IMS_Codec_Data, AAA_AVP_FLAG_MANDATORY | AAA_AVP_FLAG_VENDOR_SPECIFIC, - IMS_vendor_id_3GPP, data, strlen(data), - AVP_DUPLICATE_DATA)); + IMS_vendor_id_3GPP, data.s, data.len, + AVP_DUPLICATE_DATA); + + // Free the buffer: + pkg_free(data.s); + return result; } - /** * Creates and adds a Vendor Specific Application ID Group AVP. * @param msg - the Diameter message to add to.

1 0

running out of mysql connections when [group] is given
by Juha Heinanen 28 Jan '15

28 Jan '15

with latest master, i tried to add [group] to mysql db_urls and sqlops urls, eg. modparam("mtree", "db_url", "mysql://user:pass@[sip_proxy]127.0.0.1/sip_proxy") and in my.cfg the group was defined like this: [sip_proxy] ssl-ca=/etc/mysql/ca-cert.pem ssl-cert=/etc/mysql/client-cert.pem ssl-key=/etc/mysql/client-key.pem the result was that when i start kamailio, it starts to run out of mysql connections and dumps core no matter how high i set max_connections in my.cfg: Jan 21 00:47:33 siika /usr/bin/sip-proxy[30612]: ERROR: db_mysql [km_my_con.c:114]: db_mysql_new_connection(): driver error: Too many connections Jan 21 00:47:33 siika /usr/bin/sip-proxy[30612]: ERROR: <core> [db.c:314]: db_do_init2(): could not add connection to the pool Jan 21 00:47:33 siika /usr/bin/sip-proxy[30612]: ERROR: mtree [mtree_mod.c:346]: mi_child_init(): failed to connect to database Jan 21 00:47:33 siika /usr/bin/sip-proxy[30612]: ERROR: <core> [sr_module.c:900]: init_mod_child(): Error while initializing module mtree (/usr/lib/sip-proxy/modules/mtree.so) without the [group] kamailio starts fine and does not complain about too many connections. is this a bug in group handling or something else? -- juha

4 16

git:4.2:387b3afc: kamctl: fix variable assignment
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 387b3afc5a5c2082688cd898ecbf6457bc0715c4 URL: https://github.com/kamailio/kamailio/commit/387b3afc5a5c2082688cd898ecbf645… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:45:43+01:00 kamctl: fix variable assignment There must not be a space before and after the = assignment operator. (cherry picked from commit 513a6d8bf8d270b0a4fa9743daab5263c9688447) --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/387b3afc5a5c2082688cd898ecbf645… Patch: https://github.com/kamailio/kamailio/commit/387b3afc5a5c2082688cd898ecbf645… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 9fcd170..39e89eb 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2491,7 +2491,7 @@ usrloc() { fi if [ -z "$DEFAULT_Q" ] ; then - DEFAULT_Q = "1.0" + DEFAULT_Q="1.0" fi $CTLCMD ul_add "$USRLOC_TABLE" "$OSERUSER@$OSERDOMAIN" "$2" \

1 0

git:4.2:eeae005f: db_postgress: disable initialization of libssl if tls is loaded
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: eeae005fb3d5239dd6e3af727504fc829ea5a0fb URL: https://github.com/kamailio/kamailio/commit/eeae005fb3d5239dd6e3af727504fc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:44:21+01:00 db_postgress: disable initialization of libssl if tls is loaded - based on the note from docs to avoid double attempt to init the ssl library - http://www.postgresql.org/docs/9.4/static/libpq-ssl.html (cherry picked from commit f04dec82e90ec7a3e6aea4ea8e9ed23b06b165c6) Conflicts: modules/db_postgres/km_pg_con.c --- Modified: modules/db_postgres/km_pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/eeae005fb3d5239dd6e3af727504fc8… Patch: https://github.com/kamailio/kamailio/commit/eeae005fb3d5239dd6e3af727504fc8… --- diff --git a/modules/db_postgres/km_pg_con.c b/modules/db_postgres/km_pg_con.c index de89d85..a8e0494 100644 --- a/modules/db_postgres/km_pg_con.c +++ b/modules/db_postgres/km_pg_con.c @@ -29,6 +29,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" +#include "../../tls_hooks_init.h" #include <string.h> #include <time.h> @@ -74,6 +75,9 @@ struct pg_con* db_postgres_new_connection(struct db_id* id) ZSW(id->database)); } + /* don't attempt to re-init openssl if done already */ + if(tls_loaded()) PQinitSSL(0); + ptr->con = PQsetdbLogin(id->host, ports, NULL, NULL, id->database, id->username, id->password); LM_DBG("PQsetdbLogin(%p)\n", ptr->con);

1 0

git:4.2:e6eca3e9: tls: implemented tls hook for pre-mod init execution
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: e6eca3e988226e3654c5c22d762048a5fff3491c URL: https://github.com/kamailio/kamailio/commit/e6eca3e988226e3654c5c22d762048a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:40:49+01:00 tls: implemented tls hook for pre-mod init execution - do openssl init at this callback (cherry picked from commit f71243410d5e051def1a47cc73adb6caeeadd1cd) --- Modified: modules/tls/tls_init.c Modified: modules/tls/tls_init.h Modified: modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e6eca3e988226e3654c5c22d762048a… Patch: https://github.com/kamailio/kamailio/commit/e6eca3e988226e3654c5c22d762048a… --- diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index cfd3a5f..0c03d56 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -61,6 +61,7 @@ #include "tls_cfg.h" /* will be set to 1 when the TLS env is initialized to make destroy safe */ +static int tls_mod_preinitialized = 0; static int tls_mod_initialized = 0; #if OPENSSL_VERSION_NUMBER < 0x00907000L @@ -469,6 +470,7 @@ static int init_tls_compression(void) /** * tls pre-init function + * - executed when module is loaded */ int tls_pre_init(void) { @@ -493,6 +495,23 @@ int tls_pre_init(void) return 0; } +/** + * tls mod pre-init function + * - executed before any mod_init() + */ +int tls_mod_pre_init_h(void) +{ + if(tls_mod_preinitialized==1) { + LM_DBG("already mod pre-initialized\n"); + return 0; + } + DBG("============= :preparing tls env for modules initialization\n"); + SSL_library_init(); + SSL_load_error_strings(); + tls_mod_preinitialized=1; + return 0; +} + /* * First step of TLS initialization */ @@ -511,6 +530,12 @@ int init_tls_h(void) str s; cfg_ctx_t* cfg_ctx; + if(tls_mod_initialized == 1) { + LM_DBG("already initialized\n"); + return 0; + } + DBG("initializing tls system\n"); + #if OPENSSL_VERSION_NUMBER < 0x00907000L WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif @@ -657,8 +682,6 @@ int init_tls_h(void) } } - SSL_library_init(); - SSL_load_error_strings(); init_ssl_methods(); tls_mod_initialized = 1; return 0; @@ -693,7 +716,7 @@ int tls_check_sockets(tls_domains_cfg_t* cfg) void destroy_tls_h(void) { DBG("tls module final tls destroy\n"); - if(tls_mod_initialized > 0) + if(tls_mod_preinitialized > 0) ERR_free_strings(); /* TODO: free all the ctx'es */ tls_destroy_cfg(); diff --git a/modules/tls/tls_init.h b/modules/tls/tls_init.h index 5f06acb..78390bf 100644 --- a/modules/tls/tls_init.h +++ b/modules/tls/tls_init.h @@ -52,8 +52,13 @@ extern const SSL_METHOD* ssl_methods[]; */ int tls_pre_init(void); +/** + * just once, prepare for init of all modules + */ +int tls_mod_pre_init_h(void); + /* - * just once, initialize the tls subsystem + * just once, initialize the tls subsystem after all mod inits */ int init_tls_h(void); diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index eb40b04..4c767dc 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -231,7 +231,8 @@ static struct tls_hooks tls_h = { tls_h_close, tls_h_init_si, init_tls_h, - destroy_tls_h + destroy_tls_h, + tls_mod_pre_init_h, }; @@ -253,12 +254,21 @@ static tls_domains_cfg_t* tls_use_modparams(void) int mod_register(char *path, int *dlflags, void *p1, void *p2) { + if (tls_disable) { + LOG(L_WARN, "tls support is disabled " + "(set enable_tls=1 in the config to enable it)\n"); + return 0; + } + /* shm is used, be sure it is initialized */ if(!shm_initialized() && init_shm()<0) return -1; if(tls_pre_init()<0) return -1; + + register_tls_hooks(&tls_h); + return 0; } @@ -267,7 +277,7 @@ static int mod_init(void) int method; if (tls_disable){ - LOG(L_WARN, "WARNING: tls: mod_init: tls support is disabled " + LOG(L_WARN, "tls support is disabled " "(set enable_tls=1 in the config to enable it)\n"); return 0; } @@ -306,7 +316,6 @@ static int mod_init(void) } *tls_domains_cfg = NULL; - register_tls_hooks(&tls_h); register_select_table(tls_sel); /* register the rpc interface */ if (rpc_register_array(tls_rpc)!=0) {

1 0

git:4.2:93804b66: core: tls hooks can execute a callback before modules init function is executed
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 93804b66c5301af75cd6930f9c6653228cce8719 URL: https://github.com/kamailio/kamailio/commit/93804b66c5301af75cd6930f9c66532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:40:40+01:00 core: tls hooks can execute a callback before modules init function is executed - useful to prepare tls environment before a module might access it - executed after modparam but before mod_init (cherry picked from commit 4700831fa0f2dc52e296ce647711b03d1406497a) --- Modified: main.c Modified: tls_hooks.c Modified: tls_hooks.h Modified: tls_hooks_init.h --- Diff: https://github.com/kamailio/kamailio/commit/93804b66c5301af75cd6930f9c66532… Patch: https://github.com/kamailio/kamailio/commit/93804b66c5301af75cd6930f9c66532… --- diff --git a/main.c b/main.c index e285b49..d30e213 100644 --- a/main.c +++ b/main.c @@ -2498,6 +2498,24 @@ int main(int argc, char** argv) if (real_time&4) set_rt_prio(rt_prio, rt_policy); +#ifdef USE_TCP +#ifdef USE_TLS + if (!tls_disable){ + if (!tls_loaded()){ + LM_WARN("tls support enabled, but no tls engine " + " available (forgot to load the tls module?)\n"); + LM_WARN("disabling tls...\n"); + tls_disable=1; + } else { + LM_DBG("=============================\n"); + if (pre_init_tls()<0){ + LM_CRIT("could not pre-initialize tls, exiting...\n"); + goto error; + } + } + } +#endif /* USE_TLS */ +#endif /* USE_TCP */ if (init_modules() != 0) { fprintf(stderr, "ERROR: error while initializing modules\n"); diff --git a/tls_hooks.c b/tls_hooks.c index 9b6dab6..29f82b6 100644 --- a/tls_hooks.c +++ b/tls_hooks.c @@ -37,7 +37,7 @@ #ifdef TLS_HOOKS -struct tls_hooks tls_hook= {0, 0, 0, 0, 0 ,0 ,0}; +struct tls_hooks tls_hook= {0,0,0,0,0,0,0,0}; static int tls_hooks_loaded=0; @@ -71,6 +71,13 @@ int init_tls() return 0; } +int pre_init_tls() +{ + if (tls_hook.pre_init) + return tls_hook.pre_init(); + return 0; +} + void destroy_tls() { if (tls_hook.destroy) diff --git a/tls_hooks.h b/tls_hooks.h index c342e4a..d08c0bf 100644 --- a/tls_hooks.h +++ b/tls_hooks.h @@ -74,15 +74,18 @@ struct tls_hooks{ void (*tcpconn_clean)(struct tcp_connection* c); void (*tcpconn_close)(struct tcp_connection*c , int fd); - /* per listening socket init, called on ser startup (after modules, + /* per listening socket init, called on kamailio startup (after modules, * process table, init() and udp socket initialization)*/ int (*init_si)(struct socket_info* si); - /* generic init function (called at ser init, after module initialization + /* generic init function (called at kamailio init, after module initialization * and process table creation)*/ int (*init)(void); /* destroy function, called after the modules are destroyed, and * after destroy_tcp() */ void (*destroy)(void); + /* generic pre-init function (called at kamailio start, before module + * initialization (after modparams) */ + int (*pre_init)(void); }; diff --git a/tls_hooks_init.h b/tls_hooks_init.h index d494cba..458e22e 100644 --- a/tls_hooks_init.h +++ b/tls_hooks_init.h @@ -53,6 +53,7 @@ int tls_has_init_si(void); /*returns true if a handle for tls_init is registered int tls_init(struct socket_info* si); int init_tls(void); void destroy_tls(void); +int pre_init_tls(void); #endif /* TLS_HOOKS */ #endif

1 0

git:4.2:e5885f2f: tls: updated the default tls session id string
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: e5885f2f4bb6066af8988942beff217cb282a29b URL: https://github.com/kamailio/kamailio/commit/e5885f2f4bb6066af8988942beff217… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:40:32+01:00 tls: updated the default tls session id string (cherry picked from commit e47018b0a65a5e26ea47d789f0bc6d471aa3a117) --- Modified: modules/tls/tls_cfg.c --- Diff: https://github.com/kamailio/kamailio/commit/e5885f2f4bb6066af8988942beff217… Patch: https://github.com/kamailio/kamailio/commit/e5885f2f4bb6066af8988942beff217… --- diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index fbf3ab3..f928c10 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -50,7 +50,7 @@ struct cfg_group_tls default_tls_cfg = { STR_NULL, /* certificate (default value set in fix_tls_cfg) */ STR_NULL, /* cipher_list (default value set in fix_tls_cfg) */ 0, /* session_cache */ - STR_STATIC_INIT("sip-router-tls-3.1"), /* session_id */ + STR_STATIC_INIT("kamailio-tls-4.x.y"), /* session_id */ STR_NULL, /* config_file */ 3, /* log (L_DBG)*/ 3, /* debug (L_DBG) */

1 0

git:4.2:6a988737: path: received parameter enclosed in square brackets if ipv6
by Daniel-Constantin Mierla 28 Jan '15

28 Jan '15

Module: kamailio Branch: 4.2 Commit: 6a9887370e1de87afc7f0da79b09eb62b350469f URL: https://github.com/kamailio/kamailio/commit/6a9887370e1de87afc7f0da79b09eb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-28T13:40:08+01:00 path: received parameter enclosed in square brackets if ipv6 - received should be useless for ipv4, but still can be enforced from config, so has to be well formatted because it is followed by a port - reported by Sebastian Damm (cherry picked from commit 077b26385854feb701950d020e382c254b803e75) --- Modified: modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/6a9887370e1de87afc7f0da79b09eb6… Patch: https://github.com/kamailio/kamailio/commit/6a9887370e1de87afc7f0da79b09eb6… --- diff --git a/modules/path/path.c b/modules/path/path.c index 3ec28c4..6c350ae 100644 --- a/modules/path/path.c +++ b/modules/path/path.c @@ -67,7 +67,7 @@ static int prepend_path(struct sip_msg* _m, str *user, path_param_t param, str * /* maximum possible length of suffix */ suffix_len = strlen(";lr;received=sip::12345%3Btransport%3Dsctp;ob;>\r\n") - + IP_ADDR_MAX_STR_SIZE + (add_params ? add_params->len : 0) + 1; + + IP_ADDR_MAX_STR_SIZE + 2 + (add_params ? add_params->len : 0) + 1; cp = suffix = pkg_malloc(suffix_len); if (!suffix) { @@ -86,8 +86,13 @@ static int prepend_path(struct sip_msg* _m, str *user, path_param_t param, str * else proto_str = NULL; - cp += sprintf(cp, ";received=sip:%s:%hu%s", ip_addr2a(&_m->rcv.src_ip), - _m->rcv.src_port, proto_str ? : ""); + if(_m->rcv.src_ip.af==AF_INET6) { + cp += sprintf(cp, ";received=sip:[%s]:%hu%s", ip_addr2a(&_m->rcv.src_ip), + _m->rcv.src_port, proto_str ? : ""); + } else { + cp += sprintf(cp, ";received=sip:%s:%hu%s", ip_addr2a(&_m->rcv.src_ip), + _m->rcv.src_port, proto_str ? : ""); + } break; case PATH_PARAM_OB: cp += sprintf(cp, ";ob");

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015