dnsbl: src/dnsbl.cpp comparison

comparison src/dnsbl.cpp @ 242:d8ee4c97b9ab stable-6-0-26

64 bit fixes for libresolv.a

author	Carl Byington <carl@five-ten-sg.com>
date	Fri, 19 Nov 2010 13:01:07 -0800
parents	7b818a4e21a4
children	ef97c7cd4a6e

comparison

equal deleted inserted replaced

-:315c53fbbb77
+:d8ee4c97b9ab
 struct ns_map {
 // all the strings are owned by the keys/values in the ns_host string map
 string_map  ns_host;    // nameserver name -> host name that uses this name server
-ns_mapper   ns_ip;      // nameserver name -> ip address of the name server
+ns_mapper   ns_ip;      // nameserver name -> ipv4 address of the name server
 ~ns_map();
 void add(const char *name, const char *refer);
 };
 struct glommer {
 size_t  length;
 #ifdef NS_PACKETSZ
 u_char answer[NS_PACKETSZ*4];   // with a resolver, we return resolver answers
 #else
-int answer;                     // without a resolver, we return a single ip4 address, 0 == no answer
+int32_t answer;                 // without a resolver, we return a single ipv4 address, 0 == no answer
 #endif
 } __attribute__ ((packed));
 ////////////////////////////////////////////////
 //  ask a dns question and get an A record answer - we don't try
 //  very hard, just using the default resolver retry settings.
 //  If we cannot get an answer, we just accept the mail.
 //
 //
-int dns_interface(mlfiPriv &priv, const char *question, bool maybe_ip, ns_map *nameservers);
+int32_t dns_interface(mlfiPriv &priv, const char *question, bool maybe_ip, ns_map *nameservers);
-int dns_interface(mlfiPriv &priv, const char *question, bool maybe_ip, ns_map *nameservers) {
+int32_t dns_interface(mlfiPriv &priv, const char *question, bool maybe_ip, ns_map *nameservers) {
 // tell sendmail we are still working
 #if _FFR_SMFI_PROGRESS
 if (priv.eom) smfi_progress(priv.ctx);
 #endif
 if (priv.err) return 0; // cannot ask more questions on this socket.
 if (maybe_ip) {
 // might be a bare ip address, try this first to avoid dns lookups that may not be needed
 in_addr ip;
 if (inet_aton(question, &ip)) {
-return (int)ip.s_addr;
+return (int32_t)ip.s_addr;
 }
 }
 int n = strlen(question);
 if (question[n-1] == '.') {
 priv.my_write(question, n+1);   // write the question including the null terminator
 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;
+int32_t 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;
+int32_t address;
 memcpy(&address, ns_rr_rdata(rr), sizeof(address));
 ret_address = address;
 }
 }
 }
 ////////////////////////////////////////////////
 //  check a single dnsbl
 //
-bool check_single(mlfiPriv &priv, int ip, const char *suffix);
+bool check_single(mlfiPriv &priv, int32_t ip, const char *suffix);
-bool check_single(mlfiPriv &priv, int ip, const char *suffix) {
+bool check_single(mlfiPriv &priv, int32_t ip, const char *suffix) {
 // make a dns question
 const u_char *src = (const u_char *)&ip;
 if (src[0] == 127) return false;    // don't do dns lookups on localhost
 if (src[0] == 10)  return false;    // don't do dns lookups on rfc1918 space
 if ((src[0] == 192) && (src[1] == 168)) return false;
 ////////////////////////////////////////////////
 //  check a single dnsbl
 //
-bool check_single(mlfiPriv &priv, int ip, DNSBL &bl);
+bool check_single(mlfiPriv &priv, int32_t ip, DNSBL &bl);
-bool check_single(mlfiPriv &priv, int ip, DNSBL &bl) {
+bool check_single(mlfiPriv &priv, int32_t ip, DNSBL &bl) {
 return check_single(priv, ip, bl.suffix);
 }
 ////////////////////////////////////////////////
 ////////////////////////////////////////////////
 //  check the hosts from the body against the content filter and uribl dnsbls
 //
 //
-bool check_hosts(mlfiPriv &priv, bool random, int limit, const char *&msg, const char *&host, int &ip, const char *&found);
+bool check_hosts(mlfiPriv &priv, bool random, int limit, const char *&msg, const char *&host, int32_t &ip, const char *&found);
-bool check_hosts(mlfiPriv &priv, bool random, int limit, const char *&msg, const char *&host, int &ip, const char *&found) {
+bool check_hosts(mlfiPriv &priv, bool random, int limit, const char *&msg, const char *&host, int32_t &ip, const char *&found) {
 found = NULL;   // normally ip address style
 if (!priv.content_suffix && !priv.uribl_suffix) return false;   // nothing to check
 string_set &hosts  = priv.memory->get_hosts();
 string_set &ignore = *priv.content_host_ignore;
 int count = 0;
 int   cnt = hosts.size();   // number of hosts we could look at
-int_set ips;
+int32_t_set ips;
 ns_map  nameservers;
 for (string_set::iterator i=hosts.begin(); i!=hosts.end(); i++) {
 host = *i;  // a reference into hosts, which will live until this smtp transaction is closed
 // don't bother looking up hosts on the ignore list
 snprintf(buf, sizeof(buf), "host %s not found", host);
 }
 my_syslog(&priv, buf);
 }
 if (ip) {
-int_set::iterator i = ips.find(ip);
+int32_t_set::iterator i = ips.find(ip);
 if (i == ips.end()) {
 // we haven't looked this up yet
 ips.insert(ip);
 // check dnsbl style list
 if (priv.content_suffix && check_single(priv, ip, priv.content_suffix)) {
 snprintf(buf, sizeof(buf), "ns %s not found", host);
 }
 my_syslog(&priv, buf);
 }
 if (ip) {
-int_set::iterator i = ips.find(ip);
+int32_t_set::iterator i = ips.find(ip);
 if (i == ips.end()) {
 ips.insert(ip);
 if (check_single(priv, ip, priv.content_suffix)) {
 msg = priv.content_message;
 string_map::iterator j = nameservers.ns_host.find(host);
 sfsistat mlfi_eom(SMFICTX *ctx)
 {
 sfsistat  rc;
 mlfiPriv   &priv = *MLFIPRIV;
 const char *host = NULL;
-int       ip;
+int32_t     ip;
 // process end of message
 priv.eom = true;
 if (priv.authenticated || priv.only_whites) rc = SMFIS_CONTINUE;
 else {
 // assert env_to not empty, it contains the

Mercurial > dnsbl

comparison src/dnsbl.cpp @ 242:d8ee4c97b9ab stable-6-0-26