Skip to content
Permalink
Browse files

removed remoteHostName from HTTPSession: it can take too long time to…

… figure out via DNS
  • Loading branch information...
hyunik.na
hyunik.na committed Jul 2, 2019
1 parent b04a342 commit cd37235110d6712204c77e2bdc463e84af6ed4e3
@@ -72,7 +72,7 @@
import org.nanohttpd.protocols.http.tempfiles.ITempFileManager;

public class HTTPSession implements IHTTPSession {

public static final String POST_DATA = "postData";

private static final int REQUEST_BUFFER_LEN = 512;
@@ -109,8 +109,6 @@

private String remoteIp;

private String remoteHostname;

private String protocolVersion;

public HTTPSession(NanoHTTPD httpd, ITempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) {
@@ -126,7 +124,6 @@ public HTTPSession(NanoHTTPD httpd, ITempFileManager tempFileManager, InputStrea
this.inputStream = new BufferedInputStream(inputStream, HTTPSession.BUFSIZE);
this.outputStream = outputStream;
this.remoteIp = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "127.0.0.1" : inetAddress.getHostAddress().toString();
this.remoteHostname = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "localhost" : inetAddress.getHostName().toString();
this.headers = new HashMap<String, String>();
}

@@ -698,9 +695,4 @@ private String saveTmpFile(ByteBuffer b, int offset, int len, String filename_hi
public String getRemoteIpAddress() {
return this.remoteIp;
}

@Override
public String getRemoteHostName() {
return this.remoteHostname;
}
}
@@ -90,11 +90,4 @@
* @return the IP address.
*/
String getRemoteIpAddress();

/**
* Get the remote hostname of the requester.
*
* @return the hostname.
*/
String getRemoteHostName();
}
@@ -60,7 +60,6 @@ public void testHeadersRemoteIp() throws Exception {
for (String ipAddress : ipAddresses) {
InetAddress inetAddress = InetAddress.getByName(ipAddress);
HTTPSession session = this.testServer.createSession(HttpSessionHeadersTest.TEST_TEMP_FILE_MANAGER, inputStream, outputStream, inetAddress);
assertNotNull(ipAddress, session.getRemoteHostName());
assertEquals(ipAddress, session.getRemoteIpAddress());
}
}
@@ -49,24 +49,6 @@

private static final TestTempFileManager TEST_TEMP_FILE_MANAGER = new TestTempFileManager();

@Test
public void testSessionRemoteHostnameLocalhost() throws UnknownHostException {
ByteArrayInputStream inputStream = new ByteArrayInputStream(HttpSessionTest.DUMMY_REQUEST_CONTENT.getBytes());
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
InetAddress inetAddress = InetAddress.getByName("127.0.0.1");
HTTPSession session = this.testServer.createSession(HttpSessionTest.TEST_TEMP_FILE_MANAGER, inputStream, outputStream, inetAddress);
assertEquals("localhost", session.getRemoteHostName());
}

@Test
public void testSessionRemoteHostname() throws UnknownHostException {
ByteArrayInputStream inputStream = new ByteArrayInputStream(HttpSessionTest.DUMMY_REQUEST_CONTENT.getBytes());
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
InetAddress inetAddress = InetAddress.getByName("google.com");
HTTPSession session = this.testServer.createSession(HttpSessionTest.TEST_TEMP_FILE_MANAGER, inputStream, outputStream, inetAddress);
assertEquals("google.com", session.getRemoteHostName());
}

@Test
public void testSessionRemoteIPAddress() throws UnknownHostException {
ByteArrayInputStream inputStream = new ByteArrayInputStream(HttpSessionTest.DUMMY_REQUEST_CONTENT.getBytes());

0 comments on commit cd37235

Please sign in to comment.
You can’t perform that action at this time.