noel 2004/04/12 18:39:44
Modified: src/java/org/apache/james/dnsserver Tag: branch_2_1_fcs
DNSServer.java
src/java/org/apache/james/fetchmail Tag: branch_2_1_fcs
MessageProcessor.java
src/java/org/apache/james/transport/mailets Tag:
branch_2_1_fcs RemoteDelivery.java
src/java/org/apache/james/transport/matchers Tag:
branch_2_1_fcs InSpammerBlacklist.java
src/java/org/apache/james/util Tag: branch_2_1_fcs
NetMatcher.java
Log:
InetAddress caches without regarding to DNS TTL. Switch to using dnsjava
Address.get[All]ByName. Eventually we should look at using JNDI for DNS services, at
least in the Mailet API.
Revision Changes Path
No revision
No revision
1.9.4.16 +2 -2 james-server/src/java/org/apache/james/dnsserver/DNSServer.java
Index: DNSServer.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/dnsserver/DNSServer.java,v
retrieving revision 1.9.4.15
retrieving revision 1.9.4.16
diff -u -r1.9.4.15 -r1.9.4.16
--- DNSServer.java 7 Apr 2004 18:34:11 -0000 1.9.4.15
+++ DNSServer.java 13 Apr 2004 01:39:44 -0000 1.9.4.16
@@ -207,7 +207,7 @@
.append(".");
getLogger().info(logBuffer.toString());
try {
- InetAddress.getByName(hostname);
+ org.xbill.DNS.Address.getByName(hostname);
servers.add(hostname);
} catch (UnknownHostException uhe) {
// The original domain name is not a valid host,
@@ -384,7 +384,7 @@
final String nextHostname = (String)mxHosts.next();
InetAddress[] addrs = null;
try {
- addrs = InetAddress.getAllByName(nextHostname);
+ addrs = org.xbill.DNS.Address.getAllByName(nextHostname);
} catch (UnknownHostException uhe) {
// this should never happen, since we just got
// this host from mxHosts, which should have
No revision
No revision
1.1.2.8 +3 -3
james-server/src/java/org/apache/james/fetchmail/MessageProcessor.java
Index: MessageProcessor.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/fetchmail/MessageProcessor.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- MessageProcessor.java 15 Feb 2004 14:36:08 -0000 1.1.2.7
+++ MessageProcessor.java 13 Apr 2004 01:39:44 -0000 1.1.2.8
@@ -1356,7 +1356,7 @@
hostNameEnd = domain.length();
address = domain.substring(0, hostNameEnd);
}
- validatedAddress = InetAddress.getByName(address).getHostAddress();
+ validatedAddress =
org.xbill.DNS.Address.getByName(address).getHostAddress();
return validatedAddress;
}
@@ -1374,8 +1374,8 @@
// These shenanigans are required to get the fully qualified
// hostname prior to JDK 1.4 in which get getCanonicalHostName()
// does the job for us
- InetAddress addr1 = InetAddress.getByName(getRemoteAddress());
- InetAddress addr2 = addr1.getByName(addr1.getHostAddress());
+ InetAddress addr1 = org.xbill.DNS.Address.getByName(getRemoteAddress());
+ InetAddress addr2 = org.xbill.DNS.Address.getByName(addr1.getHostAddress());
return addr2.getHostName();
}
No revision
No revision
1.33.4.20 +2 -2
james-server/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
Index: RemoteDelivery.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/transport/mailets/RemoteDelivery.java,v
retrieving revision 1.33.4.19
retrieving revision 1.33.4.20
diff -u -r1.33.4.19 -r1.33.4.20
--- RemoteDelivery.java 26 Mar 2004 04:44:36 -0000 1.33.4.19
+++ RemoteDelivery.java 13 Apr 2004 01:39:44 -0000 1.33.4.20
@@ -1112,7 +1112,7 @@
final String nextGateway = server;
final String nextGatewayPort = port;
try {
- final InetAddress[] ips =
InetAddress.getAllByName(nextGateway);
+ final InetAddress[] ips =
org.xbill.DNS.Address.getAllByName(nextGateway);
addresses = new Iterator() {
private InetAddress[] ipAddresses = ips;
int i = 0;
No revision
No revision
1.3.4.4 +1 -1
james-server/src/java/org/apache/james/transport/matchers/InSpammerBlacklist.java
Index: InSpammerBlacklist.java
===================================================================
RCS file:
/home/cvs/james-server/src/java/org/apache/james/transport/matchers/InSpammerBlacklist.java,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- InSpammerBlacklist.java 15 Mar 2004 03:54:21 -0000 1.3.4.3
+++ InSpammerBlacklist.java 13 Apr 2004 01:39:44 -0000 1.3.4.4
@@ -63,7 +63,7 @@
sb.append(network);
//Try to look it up
- InetAddress.getByName(sb.toString());
+ org.xbill.DNS.Address.getByName(sb.toString());
//If we got here, that's bad... it means the host
// was found in the blacklist
No revision
No revision
1.1.2.8 +4 -4 james-server/src/java/org/apache/james/util/NetMatcher.java
Index: NetMatcher.java
===================================================================
RCS file: /home/cvs/james-server/src/java/org/apache/james/util/NetMatcher.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- NetMatcher.java 15 Mar 2004 03:54:22 -0000 1.1.2.7
+++ NetMatcher.java 13 Apr 2004 01:39:44 -0000 1.1.2.8
@@ -62,7 +62,7 @@
try
{
- ip = InetAddress.getByName(hostIP);
+ ip = org.xbill.DNS.Address.getByName(hostIP);
}
catch (java.net.UnknownHostException uhe)
{
@@ -130,7 +130,7 @@
public boolean contains(final String name) throws java.net.UnknownHostException
{
- return network.equals(maskIP(InetAddress.getByName(name), netmask));
+ return network.equals(maskIP(org.xbill.DNS.Address.getByName(name),
netmask));
}
public boolean contains(final InetAddress ip)
@@ -164,8 +164,8 @@
else if (netspec.indexOf('.', iSlash) == -1) netspec =
normalizeFromCIDR(netspec);
}
- return new InetNetwork(InetAddress.getByName(netspec.substring(0,
netspec.indexOf('/'))),
-
InetAddress.getByName(netspec.substring(netspec.indexOf('/') + 1)));
+ return new InetNetwork(org.xbill.DNS.Address.getByName(netspec.substring(0,
netspec.indexOf('/'))),
+
org.xbill.DNS.Address.getByName(netspec.substring(netspec.indexOf('/') + 1)));
}
public static InetAddress maskIP(final byte[] ip, final byte[] mask)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
