dnsbl: src/dnsbl.cpp comparison

comparison src/dnsbl.cpp @ 223:da9e7f1c8160

fix unsigned signed compare, back to mixed -lresolv and libresolv.a with auto requires

author	Carl Byington <carl@five-ten-sg.com>
date	Sun, 28 Dec 2008 09:15:25 -0800
parents	b2a7ca398712
children	8e1cbf3d96fc

comparison

equal deleted inserted replaced

-:b2a7ca398712
+:da9e7f1c8160
 #ifdef RESOLVER_DEBUG
 char text[1000];
 snprintf(text, sizeof(text), "process_resolver_requests() has a question %s", question);
 my_syslog(text);
 #endif
-glom.length = res_search(question, ns_c_in, ns_t_a, glom.answer, sizeof(glom.answer));
+int res_result = res_search(question, ns_c_in, ns_t_a, glom.answer, sizeof(glom.answer));
-if (glom.length < 0) glom.length = 0;   // represent all errors as zero length answers
+if (res_result < 0) glom.length = 0;   // represent all errors as zero length answers
+else                glom.length = (size_t)res_result;
 #else
 glom.length = sizeof(glom.answer);
 glom.answer = 0;
 struct hostent *host = gethostbyname(question);
 if (host && (host->h_addrtype == AF_INET)) {
 #ifdef RESOLVER_DEBUG
 char text[1000];
 snprintf(text, sizeof(text), "dns_interface() wrote question %s and has answer length %d", question, glom.length);
 my_syslog(text);
 #endif
-if ((glom.length < 0) || (glom.length > sizeof(glom.answer))) {
+if ((glom.length == 0) || (glom.length > sizeof(glom.answer))) {
 priv.err = true;
 return 0;  // cannot process overlarge answers
 }
 priv.my_read(buf, glom.length);
 #ifdef NS_PACKETSZ
 // now we need to lock the resolver mutex to keep the milter threads from
 // stepping on each other while parsing the dns answer.
 int ret_address = 0;
 pthread_mutex_lock(&resolve_mutex);
-if (glom.length > 0) {
+// parse the answer
-// parse the answer
+ns_msg handle;
-ns_msg handle;
+ns_rr  rr;
-ns_rr  rr;
+if (ns_initparse(glom.answer, glom.length, &handle) == 0) {
-if (ns_initparse(glom.answer, glom.length, &handle) == 0) {
+// look for ns names
-// look for ns names
+if (nameservers) {
-if (nameservers) {
+ns_map &ns = *nameservers;
-ns_map &ns = *nameservers;
+int rrnum = 0;
-int rrnum = 0;
+while (ns_parserr(&handle, ns_s_ns, rrnum++, &rr) == 0) {
-while (ns_parserr(&handle, ns_s_ns, rrnum++, &rr) == 0) {
+if (ns_rr_type(rr) == ns_t_ns) {
-if (ns_rr_type(rr) == ns_t_ns) {
+char nam[NS_MAXDNAME+1];
-char nam[NS_MAXDNAME+1];
+char         *n = nam;
-char         *n = nam;
+const u_char *p = ns_rr_rdata(rr);
-const u_char *p = ns_rr_rdata(rr);
+while (((n-nam) < NS_MAXDNAME) && ((size_t)(p-glom.answer) < glom.length) && *p) {
-while (((n-nam) < NS_MAXDNAME) && ((size_t)(p-glom.answer) < glom.length) && *p) {
+size_t s = *(p++);
-size_t s = *(p++);
+if (s > 191) {
-if (s > 191) {
+// compression pointer
-// compression pointer
+s = (s-192)*256 + *(p++);
-s = (s-192)*256 + *(p++);
+if (s >= glom.length) break; // pointer outside bounds of answer
-if (s >= glom.length) break; // pointer outside bounds of answer
+p = glom.answer + s;
-p = glom.answer + s;
+s = *(p++);
-s = *(p++);
-}
-if (s > 0) {
-if ((size_t)(n-nam)         >= (NS_MAXDNAME-s)) break;  // destination would overflow name buffer
-if ((size_t)(p-glom.answer) >= (glom.length-s)) break;  // source outside bounds of answer
-memcpy(n, p, s);
-n += s;
-p += s;
-*(n++) = '.';
-}
 }
-if (n-nam) n--;             // remove trailing .
+if (s > 0) {
-*n = '\0';                  // null terminate it
+if ((size_t)(n-nam)         >= (NS_MAXDNAME-s)) break;  // destination would overflow name buffer
-ns.add(nam, question);      // ns host to lookup later
+if ((size_t)(p-glom.answer) >= (glom.length-s)) break;  // source outside bounds of answer
+memcpy(n, p, s);
+n += s;
+p += s;
+*(n++) = '.';
+}
+}
+if (n-nam) n--;             // remove trailing .
+*n = '\0';                  // null terminate it
+ns.add(nam, question);      // ns host to lookup later
+}
+}
+rrnum = 0;
+while (ns_parserr(&handle, ns_s_ar, rrnum++, &rr) == 0) {
+if (ns_rr_type(rr) == ns_t_a) {
+char* nam = (char*)ns_rr_name(rr);
+ns_mapper::iterator i = ns.ns_ip.find(nam);
+if (i != ns.ns_ip.end()) {
+// we want this ip address
+int address;
+memcpy(&address, ns_rr_rdata(rr), sizeof(address));
+ns.ns_ip[nam] = address;
 }
 }
-rrnum = 0;
+}
-while (ns_parserr(&handle, ns_s_ar, rrnum++, &rr) == 0) {
+}
-if (ns_rr_type(rr) == ns_t_a) {
+int rrnum = 0;
-char* nam = (char*)ns_rr_name(rr);
+while (ns_parserr(&handle, ns_s_an, rrnum++, &rr) == 0) {
-ns_mapper::iterator i = ns.ns_ip.find(nam);
+if (ns_rr_type(rr) == ns_t_a) {
-if (i != ns.ns_ip.end()) {
+int address;
-// we want this ip address
+memcpy(&address, ns_rr_rdata(rr), sizeof(address));
-int address;
+ret_address = address;
-memcpy(&address, ns_rr_rdata(rr), sizeof(address));
-ns.ns_ip[nam] = address;
-}
-}
-}
-}
-int rrnum = 0;
-while (ns_parserr(&handle, ns_s_an, rrnum++, &rr) == 0) {
-if (ns_rr_type(rr) == ns_t_a) {
-int address;
-memcpy(&address, ns_rr_rdata(rr), sizeof(address));
-ret_address = address;
-}
 }
 }
 }
 pthread_mutex_unlock(&resolve_mutex);
 #ifdef RESOLVER_DEBUG

Mercurial > dnsbl

comparison src/dnsbl.cpp @ 223:da9e7f1c8160