* - parsing assistance functions (mainly for domains inside datagrams)
*/
/*
- * This file is
- * Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- * It is part of adns, which is
- * Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- * Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+ * This file is part of adns, which is
+ * Copyright (C) 1997-2000,2003,2006,2014 Ian Jackson
+ * Copyright (C) 2014 Mark Wooding
+ * Copyright (C) 1999-2000,2003,2006 Tony Finch
+ * Copyright (C) 1991 Massachusetts Institute of Technology
+ * (See the file INSTALL for full details.)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, write to the Free Software Foundation.
*/
#include "internal.h"
-int vbuf__append_quoted1035(vbuf *vb, const byte *buf, int len) {
+static int vbuf_append_quoted1035(vbuf *vb, const byte *buf, int len) {
char qbuf[10];
int i, ch;
if (!adns__vbuf_append(vb,".",1)) return adns_s_nomemory;
}
if (flags & pdf_quoteok) {
- if (!vbuf__append_quoted1035(vb,dgram+labstart,lablen))
+ if (!vbuf_append_quoted1035(vb,dgram+labstart,lablen))
return adns_s_nomemory;
} else {
ch= dgram[labstart];
if (!adns__vbuf_append(vb,"",1)) return adns_s_nomemory;
return adns_s_ok;
}
-
+
+bool adns__labels_equal(const byte *a, int al, const byte *b, int bl) {
+ if (al != bl) return 0;
+ while (al-- > 0) {
+ int ac= ctype_toupper(*a++);
+ int bc= ctype_toupper(*b++);
+ if (ac != bc) return 0;
+ }
+ return 1;
+}
+
adns_status adns__findrr_anychk(adns_query qu, int serv,
const byte *dgram, int dglen, int *cbyte_io,
int *type_r, int *class_r,
int *rdlen_r, int *rdstart_r,
const byte *eo_dgram, int eo_dglen,
int eo_cbyte, int *eo_matched_r) {
- findlabel_state fls, eo_fls;
+ findlabel_state fls, eo_fls_buf;
+ findlabel_state *eo_fls; /* 0 iff we know it's not matching eo_... */
int cbyte;
- int tmp, rdlen, mismatch;
+ int tmp, rdlen;
unsigned long ttl;
- int lablen, labstart, ch;
- int eo_lablen, eo_labstart, eo_ch;
+ int lablen, labstart;
+ int eo_lablen, eo_labstart;
adns_status st;
cbyte= *cbyte_io;
adns__findlabel_start(&fls,qu->ads, serv,qu, dgram,dglen,dglen,cbyte,&cbyte);
if (eo_dgram) {
- adns__findlabel_start(&eo_fls,qu->ads, -1,0,
+ eo_fls= &eo_fls_buf;
+ adns__findlabel_start(eo_fls,qu->ads, -1,0,
eo_dgram,eo_dglen,eo_dglen,eo_cbyte,0);
- mismatch= 0;
} else {
- mismatch= 1;
+ eo_fls= 0;
}
for (;;) {
if (st) return st;
if (lablen<0) goto x_truncated;
- if (!mismatch) {
- st= adns__findlabel_next(&eo_fls,&eo_lablen,&eo_labstart);
+ if (eo_fls) {
+ st= adns__findlabel_next(eo_fls,&eo_lablen,&eo_labstart);
assert(!st); assert(eo_lablen>=0);
- if (lablen != eo_lablen) mismatch= 1;
- while (!mismatch && eo_lablen-- > 0) {
- ch= dgram[labstart++]; if (ctype_alpha(ch)) ch &= ~32;
- eo_ch= eo_dgram[eo_labstart++]; if (ctype_alpha(eo_ch)) eo_ch &= ~32;
- if (ch != eo_ch) mismatch= 1;
- }
+ if (!adns__labels_equal(dgram+labstart, lablen,
+ eo_dgram+eo_labstart, eo_lablen))
+ eo_fls= 0;
}
if (!lablen) break;
}
- if (eo_matched_r) *eo_matched_r= !mismatch;
+ if (eo_matched_r) *eo_matched_r= !!eo_fls;
if (cbyte+10>dglen) goto x_truncated;
GET_W(cbyte,tmp); *type_r= tmp;