Browse Source

don't log empty packets. solves telnet issue

Fabio Arnold 9 years ago
parent
commit
a393b7f3eb

+ 6 - 3
src/de/tudarmstadt/informatik/hostage/Handler.java

@@ -218,7 +218,8 @@ public class Handler implements Runnable {
 		record.setLocalIP(client.getLocalAddress().getHostAddress());
 		record.setLocalPort(client.getLocalPort());
 		int remoteIPAddress = HelperUtils.packInetAddress(client.getInetAddress().getAddress());
-		record.setWasInternalAttack((remoteIPAddress & subnetMask) == (internalIPAddress & subnetMask));
+		record.setWasInternalAttack(
+				(remoteIPAddress & subnetMask) == (internalIPAddress & subnetMask));
 		record.setRemoteIP(client.getInetAddress().getHostAddress());
 		record.setRemotePort(client.getPort());
 		record.setBssid(BSSID);
@@ -248,13 +249,15 @@ public class Handler implements Runnable {
 		return record;
 	}
 	
-	private void log(TYPE type, String packet){
+	private void log(TYPE type, String packet) {
 		if(!logged){
 			Logger.log(Hostage.getContext(), createNetworkRecord());
 			Logger.log(Hostage.getContext(), createAttackRecord());
 			logged = true;
 		}
-		Logger.log(Hostage.getContext(), createMessageRecord(type, packet));
+		if (packet != null && packet.length() > 0) { // prevent logging empty packets
+			Logger.log(Hostage.getContext(), createMessageRecord(type, packet));
+		}
 	}
 
 

+ 1 - 1
src/de/tudarmstadt/informatik/hostage/protocol/TELNET.java

@@ -82,7 +82,7 @@ public class TELNET implements Protocol {
 	@Override
 	public List<Packet> processMessage(Packet requestPacket) {
 		byte[] request = null;
-		if (requestPacket != null) {
+		if (requestPacket != null && requestPacket.getBytes().length > 0) { // ignore empty packets
 			request = requestPacket.getBytes();
 		}
 		List<Packet> responsePackets = new ArrayList<Packet>();