upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix #31: swig 4.0 and python module.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2019-05-16 11:06:01 +02:00
parent a08fe8ca60
commit 310396190b
3 changed files with 49 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
16 May 2019: Wouter
- Fix #31: swig 4.0 and python module.
13 May 2019: Wouter 13 May 2019: Wouter
- Squelch log messages from tcp send about connection reset by peer. - Squelch log messages from tcp send about connection reset by peer.
They can be enabled with verbosity at higher values for diagnosing They can be enabled with verbosity at higher values for diagnosing

7
libunbound/python/libunbound.i
View file

@ -824,8 +824,7 @@ Result: ['74.125.43.147', '74.125.43.99', '74.125.43.103', '74.125.43.104']
""" """
return self.rcode2str[self.rcode] return self.rcode2str[self.rcode]
__swig_getmethods__["rcode_str"] = _get_rcode_str rcode_str = property(_get_rcode_str)
if _newclass:rcode_str = _swig_property(_get_rcode_str)
def _get_raw_data(self): def _get_raw_data(self):
"""Result data, a list of network order DNS rdata items. """Result data, a list of network order DNS rdata items.
@ -834,15 +833,13 @@ Result: ['74.125.43.147', '74.125.43.99', '74.125.43.103', '74.125.43.104']
""" """
return self._ub_result_data(self) return self._ub_result_data(self)
__swig_getmethods__["rawdata"] = _get_raw_data
rawdata = property(_get_raw_data, doc="Returns raw data, a list of rdata items. To decode RAW data use the :attr:`data` attribute which returns an instance of :class:`ub_data` containing the conversion functions.") rawdata = property(_get_raw_data, doc="Returns raw data, a list of rdata items. To decode RAW data use the :attr:`data` attribute which returns an instance of :class:`ub_data` containing the conversion functions.")
def _get_data(self): def _get_data(self):
if not self.havedata: return None if not self.havedata: return None
return ub_data(self._ub_result_data(self)) return ub_data(self._ub_result_data(self))
__swig_getmethods__["data"] = _get_data packet = property(_packet)
__swig_getmethods__["packet"] = _packet
data = property(_get_data, doc="Returns :class:`ub_data` instance containing various decoding functions or None") data = property(_get_data, doc="Returns :class:`ub_data` instance containing various decoding functions or None")
%} %}

132
pythonmod/interface.i
View file

@ -196,22 +196,17 @@ struct query_info {
%extend query_info { %extend query_info {
%pythoncode %{ %pythoncode %{
def _get_qtype_str(self): return sldns_wire2str_type(self.qtype) def _get_qtype_str(self): return sldns_wire2str_type(self.qtype)
__swig_getmethods__["qtype_str"] = _get_qtype_str qtype_str = property(_get_qtype_str)
if _newclass:qtype_str = _swig_property(_get_qtype_str)
def _get_qclass_str(self): return sldns_wire2str_class(self.qclass) def _get_qclass_str(self): return sldns_wire2str_class(self.qclass)
__swig_getmethods__["qclass_str"] = _get_qclass_str qclass_str = property(_get_qclass_str)
if _newclass:qclass_str = _swig_property(_get_qclass_str)
__swig_getmethods__["qname"] = _unboundmodule._get_qname qname = property(_unboundmodule._get_qname)
if _newclass:qname = _swig_property(_unboundmodule._get_qname)
__swig_getmethods__["qname_list"] = _unboundmodule._get_qname_components qname_list = property(_unboundmodule._get_qname_components)
if _newclass:qname_list = _swig_property(_unboundmodule._get_qname_components)
def _get_qname_str(self): return dnameAsStr(self.qname) def _get_qname_str(self): return dnameAsStr(self.qname)
__swig_getmethods__["qname_str"] = _get_qname_str qname_str = property(_get_qname_str)
if _newclass:qname_str = _swig_property(_get_qname_str)
%} %}
} }
@ -251,22 +246,17 @@ uint16_t ntohs(uint16_t netshort);
%extend packed_rrset_key { %extend packed_rrset_key {
%pythoncode %{ %pythoncode %{
def _get_type_str(self): return sldns_wire2str_type(_unboundmodule.ntohs(self.type)) def _get_type_str(self): return sldns_wire2str_type(_unboundmodule.ntohs(self.type))
__swig_getmethods__["type_str"] = _get_type_str type_str = property(_get_type_str)
if _newclass:type_str = _swig_property(_get_type_str)
def _get_class_str(self): return sldns_wire2str_class(_unboundmodule.ntohs(self.rrset_class)) def _get_class_str(self): return sldns_wire2str_class(_unboundmodule.ntohs(self.rrset_class))
__swig_getmethods__["rrset_class_str"] = _get_class_str rrset_class_str = property(_get_class_str)
if _newclass:rrset_class_str = _swig_property(_get_class_str)
__swig_getmethods__["dname"] = _unboundmodule._get_dname dname = property(_unboundmodule._get_dname)
if _newclass:dname = _swig_property(_unboundmodule._get_dname)
__swig_getmethods__["dname_list"] = _unboundmodule._get_dname_components dname_list = property(_unboundmodule._get_dname_components)
if _newclass:dname_list = _swig_property(_unboundmodule._get_dname_components)
def _get_dname_str(self): return dnameAsStr(self.dname) def _get_dname_str(self): return dnameAsStr(self.dname)
__swig_getmethods__["dname_str"] = _get_dname_str dname_str = property(_get_dname_str)
if _newclass:dname_str = _swig_property(_get_dname_str)
%} %}
} }
@ -364,14 +354,11 @@ struct packed_rrset_data {
%extend packed_rrset_data { %extend packed_rrset_data {
%pythoncode %{ %pythoncode %{
def _get_data_rr_len(self): return RRSetData_RRLen(self) def _get_data_rr_len(self): return RRSetData_RRLen(self)
__swig_getmethods__["rr_len"] = _get_data_rr_len rr_len = property(_get_data_rr_len)
if _newclass:rr_len = _swig_property(_get_data_rr_len)
def _get_data_rr_ttl(self): return RRSetData_RRTTL(self) def _get_data_rr_ttl(self): return RRSetData_RRTTL(self)
__swig_getmethods__["rr_ttl"] =_get_data_rr_ttl rr_ttl = property(_get_data_rr_ttl)
if _newclass:rr_len = _swig_property(_get_data_rr_ttl)
def _get_data_rr_data(self): return RRSetData_RRData(self) def _get_data_rr_data(self): return RRSetData_RRData(self)
__swig_getmethods__["rr_data"] = _get_data_rr_data rr_data = property(_get_data_rr_data)
if _newclass:rr_len = _swig_property(_get_data_rr_data)
%} %}
} }
@ -443,12 +430,10 @@ struct dns_msg {
%extend reply_info { %extend reply_info {
%pythoncode %{ %pythoncode %{
def _rrset_ref_get(self): return ReplyInfo_Ref(self) def _rrset_ref_get(self): return ReplyInfo_Ref(self)
__swig_getmethods__["ref"] = _rrset_ref_get ref = property(_rrset_ref_get)
if _newclass:ref = _swig_property(_rrset_ref_get)
def _rrset_rrsets_get(self): return ReplyInfo_RRSet(self) def _rrset_rrsets_get(self): return ReplyInfo_RRSet(self)
__swig_getmethods__["rrsets"] = _rrset_rrsets_get rrsets = property(_rrset_rrsets_get)
if _newclass:rrsets = _swig_property(_rrset_rrsets_get)
%} %}
} }
@ -589,28 +574,22 @@ struct sockaddr_storage {};
%extend sockaddr_storage { %extend sockaddr_storage {
%pythoncode %{ %pythoncode %{
def _family_get(self): return _sockaddr_storage_family(self) def _family_get(self): return _sockaddr_storage_family(self)
__swig_getmethods__["family"] = _family_get family = property(_family_get)
if _newclass: family = _swig_property(_family_get)
def _addr_get(self): return _sockaddr_storage_addr(self) def _addr_get(self): return _sockaddr_storage_addr(self)
__swig_getmethods__["addr"] = _addr_get addr = property(_addr_get)
if _newclass: addr = _swig_property(_addr_get)
def _raw_addr_get(self): return _sockaddr_storage_raw_addr(self) def _raw_addr_get(self): return _sockaddr_storage_raw_addr(self)
__swig_getmethods__["raw_addr"] = _raw_addr_get raw_addr = property(_raw_addr_get)
if _newclass: raw_addr = _swig_property(_raw_addr_get)
def _port_get(self): return _sockaddr_storage_port(self) def _port_get(self): return _sockaddr_storage_port(self)
__swig_getmethods__["port"] = _port_get port = property(_port_get)
if _newclass: port = _swig_property(_port_get)
def _flowinfo_get(self): return _sockaddr_storage_flowinfo(self) def _flowinfo_get(self): return _sockaddr_storage_flowinfo(self)
__swig_getmethods__["flowinfo"] = _flowinfo_get flowinfo = property(_flowinfo_get)
if _newclass: flowinfo = _swig_property(_flowinfo_get)
def _scope_id_get(self): return _sockaddr_storage_scope_id(self) def _scope_id_get(self): return _sockaddr_storage_scope_id(self)
__swig_getmethods__["scope_id"] = _scope_id_get scope_id = property(_scope_id_get)
if _newclass: scope_id = _swig_property(_scope_id_get)
%} %}
} }
@ -634,16 +613,13 @@ struct comm_reply {
%extend comm_reply { %extend comm_reply {
%pythoncode %{ %pythoncode %{
def _addr_get(self): return _sockaddr_storage_addr(self._addr) def _addr_get(self): return _sockaddr_storage_addr(self._addr)
__swig_getmethods__["addr"] = _addr_get addr = property(_addr_get)
if _newclass:addr = _swig_property(_addr_get)
def _port_get(self): return _sockaddr_storage_port(self._addr) def _port_get(self): return _sockaddr_storage_port(self._addr)
__swig_getmethods__["port"] = _port_get port = property(_port_get)
if _newclass:port = _swig_property(_port_get)
def _family_get(self): return _sockaddr_storage_family(self._addr) def _family_get(self): return _sockaddr_storage_family(self._addr)
__swig_getmethods__["family"] = _family_get family = property(_family_get)
if _newclass:family = _swig_property(_family_get)
%} %}
} }
@ -678,12 +654,10 @@ struct edns_option {
%extend edns_option { %extend edns_option {
%pythoncode %{ %pythoncode %{
def _opt_code_get(self): return _edns_option_opt_code_get(self) def _opt_code_get(self): return _edns_option_opt_code_get(self)
__swig_getmethods__["code"] = _opt_code_get code = property(_opt_code_get)
if _newclass: opt_code = _swig_property(_opt_code_get)
def _opt_data_get(self): return _edns_option_opt_data_get(self) def _opt_data_get(self): return _edns_option_opt_data_get(self)
__swig_getmethods__["data"] = _opt_data_get data = property(_opt_data_get)
if _newclass: opt_data = _swig_property(_opt_data_get)
%} %}
} }
@ -710,11 +684,9 @@ struct edns_data {
%extend edns_data { %extend edns_data {
%pythoncode %{ %pythoncode %{
def _opt_list_iter(self): return EdnsOptsListIter(self.opt_list) def _opt_list_iter(self): return EdnsOptsListIter(self.opt_list)
__swig_getmethods__["opt_list_iter"] = _opt_list_iter opt_list_iter = property(_opt_list_iter)
if _newclass:opt_list_iter = _swig_property(_opt_list_iter)
def _opt_list(self): return _edns_data_opt_list_get(self) def _opt_list(self): return _edns_data_opt_list_get(self)
__swig_getmethods__["opt_list"] = _opt_list opt_list = property(_opt_list)
if _newclass:opt_list = _swig_property(_opt_list)
%} %}
} }
@ -915,34 +887,25 @@ struct module_qstate {
_unboundmodule._ext_state_set(self, id, state) _unboundmodule._ext_state_set(self, id, state)
def __ext_state_get(self): return ExtState(self) def __ext_state_get(self): return ExtState(self)
__swig_getmethods__["ext_state"] = __ext_state_get ext_state = property(__ext_state_get) #, __ext_state_set
if _newclass:ext_state = _swig_property(__ext_state_get)#, __ext_state_set)
def _edns_opts_front_in_iter(self): return EdnsOptsListIter(self.edns_opts_front_in) def _edns_opts_front_in_iter(self): return EdnsOptsListIter(self.edns_opts_front_in)
__swig_getmethods__["edns_opts_front_in_iter"] = _edns_opts_front_in_iter edns_opts_front_in_iter = property(_edns_opts_front_in_iter)
if _newclass:edns_opts_front_in_iter = _swig_property(_edns_opts_front_in_iter)
def _edns_opts_back_out_iter(self): return EdnsOptsListIter(self.edns_opts_back_out) def _edns_opts_back_out_iter(self): return EdnsOptsListIter(self.edns_opts_back_out)
__swig_getmethods__["edns_opts_back_out_iter"] = _edns_opts_back_out_iter edns_opts_back_out_iter = property(_edns_opts_back_out_iter)
if _newclass:edns_opts_back_out_iter = _swig_property(_edns_opts_back_out_iter)
def _edns_opts_back_in_iter(self): return EdnsOptsListIter(self.edns_opts_back_in) def _edns_opts_back_in_iter(self): return EdnsOptsListIter(self.edns_opts_back_in)
__swig_getmethods__["edns_opts_back_in_iter"] = _edns_opts_back_in_iter edns_opts_back_in_iter = property(_edns_opts_back_in_iter)
if _newclass:edns_opts_back_in_iter = _swig_property(_edns_opts_back_in_iter)
def _edns_opts_front_out_iter(self): return EdnsOptsListIter(self.edns_opts_front_out) def _edns_opts_front_out_iter(self): return EdnsOptsListIter(self.edns_opts_front_out)
__swig_getmethods__["edns_opts_front_out_iter"] = _edns_opts_front_out_iter edns_opts_front_out_iter = property(_edns_opts_front_out_iter)
if _newclass:edns_opts_front_out_iter = _swig_property(_edns_opts_front_out_iter)
def _edns_opts_front_in(self): return _edns_opts_front_in_get(self) def _edns_opts_front_in(self): return _edns_opts_front_in_get(self)
__swig_getmethods__["edns_opts_front_in"] = _edns_opts_front_in edns_opts_front_in = property(_edns_opts_front_in)
if _newclass:edns_opts_front_in = _swig_property(_edns_opts_front_in)
def _edns_opts_back_out(self): return _edns_opts_back_out_get(self) def _edns_opts_back_out(self): return _edns_opts_back_out_get(self)
__swig_getmethods__["edns_opts_back_out"] = _edns_opts_back_out edns_opts_back_out = property(_edns_opts_back_out)
if _newclass:edns_opts_back_out = _swig_property(_edns_opts_back_out)
def _edns_opts_back_in(self): return _edns_opts_back_in_get(self) def _edns_opts_back_in(self): return _edns_opts_back_in_get(self)
__swig_getmethods__["edns_opts_back_in"] = _edns_opts_back_in edns_opts_back_in = property(_edns_opts_back_in)
if _newclass:edns_opts_back_in = _swig_property(_edns_opts_back_in)
def _edns_opts_front_out(self): return _edns_opts_front_out_get(self) def _edns_opts_front_out(self): return _edns_opts_front_out_get(self)
__swig_getmethods__["edns_opts_front_out"] = _edns_opts_front_out edns_opts_front_out = property(_edns_opts_front_out)
if _newclass:edns_opts_front_out = _swig_property(_edns_opts_front_out)
%} %}
} }
@ -1112,35 +1075,28 @@ struct delegpt {
%extend delegpt { %extend delegpt {
%pythoncode %{ %pythoncode %{
__swig_getmethods__["dname"] = _unboundmodule._get_dp_dname dname = property(_unboundmodule._get_dp_dname)
if _newclass:dname = _swig_property(_unboundmodule._get_dp_dname)
__swig_getmethods__["dname_list"] = _unboundmodule._get_dp_dname_components dname_list = property(_unboundmodule._get_dp_dname_components)
if _newclass:dname_list = _swig_property(_unboundmodule._get_dp_dname_components)
def _get_dname_str(self): return dnameAsStr(self.dname) def _get_dname_str(self): return dnameAsStr(self.dname)
__swig_getmethods__["dname_str"] = _get_dname_str dname_str = property(_get_dname_str)
if _newclass:dname_str = _swig_property(_get_dname_str)
%} %}
} }
%extend delegpt_ns { %extend delegpt_ns {
%pythoncode %{ %pythoncode %{
__swig_getmethods__["dname"] = _unboundmodule._get_dpns_dname dname = property(_unboundmodule._get_dpns_dname)
if _newclass:dname = _swig_property(_unboundmodule._get_dpns_dname)
__swig_getmethods__["dname_list"] = _unboundmodule._get_dpns_dname_components dname_list = property(_unboundmodule._get_dpns_dname_components)
if _newclass:dname_list = _swig_property(_unboundmodule._get_dpns_dname_components)
def _get_dname_str(self): return dnameAsStr(self.dname) def _get_dname_str(self): return dnameAsStr(self.dname)
__swig_getmethods__["dname_str"] = _get_dname_str dname_str = property(_get_dname_str)
if _newclass:dname_str = _swig_property(_get_dname_str)
%} %}
} }
%extend delegpt_addr { %extend delegpt_addr {
%pythoncode %{ %pythoncode %{
def _addr_get(self): return _delegpt_addr_addr_get(self) def _addr_get(self): return _delegpt_addr_addr_get(self)
__swig_getmethods__["addr"] = _addr_get addr = property(_addr_get)
if _newclass:addr = _swig_property(_addr_get)
%} %}
} }