24,33c24,33
< * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
< * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
< * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
< * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
< * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
< * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
< * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
< * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
< * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
< * POSSIBILITY OF SUCH DAMAGE.
---
> * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
> * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
> * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
> * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
> * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43,45d42
< #include <ldns/rdata.h>
< #include <ldns/dname.h>
< #include <ldns/rr.h>
51a49,50
> #include "ldns/rrdef.h"
> #include "ldns/str2wire.h"
183c182,183
< ldns_rdf* rdf;
---
> uint8_t* dname;
> size_t dname_len;
188,189c188,189
< rdf = ldns_dname_new_frm_str(s->name);
< if(!rdf) {
---
> dname = sldns_str2wire_dname(s->name, &dname_len);
> if(!dname) {
193,194c193,194
< if(!(dp=delegpt_create_mlc(ldns_rdf_data(rdf)))) {
< ldns_rdf_deep_free(rdf);
---
> if(!(dp=delegpt_create_mlc(dname))) {
> free(dname);
198c198
< ldns_rdf_deep_free(rdf);
---
> free(dname);
207c207,208
< ldns_rdf* rdf;
---
> uint8_t* dname;
> size_t dname_len;
210,211c211,212
< rdf = ldns_dname_new_frm_str(p->str);
< if(!rdf) {
---
> dname = sldns_str2wire_dname(p->str, &dname_len);
> if(!dname) {
216,217c217,218
< if(!delegpt_add_ns_mlc(dp, ldns_rdf_data(rdf), 0)) {
< ldns_rdf_deep_free(rdf);
---
> if(!delegpt_add_ns_mlc(dp, dname, 0)) {
> free(dname);
221c222
< ldns_rdf_deep_free(rdf);
---
> free(dname);
292a294,295
> uint8_t* dname;
> size_t dname_len;
294,295c297,298
< ldns_rdf* rdf = ldns_dname_new_frm_str(s->name);
< if(!rdf) {
---
> dname = sldns_str2wire_dname(s->name, &dname_len);
> if(!dname) {
299,301c302,303
< if(!fwd_add_stub_hole(fwd, LDNS_RR_CLASS_IN,
< ldns_rdf_data(rdf))) {
< ldns_rdf_deep_free(rdf);
---
> if(!fwd_add_stub_hole(fwd, LDNS_RR_CLASS_IN, dname)) {
> free(dname);
305c307
< ldns_rdf_deep_free(rdf);
---
> free(dname);
327a330,343
> forwards_find(struct iter_forwards* fwd, uint8_t* qname, uint16_t qclass)
> {
> rbnode_t* res = NULL;
> struct iter_forward_zone key;
> key.node.key = &key;
> key.dclass = qclass;
> key.name = qname;
> key.namelabs = dname_count_size_labels(qname, &key.namelen);
> res = rbtree_search(fwd->tree, &key);
> if(res) return ((struct iter_forward_zone*)res)->dp;
> return NULL;
> }
>
> struct delegpt*