Skip to content

Commit e4e919e

Browse files
committed
Updated upstream_recursive_servers
1 parent 361ee6f commit e4e919e

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

doc/functions.rst

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,22 @@ as its methods and attributes.
203203
increase the difficulty for observers to guess traffic
204204
content.
205205

206-
.. py:attribute:: upstream_recursive_servers
206+
.. py:attribute:: upstream_recursive_servers
207207
208208
A list of dicts defining where a stub resolver will send queries.
209209
Each dict in the list contains at least two names: address_type
210-
(whose value is a bindata; it is currently either "IPv4" or "IPv6")
211-
and address_data (whose value is a bindata). It might also contain
212-
port to specify which port to use to contact these DNS servers; the
210+
(either "IPv4" or "IPv6")
211+
and address_data (whose value is a string representation
212+
of an IP address). It might also contain
213+
"port" to specify which port to use to contact these DNS servers; the
213214
default is 53. If the stub and a recursive resolver both support
214215
TSIG (RFC 2845), the upstream_list entry can also contain
215-
tsig_algorithm (a bindata) that is the name of the TSIG hash
216-
algorithm, and tsig_secret (a bindata) that is the TSIG key.
216+
tsig_algorithm (a string) that is the name of the TSIG hash
217+
algorithm, and tsig_secret (a base64 string) that is the TSIG key.
217218

218219
There is also now support for pinning an upstream's
219-
certificate's public keys, with pinsets (when using TLS
220-
for transport. Add an element to the
220+
certificate's public keys with pinsets (when using TLS
221+
for transport). Add an element to the
221222
upstream_recursive_server list entry, called
222223
'tls_pubkey_pinset', which is a list of public key pins.
223224
(See the example code in our examples directory).

0 commit comments

Comments
 (0)