Browse Source

fixed an issue with the port usage

Daniel Lazar 9 years ago
parent
commit
4f5995f3a2

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

@@ -151,7 +151,8 @@ public class SMB implements Protocol {
             smbPacket.prepareNextResponse(lastMessage);
         }
         else{
-            smbPacket.prepareNextResponse(NBDSType.LOCAL_MASTER_ANNOUNCEMENT_ALL);
+            //something needs to be done, if there is no message
+            smbPacket.prepareNextResponse(0);
         }
 		byte smbCommand = smbPacket.getSmbCommand();
 		byte[] response;

+ 7 - 7
src/de/tudarmstadt/informatik/hostage/protocol/smbutils/NMB.java

@@ -24,10 +24,10 @@ public class NMB extends Thread {
 	private String ip;
 	private String[] ipParts;
 	private InetAddress dst;
-	private final int nbnsPort = 137;
-	private final int nbdsPort = 138;
-    private final int nbnsRedirPort = 34897;
-    private final int nbdsRedirPort = 34897;
+	private final int nbnsOriginPort = 137;
+	private final int nbdsOriginPort = 138;
+    private final int nbnsPort = 34897;
+    private final int nbdsPort = 34898;
 	private String username;
 	private String workgroup;
 	private NBNS nbns;
@@ -233,8 +233,8 @@ public class NMB extends Thread {
 			nbdsSocket = factory.createDatagramSocket(nbdsPort);
 
             // port forwarding
-            HelperUtils.redirectPort(nbnsPort, nbnsRedirPort);
-            HelperUtils.redirectPort(nbdsPort, nbdsRedirPort);
+            HelperUtils.redirectPort(nbnsOriginPort, nbnsPort);
+            HelperUtils.redirectPort(nbdsOriginPort, nbdsPort);
 
 		} catch (SocketException e) {
 			e.printStackTrace();
@@ -280,7 +280,7 @@ public class NMB extends Thread {
 		
 		announceHost();	
 		
-//		talk();
+		talk();
 		
 		nbnsSocket.close();
 		nbdsSocket.close();