Deleted Added
full compact
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.
43c43,47
< #include <ldns/wire2host.h>
---
> #ifdef HAVE_TIME_H
> #include <time.h>
> #endif
> #include <sys/time.h>
> #include <sys/types.h>
53a58
> #include "ldns/sbuffer.h"
260c265
< uint16_t flags = ldns_buffer_read_u16_at(c->buffer, 2);
---
> uint16_t flags = sldns_buffer_read_u16_at(c->buffer, 2);
267c272
< stats->qopcode[ LDNS_OPCODE_WIRE(ldns_buffer_begin(c->buffer)) ]++;
---
> stats->qopcode[ LDNS_OPCODE_WIRE(sldns_buffer_begin(c->buffer)) ]++;
295c300
< void server_stats_insrcode(struct server_stats* stats, ldns_buffer* buf)
---
> void server_stats_insrcode(struct server_stats* stats, sldns_buffer* buf)
297,298c302,303
< if(stats->extended && ldns_buffer_limit(buf) != 0) {
< int r = (int)LDNS_RCODE_WIRE( ldns_buffer_begin(buf) );
---
> if(stats->extended && sldns_buffer_limit(buf) != 0) {
> int r = (int)LDNS_RCODE_WIRE( sldns_buffer_begin(buf) );
300c305
< if(r == 0 && LDNS_ANCOUNT( ldns_buffer_begin(buf) ) == 0)
---
> if(r == 0 && LDNS_ANCOUNT( sldns_buffer_begin(buf) ) == 0)