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.
55a56
> #include "ldns/sbuffer.h"
62c63
< remove_rrset(const char* str, ldns_buffer* pkt, struct msg_parse* msg,
---
> remove_rrset(const char* str, sldns_buffer* pkt, struct msg_parse* msg,
65c66
< if(verbosity >= VERB_QUERY
---
> if(verbosity >= VERB_QUERY && str
111c112
< uint8_t** nm, size_t* nmlen, ldns_buffer* pkt)
---
> uint8_t** nm, size_t* nmlen, sldns_buffer* pkt)
135c136
< len = ldns_read_uint16(rr->ttl_data+sizeof(uint32_t));
---
> len = sldns_read_uint16(rr->ttl_data+sizeof(uint32_t));
139,140c140,141
< oldpos = ldns_buffer_position(pkt);
< ldns_buffer_set_position(pkt, (size_t)(*nm - ldns_buffer_begin(pkt)));
---
> oldpos = sldns_buffer_position(pkt);
> sldns_buffer_set_position(pkt, (size_t)(*nm - sldns_buffer_begin(pkt)));
142c143
< ldns_buffer_set_position(pkt, oldpos);
---
> sldns_buffer_set_position(pkt, oldpos);
150c151
< mark_additional_rrset(ldns_buffer* pkt, struct msg_parse* msg,
---
> mark_additional_rrset(sldns_buffer* pkt, struct msg_parse* msg,
212c213
< uint8_t* alias, size_t* aliaslen, ldns_buffer* pkt)
---
> uint8_t* alias, size_t* aliaslen, sldns_buffer* pkt)
236c237
< struct rrset_parse* nx, ldns_buffer* pkt)
---
> struct rrset_parse* nx, sldns_buffer* pkt)
267,268c268,269
< ldns_write_uint32(cn->rr_first->ttl_data, 0); /* TTL = 0 */
< ldns_write_uint16(cn->rr_first->ttl_data+4, aliaslen);
---
> sldns_write_uint32(cn->rr_first->ttl_data, 0); /* TTL = 0 */
> sldns_write_uint16(cn->rr_first->ttl_data+4, aliaslen);
290c291
< pkt_strict_sub(ldns_buffer* pkt, uint8_t* sname, uint8_t* dr)
---
> pkt_strict_sub(sldns_buffer* pkt, uint8_t* sname, uint8_t* dr)
302c303
< pkt_sub(ldns_buffer* pkt, uint8_t* comprname, uint8_t* zone)
---
> pkt_sub(sldns_buffer* pkt, uint8_t* comprname, uint8_t* zone)
311c312
< sub_of_pkt(ldns_buffer* pkt, uint8_t* zone, uint8_t* comprname)
---
> sub_of_pkt(sldns_buffer* pkt, uint8_t* zone, uint8_t* comprname)
330c331
< scrub_normalize(ldns_buffer* pkt, struct msg_parse* msg,
---
> scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,
517c518
< store_rrset(ldns_buffer* pkt, struct msg_parse* msg, struct module_env* env,
---
> store_rrset(sldns_buffer* pkt, struct msg_parse* msg, struct module_env* env,
523c524
< uint32_t now = *env->now;
---
> time_t now = *env->now;
568c569
< len = ldns_read_uint16(rr->ttl_data+4);
---
> len = sldns_read_uint16(rr->ttl_data+4);
597c598
< scrub_sanitize(ldns_buffer* pkt, struct msg_parse* msg,
---
> scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg,
649,650c650
< rrset->type == LDNS_RR_TYPE_AAAA) &&
< priv_rrset_bad(ie->priv, pkt, rrset)) {
---
> rrset->type == LDNS_RR_TYPE_AAAA)) {
654,656c654,659
< remove_rrset("sanitize: removing public name with "
< "private address", pkt, msg, prev, &rrset);
< continue;
---
> /* also do not remove entire rrset, unless all records
> * in it are bad */
> if(priv_rrset_bad(ie->priv, pkt, rrset)) {
> remove_rrset(NULL, pkt, msg, prev, &rrset);
> continue;
> }
714c717
< scrub_message(ldns_buffer* pkt, struct msg_parse* msg,
---
> scrub_message(sldns_buffer* pkt, struct msg_parse* msg,