diff options
Diffstat (limited to 'pythonmod')
| -rw-r--r-- | pythonmod/doc/examples/example5.rst | 2 | ||||
| -rw-r--r-- | pythonmod/doc/modules/struct.rst | 6 | ||||
| -rw-r--r-- | pythonmod/doc/usecase.rst | 2 | ||||
| -rw-r--r-- | pythonmod/examples/edns.py | 2 | ||||
| -rw-r--r-- | pythonmod/interface.i | 13 | ||||
| -rw-r--r-- | pythonmod/pythonmod_utils.c | 2 |
6 files changed, 15 insertions, 12 deletions
diff --git a/pythonmod/doc/examples/example5.rst b/pythonmod/doc/examples/example5.rst index 938d8941bc9c..8b9d145d1429 100644 --- a/pythonmod/doc/examples/example5.rst +++ b/pythonmod/doc/examples/example5.rst @@ -90,7 +90,7 @@ We can also remove an EDNS option code from an EDNS option list. log_info("python: Option code {} was not found in the " "list.".format(code)) -.. note:: All occurences of the EDNS option code will be removed from the list: +.. note:: All occurrences of the EDNS option code will be removed from the list: Controlling other modules' cache behavior diff --git a/pythonmod/doc/modules/struct.rst b/pythonmod/doc/modules/struct.rst index de7c084e9008..310cf552456e 100644 --- a/pythonmod/doc/modules/struct.rst +++ b/pythonmod/doc/modules/struct.rst @@ -12,7 +12,7 @@ module_qstate .. attribute:: qinfo - (:class:`query_info`) Informations about query being answered. Name, RR type, RR class. + (:class:`query_info`) Information about query being answered. Name, RR type, RR class. .. attribute:: query_flags @@ -256,7 +256,7 @@ dns_msg .. attribute:: qinfo - (:class:`query_info`) Informations about query. + (:class:`query_info`) Information about query. .. attribute:: rep @@ -440,7 +440,7 @@ DNSMessage .. method:: set_return_msg(self, qstate) - This method fills qstate return message according to the given informations. + This method fills qstate return message according to the given information. It takes lists of RRs in each section of answer, created necessary RRsets in wire format and store the result in :attr:`qstate.return_msg`. Returns 1 if OK. diff --git a/pythonmod/doc/usecase.rst b/pythonmod/doc/usecase.rst index 5845061b02b3..27985e0394d5 100644 --- a/pythonmod/doc/usecase.rst +++ b/pythonmod/doc/usecase.rst @@ -21,7 +21,7 @@ almost every mail server supports DNS based blacklisting. DNS based Wake-On-Lan --------------------- -Controled by secured queries secured with private key. +Controlled by secured queries secured with private key. Dynamic translation service --------------------------- diff --git a/pythonmod/examples/edns.py b/pythonmod/examples/edns.py index ca1bb8da710d..ddcccc51c9bd 100644 --- a/pythonmod/examples/edns.py +++ b/pythonmod/examples/edns.py @@ -55,7 +55,7 @@ # Return True on success, False on failure. # # edns_opt_list_remove(edns_opt_list, code): -# Remove all occurences of the given EDNS option code from the +# Remove all occurrences of the given EDNS option code from the # edns_opt_list. # Return True when at least one EDNS option was removed, False otherwise. # diff --git a/pythonmod/interface.i b/pythonmod/interface.i index ce7dcde7173c..03483abdf824 100644 --- a/pythonmod/interface.i +++ b/pythonmod/interface.i @@ -678,11 +678,14 @@ struct edns_data { uint8_t edns_version; uint16_t bits; uint16_t udp_size; - struct edns_option* opt_list; + struct edns_option* opt_list_in; + struct edns_option* opt_list_out; + struct edns_option* opt_list_inplace_cb_out; + uint16_t padding_block_size; }; %inline %{ struct edns_option** _edns_data_opt_list_get(struct edns_data* edns) { - return &edns->opt_list; + return &edns->opt_list_in; } %} %extend edns_data { @@ -710,8 +713,8 @@ struct module_env { struct outbound_entry* (*send_query)(struct query_info* qinfo, uint16_t flags, int dnssec, int want_dnssec, int nocaps, struct sockaddr_storage* addr, socklen_t addrlen, - uint8_t* zone, size_t zonelen, int ssl_upstream, char* tls_auth_name, - struct module_qstate* q); + uint8_t* zone, size_t zonelen, int tcp_upstream, int ssl_upstream, + char* tls_auth_name, struct module_qstate* q); void (*detach_subs)(struct module_qstate* qstate); int (*attach_sub)(struct module_qstate* qstate, struct query_info* qinfo, uint16_t qflags, int prime, @@ -1341,7 +1344,7 @@ int set_return_msg(struct module_qstate* qstate, %pythoncode %{ class DNSMessage: def __init__(self, rr_name, rr_type, rr_class = RR_CLASS_IN, query_flags = 0, default_ttl = 0): - """Query flags is a combination of PKT_xx contants""" + """Query flags is a combination of PKT_xx constants""" self.rr_name = rr_name self.rr_type = rr_type self.rr_class = rr_class diff --git a/pythonmod/pythonmod_utils.c b/pythonmod/pythonmod_utils.c index 21a16bbe85bf..34a20ba76485 100644 --- a/pythonmod/pythonmod_utils.c +++ b/pythonmod/pythonmod_utils.c @@ -132,7 +132,7 @@ int createResponse(struct module_qstate* qstate, sldns_buffer* pkt) return 0; } /* edns is not examined, but removed from message to help cache */ - if(parse_extract_edns(prs, &edns, qstate->env->scratch) != + if(parse_extract_edns_from_response_msg(prs, &edns, qstate->env->scratch) != LDNS_RCODE_NOERROR) return 0; |