Small NMB changes

.classpath

@@ -6,5 +6,8 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="lib" path="libs/sshlib-v1.1.jar"/>
+	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry kind="lib" path="libs/nineoldandroids-2.4.0.jar"/>
+	<classpathentry kind="lib" path="libs/swipelistview-1.0.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

project.properties

@@ -15,4 +15,4 @@ target=android-19
 android.library=false
 
 
-android.library.reference.1=../google-play-services_lib
+android.library.reference.1=../../development/Android/HosTaGe/google-play-services_lib

src/de/tudarmstadt/informatik/hostage/protocol/SMB.java

@@ -6,9 +6,9 @@ import java.util.List;
 
 import de.tudarmstadt.informatik.hostage.Hostage;
 import de.tudarmstadt.informatik.hostage.R;
-import de.tudarmstadt.informatik.hostage.protocol.SMBUtils.NBNS;
-import de.tudarmstadt.informatik.hostage.protocol.SMBUtils.NMB;
-import de.tudarmstadt.informatik.hostage.protocol.SMBUtils.SMBPacket;
+import de.tudarmstadt.informatik.hostage.protocol.smbutils.NBNS;
+import de.tudarmstadt.informatik.hostage.protocol.smbutils.NMB;
+import de.tudarmstadt.informatik.hostage.protocol.smbutils.SMBPacket;
 import de.tudarmstadt.informatik.hostage.wrapper.Packet;
 
 /**
@@ -55,7 +55,7 @@ public class SMB implements Protocol {
 	}
 	
 	public void setIP(String ip) {
-//		new NMB(ip).start();
+		new NMB(ip, "ABCDEFG", "WORKGROUPA").start();
 	}
 
 	private String[] initServerVersion() {

src/de/tudarmstadt/informatik/hostage/protocol/SMBUtils/NBDS.java → src/de/tudarmstadt/informatik/hostage/protocol/smbutils/NBDS.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.protocol.SMBUtils;
+package de.tudarmstadt.informatik.hostage.protocol.smbutils;
 
 import java.nio.ByteBuffer;
 

src/de/tudarmstadt/informatik/hostage/protocol/SMBUtils/NBNS.java → src/de/tudarmstadt/informatik/hostage/protocol/smbutils/NBNS.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.protocol.SMBUtils;
+package de.tudarmstadt.informatik.hostage.protocol.smbutils;
 
 import java.nio.ByteBuffer;
 

src/de/tudarmstadt/informatik/hostage/protocol/SMBUtils/NMB.java → src/de/tudarmstadt/informatik/hostage/protocol/smbutils/NMB.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.protocol.SMBUtils;
+package de.tudarmstadt.informatik.hostage.protocol.smbutils;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -6,13 +6,10 @@ import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import de.tudarmstadt.informatik.hostage.net.MyDatagramSocketFactory;
+
 public class NMB extends Thread {
 	
-	public static void main(String[] args) {
-		NMB nbns = new NMB("192.168.178.104", "ABCDEFG", "WORKGROUP");
-		nbns.start();
-	}
-	
 	private DatagramSocket nbnsSocket;
 	private DatagramSocket nbdsSocket;
 	private DatagramPacket packet;
@@ -25,16 +22,17 @@ public class NMB extends Thread {
 	private String workgroup;
 	
 	public NMB(String ip, String username, String workgroup) {
-		super();
 		try {
 			this.username = username;
 			this.workgroup = workgroup;
-			nbnsSocket = new DatagramSocket(nbnsPort);
-			nbdsSocket = new DatagramSocket(nbdsPort);
 			this.ip = ip;
 			ipParts = ip.split("\\.");
 			String newHostAddr = ipParts[0] + "." + ipParts[1] + "." + ipParts[2] + ".255";
 			dst = InetAddress.getByName(newHostAddr);
+			nbnsSocket = new MyDatagramSocketFactory().createDatagramSocket(nbnsPort);
+			nbnsSocket.connect(dst, nbnsPort);
+			nbdsSocket = new MyDatagramSocketFactory().createDatagramSocket(nbdsPort);
+			nbnsSocket.connect(dst, nbdsPort);
 		} catch (UnknownHostException e) {
 			e.printStackTrace();
 		} catch (IOException e) {

src/de/tudarmstadt/informatik/hostage/protocol/SMBUtils/NMBStringCoder.java → src/de/tudarmstadt/informatik/hostage/protocol/smbutils/NMBStringCoder.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.protocol.SMBUtils;
+package de.tudarmstadt.informatik.hostage.protocol.smbutils;
 
 import de.tudarmstadt.informatik.hostage.commons.HelperUtils;
 

src/de/tudarmstadt/informatik/hostage/protocol/SMBUtils/SMBPacket.java → src/de/tudarmstadt/informatik/hostage/protocol/smbutils/SMBPacket.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.protocol.SMBUtils;
+package de.tudarmstadt.informatik.hostage.protocol.smbutils;
 
 import java.nio.ByteBuffer;
 import java.util.Calendar;

src/de/tudarmstadt/informatik/hostage/protocol/SMBUtils/Service.java → src/de/tudarmstadt/informatik/hostage/protocol/smbutils/Service.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.protocol.SMBUtils;
+package de.tudarmstadt.informatik.hostage.protocol.smbutils;
 
 public class Service {
 	public static final int SERVER = 0;

src/de/tudarmstadt/informatik/hostage/protocol/SMBUtils/Type.java → src/de/tudarmstadt/informatik/hostage/protocol/smbutils/Type.java

@@ -1,4 +1,4 @@
-package de.tudarmstadt.informatik.hostage.protocol.SMBUtils;
+package de.tudarmstadt.informatik.hostage.protocol.smbutils;
 
 public class Type {
 	public static final int REGISTRATION_UNIQUE = 0;