sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
273 discussions

[kamailio] modules/tls: improve logging (#188)

by Mikko Lehto

improve logging on SSL_get_certificate() / SSL_get_peer_certificate() error You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/188 -- Commit Summary -- * modules/tls: improve logging on SSL_get_certificate() / SSL_get_peer_certificate() error -- File Changes -- M modules/tls/tls_select.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/188.patch https://github.com/kamailio/kamailio/pull/188.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/188

8 years, 11 months

[kamailio] enum: fix buffer overflow and increase maximum number length (#186)

by Stefan Andersson

* Fix for buffer overflow in enum_pv_query_3 for char string[17] where the boundary checks for it in is_e164 uses MAX_NUM_LEN. * Increased the size of MAX_NUM_LEN to 33 to support the maximum number length of 32, which is what we support here on our ISUP links. Bug: The buffer overflow bug can be triggered by calling enum_pv_query with a number that is to long eg. +1234567890123456789 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/186 -- Commit Summary -- * * Fix for buffer overflow in enum_pv_query_3 for char string[17] where the boundary checks for it in is_e164 uses MAX_NUM_LEN. -- File Changes -- M modules/enum/enum.c (4) M modules/enum/enum.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/186.patch https://github.com/kamailio/kamailio/pull/186.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/186

8 years, 11 months

PV $proto in upper or lowercase?

by Mikko Lehto

Hi PV cookbook says $proto returns values in uppercase¹, but I am getting lower case values back. PV module uses pv_get_proto() in pv_export_t structure: --- static pv_export_t mod_pvs[] = { . . . {{"proto", (sizeof("proto")-1)}, PVT_OTHER, pv_get_proto, 0, 0, 0, 0, 0}, --- Further on, 3rd parameter (vtype) in call to get_valid_proto()² asks for lowercase results: --- int pv_get_proto(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) . . . if (get_valid_proto_string(msg->rcv.proto, 0, 0, &s)<0) { --- Should I update PV module or cookbook? I am running 4.2 from git: --- version: kamailio 4.2.4 (x86_64/linux) a23331 --- [1] UDP, TCP, TLS, SCTP, WS, WSS http://kamailio.org/wiki/cookbooks/devel/pseudovariables#pr_-_protocol_of_r… [2] https://github.com/kamailio/kamailio/blob/master/modules/pv/pv_core.c#L1080 -- Mikko Lehto

8 years, 11 months

[kamailio] modules/tm: fix typo in documentation (#187)

by Mikko Lehto

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/187 -- Commit Summary -- * modules/tm: fix typo in documentation -- File Changes -- M modules/tm/doc/functions.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/187.patch https://github.com/kamailio/kamailio/pull/187.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/187

8 years, 11 months

git:master:498e225b: Merge pull request #186 from norox/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 498e225bb52323f92040b8f11223059c06d0dacd URL: https://github.com/kamailio/kamailio/commit/498e225bb52323f92040b8f11223059… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-03T11:48:28+02:00 Merge pull request #186 from norox/master enum: fix buffer overflow and increase maximum number length --- Modified: modules/enum/enum.c Modified: modules/enum/enum.h --- Diff: https://github.com/kamailio/kamailio/commit/498e225bb52323f92040b8f11223059… Patch: https://github.com/kamailio/kamailio/commit/498e225bb52323f92040b8f11223059… --- diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 3c21c2f..6439f54 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -34,7 +34,7 @@ * based on the user part of the current Request-URI. These functions * assume that the Request URI user part consists of an international * phone number of the form +decimal-digits, where the number of digits is - * at least 2 and at most 15. Out of this number enum_query forms a domain + * at least 2 and at most 32. Out of this number enum_query forms a domain * name, where the digits are in reverse order and separated by dots * followed by domain suffix that by default is "e164.arpa.". For example, * if the user part is +35831234567, the domain name will be @@ -1005,7 +1005,7 @@ int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix, struct naptr_rdata* naptr; str pattern, replacement, result, new_result; str *suffix, *service; - char string[17]; + char string[MAX_NUM_LEN]; pv_spec_t *sp; pv_value_t pv_val; diff --git a/modules/enum/enum.h b/modules/enum/enum.h index 838caf6..1f1a509 100644 --- a/modules/enum/enum.h +++ b/modules/enum/enum.h @@ -35,7 +35,7 @@ #define MAX_DOMAIN_SIZE 256 -#define MAX_NUM_LEN 22 +#define MAX_NUM_LEN 33 #define MAX_COMPONENT_SIZE (MAX_NUM_LEN * 2) /* separator, apex, ... This simplifies checks */

8 years, 11 months

git:master:ca8e6540: * Fix for buffer overflow in enum_pv_query_3 for char string[17] where the boundary checks for it in is_e164 uses MAX_NUM_LEN.

by Stefan Andersson

Module: kamailio Branch: master Commit: ca8e6540cd2cd31b63b192a5a3da282eb09b6c94 URL: https://github.com/kamailio/kamailio/commit/ca8e6540cd2cd31b63b192a5a3da282… Author: Stefan Andersson <stefan.andersson(a)tele2.com> Committer: Stefan Andersson <stefan.andersson(a)tele2.com> Date: 2015-06-03T10:54:25+02:00 * Fix for buffer overflow in enum_pv_query_3 for char string[17] where the boundary checks for it in is_e164 uses MAX_NUM_LEN. * Increased the size of MAX_NUM_LEN to 33 to support the maximum number length of 32, which is what we support here on our ISUP links. Bug: The buffer overflow bug can be triggered by calling enum_pv_query with a number that is to long eg. +1234567890123456789 --- Modified: modules/enum/enum.c Modified: modules/enum/enum.h --- Diff: https://github.com/kamailio/kamailio/commit/ca8e6540cd2cd31b63b192a5a3da282… Patch: https://github.com/kamailio/kamailio/commit/ca8e6540cd2cd31b63b192a5a3da282… --- diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 3c21c2f..6439f54 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -34,7 +34,7 @@ * based on the user part of the current Request-URI. These functions * assume that the Request URI user part consists of an international * phone number of the form +decimal-digits, where the number of digits is - * at least 2 and at most 15. Out of this number enum_query forms a domain + * at least 2 and at most 32. Out of this number enum_query forms a domain * name, where the digits are in reverse order and separated by dots * followed by domain suffix that by default is "e164.arpa.". For example, * if the user part is +35831234567, the domain name will be @@ -1005,7 +1005,7 @@ int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix, struct naptr_rdata* naptr; str pattern, replacement, result, new_result; str *suffix, *service; - char string[17]; + char string[MAX_NUM_LEN]; pv_spec_t *sp; pv_value_t pv_val; diff --git a/modules/enum/enum.h b/modules/enum/enum.h index 838caf6..1f1a509 100644 --- a/modules/enum/enum.h +++ b/modules/enum/enum.h @@ -35,7 +35,7 @@ #define MAX_DOMAIN_SIZE 256 -#define MAX_NUM_LEN 22 +#define MAX_NUM_LEN 33 #define MAX_COMPONENT_SIZE (MAX_NUM_LEN * 2) /* separator, apex, ... This simplifies checks */

8 years, 11 months

git:master:7a33987a: tls: fix gcc warnings:

by Victor Seva

Module: kamailio Branch: master Commit: 7a33987ab4e74266cd0ccecbe14f7196f97a0f05 URL: https://github.com/kamailio/kamailio/commit/7a33987ab4e74266cd0ccecbe14f719… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-03T09:35:51+02:00 tls: fix gcc warnings: tls_domain.c:507:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:537:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:544:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:576:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:1096:5: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:1104:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_domain.c:1111:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:222:3: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:565:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:843:5: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:877:5: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:1231:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] tls_server.c:1265:4: warning: variable âretâ set but not used [-Wunused-but-set-variable] --- Modified: modules/tls/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/7a33987ab4e74266cd0ccecbe14f719… Patch: https://github.com/kamailio/kamailio/commit/7a33987ab4e74266cd0ccecbe14f719… --- diff --git a/modules/tls/tls_util.h b/modules/tls/tls_util.h index efbd842..6fe91a2 100644 --- a/modules/tls/tls_util.h +++ b/modules/tls/tls_util.h @@ -31,26 +31,29 @@ #include "../../str.h" #include "tls_domain.h" +static inline int tls_err_ret(char *s, tls_domains_cfg_t **tls_domains_cfg) { + long err; + int ret = 0; + if ((*tls_domains_cfg)->srv_default->ctx && + (*tls_domains_cfg)->srv_default->ctx[0]) + { + while((err = ERR_get_error())) { + ret = 1; + ERR("%s%s\n", s ? s : "", ERR_error_string(err, 0)); + } + } + return ret; +} -#define TLS_ERR_RET(r, s) \ -do { \ - long err; \ - (r) = 0; \ - if ((*tls_domains_cfg)->srv_default->ctx && \ - (*tls_domains_cfg)->srv_default->ctx[0]) { \ - while((err = ERR_get_error())) { \ - (r) = 1; \ - ERR("%s%s\n", ((s)) ? (s) : "", \ - ERR_error_string(err, 0)); \ - } \ - } \ +#define TLS_ERR_RET(r, s) \ +do { \ + (r) = tls_err_ret((s), tls_domains_cfg); \ } while(0) -#define TLS_ERR(s) \ -do { \ - int ret; \ - TLS_ERR_RET(ret, s); \ +#define TLS_ERR(s) \ +do { \ + tls_err_ret((s), tls_domains_cfg); \ } while(0)

8 years, 11 months

git:4.3:a4e9f223: registrar: ptr->sock may not be available, as we received the info on a different channel (e.g. reginfo) (bugfix)

by Carsten Bock

Module: kamailio Branch: 4.3 Commit: a4e9f2234f29928520cca83843d5d6aa387518ad URL: https://github.com/kamailio/kamailio/commit/a4e9f2234f29928520cca83843d5d6a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-06-02T20:22:46+02:00 registrar: ptr->sock may not be available, as we received the info on a different channel (e.g. reginfo) (bugfix) --- Modified: modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/a4e9f2234f29928520cca83843d5d6a… Patch: https://github.com/kamailio/kamailio/commit/a4e9f2234f29928520cca83843d5d6a… --- diff --git a/modules/registrar/regpv.c b/modules/registrar/regpv.c index 8574e92..daf304e 100644 --- a/modules/registrar/regpv.c +++ b/modules/registrar/regpv.c @@ -544,7 +544,7 @@ int pv_fetch_contacts(struct sip_msg* msg, char* table, char* uri, c0->instance.len = ptr->instance.len; p += c0->instance.len; } - if (ptr->sock->proto == PROTO_TCP || ptr->sock->proto == PROTO_TLS || ptr->sock->proto == PROTO_WS || ptr->sock->proto == PROTO_WSS) + if ((ptr->sock) && (ptr->sock->proto == PROTO_TCP || ptr->sock->proto == PROTO_TLS || ptr->sock->proto == PROTO_WS || ptr->sock->proto == PROTO_WSS)) { c0->tcpconn_id = ptr->tcpconn_id; }

8 years, 11 months

git:master:36d26bdd: registrar: ptr->sock may not be available, as we received the info on a different channel (e.g. reginfo) (bugfix)

by Carsten Bock

Module: kamailio Branch: master Commit: 36d26bdd9bb92c0be5d5134855536981cb1d9264 URL: https://github.com/kamailio/kamailio/commit/36d26bdd9bb92c0be5d513485553698… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-06-02T20:20:26+02:00 registrar: ptr->sock may not be available, as we received the info on a different channel (e.g. reginfo) (bugfix) --- Modified: modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/36d26bdd9bb92c0be5d513485553698… Patch: https://github.com/kamailio/kamailio/commit/36d26bdd9bb92c0be5d513485553698… --- diff --git a/modules/registrar/regpv.c b/modules/registrar/regpv.c index 8574e92..daf304e 100644 --- a/modules/registrar/regpv.c +++ b/modules/registrar/regpv.c @@ -544,7 +544,7 @@ int pv_fetch_contacts(struct sip_msg* msg, char* table, char* uri, c0->instance.len = ptr->instance.len; p += c0->instance.len; } - if (ptr->sock->proto == PROTO_TCP || ptr->sock->proto == PROTO_TLS || ptr->sock->proto == PROTO_WS || ptr->sock->proto == PROTO_WSS) + if ((ptr->sock) && (ptr->sock->proto == PROTO_TCP || ptr->sock->proto == PROTO_TLS || ptr->sock->proto == PROTO_WS || ptr->sock->proto == PROTO_WSS)) { c0->tcpconn_id = ptr->tcpconn_id; }

8 years, 11 months

git:master:df45ba7a: pua_reginfo: Add support for custom params as contact parameters (e.g. <unknown-param name="+g.oma.sip-im"></unknown-param>)

by Carsten Bock

Module: kamailio Branch: master Commit: df45ba7a94d1c30f6be4b59acc11677d7257139d URL: https://github.com/kamailio/kamailio/commit/df45ba7a94d1c30f6be4b59acc11677… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-06-02T20:20:26+02:00 pua_reginfo: Add support for custom params as contact parameters (e.g. <unknown-param name="+g.oma.sip-im"></unknown-param>) --- Modified: modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/df45ba7a94d1c30f6be4b59acc11677… Patch: https://github.com/kamailio/kamailio/commit/df45ba7a94d1c30f6be4b59acc11677…

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015