From 2389a4ca71dcdbae206178f4d3df9ee4d5a719f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=A0t=C4=9Bp=C3=A1n=20Bal=C3=A1=C5=BEik?= Date: Wed, 17 Feb 2021 19:07:19 +0100 Subject: [PATCH] wip: only switch to tcp on TC=1 --- lib/selection.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/selection.c b/lib/selection.c index c6fa1e3dd..9e91f5beb 100644 --- a/lib/selection.c +++ b/lib/selection.c @@ -381,8 +381,7 @@ struct kr_transport *select_transport(struct choice choices[], int choices_len, enum kr_transport_protocol protocol; if (chosen->address_state->tls_capable) { protocol = KR_TRANSPORT_TLS; - } else if (tcp || - chosen->address_state->errors[KR_SELECTION_QUERY_TIMEOUT] >= TCP_TIMEOUT_THRESHOLD) { + } else if (tcp) { protocol = KR_TRANSPORT_TCP; } else { protocol = KR_TRANSPORT_UDP; @@ -528,10 +527,10 @@ void error(struct kr_query *qry, struct address_state *addr_state, addr_state->broken = true; break; case KR_SELECTION_MISMATCHED: - if (qry->flags.NO_0X20 && qry->flags.TCP) { + if (qry->flags.NO_0X20) { // && qry->flags.TCP) { addr_state->broken = true; } else { - qry->flags.TCP = true; + // qry->flags.TCP = true; qry->flags.NO_0X20 = true; } break; @@ -546,11 +545,11 @@ void error(struct kr_query *qry, struct address_state *addr_state, break; case KR_SELECTION_REFUSED: case KR_SELECTION_SERVFAIL: - if (qry->flags.NO_MINIMIZE && qry->flags.NO_0X20 && qry->flags.TCP) { + if (qry->flags.NO_MINIMIZE && qry->flags.NO_0X20) { // && qry->flags.TCP) { addr_state->broken = true; } else if (qry->flags.NO_MINIMIZE) { qry->flags.NO_0X20 = true; - qry->flags.TCP = true; + // qry->flags.TCP = true; } else { qry->flags.NO_MINIMIZE = true; } -- 2.47.3