interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build with INTERCEPT_COM_DS defined. 

Decide that layout of handling write results is more readable, and use with read too.
This commit is contained in:
Jim Hague 2019-01-15 15:19:50 +00:00
parent ee6bc7d978
commit 9024fd7736
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/stub.c
View File

@ -1072,18 +1072,14 @@ stub_tls_read(getdns_upstream *upstream, getdns_tcp_state *tcp,
tcp->to_read = 2; /* Packet size */ tcp->to_read = 2; /* Packet size */
} }
switch ((int)_getdns_tls_connection_read(tls_obj, tcp->read_pos, tcp->to_read, &read)) { getdns_return_t r = _getdns_tls_connection_read(tls_obj, tcp->read_pos, tcp->to_read, &read);
case GETDNS_RETURN_GOOD: /* TODO[TLS]: Handle GETDNS_RETURN_TLS_WANT_WRITE which means handshake
break; renegotiation. Need to keep handshake state to do that.*/
if (r == GETDNS_RETURN_TLS_WANT_READ)
case GETDNS_RETURN_TLS_WANT_READ: return STUB_TCP_RETRY;
return STUB_TCP_RETRY; /* Come back later */ else if (r != GETDNS_RETURN_GOOD)
default:
/* TODO[TLS]: Handle GETDNS_RETURN_TLS_WANT_WRITE which means handshake
renegotiation. Need to keep handshake state to do that.*/
return STUB_TCP_ERROR; return STUB_TCP_ERROR;
}
tcp->to_read -= read; tcp->to_read -= read;
tcp->read_pos += read; tcp->read_pos += read;
@ -1217,6 +1213,8 @@ stub_tls_write(getdns_upstream *upstream, getdns_tcp_state *tcp,
* Lets see how much of it we can write */ * Lets see how much of it we can write */
/* TODO[TLS]: Handle error cases, partial writes, renegotiation etc. */ /* TODO[TLS]: Handle error cases, partial writes, renegotiation etc. */
getdns_return_t r;
#if INTERCEPT_COM_DS #if INTERCEPT_COM_DS
/* Intercept and do not sent out COM DS queries. For debugging /* Intercept and do not sent out COM DS queries. For debugging
* purposes only. Never commit with this turned on. * purposes only. Never commit with this turned on.
@ -1231,19 +1229,16 @@ stub_tls_write(getdns_upstream *upstream, getdns_tcp_state *tcp,
debug_req("Intercepting", netreq); debug_req("Intercepting", netreq);
written = pkt_len + 2; written = pkt_len + 2;
r = GETDNS_RETURN_GOOD;
} else } else
#endif #endif
switch ((int)_getdns_tls_connection_write(tls_obj, netreq->query - 2, pkt_len + 2, &written)) { r = _getdns_tls_connection_write(tls_obj, netreq->query - 2, pkt_len + 2, &written);
case GETDNS_RETURN_GOOD: if (r == GETDNS_RETURN_TLS_WANT_READ ||
break; r == GETDNS_RETURN_TLS_WANT_WRITE)
case GETDNS_RETURN_TLS_WANT_READ:
case GETDNS_RETURN_TLS_WANT_WRITE:
return STUB_TCP_RETRY; return STUB_TCP_RETRY;
else if (r != GETDNS_RETURN_GOOD)
default:
return STUB_TCP_ERROR; return STUB_TCP_ERROR;
}
/* We were able to write everything! Start reading. */ /* We were able to write everything! Start reading. */
return (int) query_id; return (int) query_id;