Merge pull request #3 from jblezoray/master

The famous changes we talk some time ago.

build.xml

@@ -0,0 +1,59 @@
+<project name="ShairPort" default="dist" basedir=".">
+
+	<property name="src" location="src" />
+	<property name="lib" location="libs" />
+	<property name="bin" location="bin" />
+	<property name="dist" location="Binaries" />
+	<property name="dist_lib" location="${dist}/Rplay_lib" />
+	<property name="dist_jar" location="${dist}/Rplay.jar" />
+
+	<path id="lib_cp">
+    	<fileset dir="${lib}">
+    		<include name="**/*.jar"/>
+    	</fileset>
+	</path>
+
+	<target name="build">
+		<mkdir dir="${bin}"/>
+		<javac srcdir="${src}" destdir="${bin}"
+				classpathref="lib_cp" includeantruntime="false"
+		 		verbose="true" debug="true" 
+				source="1.6" target="1.6" />
+	</target>
+
+	<target name="dist" depends="build">
+		<mkdir dir="${dist}"/>
+		<manifestclasspath property="jar_cp" jarfile="${dist_jar}">
+			<classpath>
+  				<fileset dir="${dist_lib}">
+  					<include name="**/*.jar"/>
+   				</fileset>	
+			</classpath>
+		</manifestclasspath>
+		<jar destfile="${dist_jar}">
+			<fileset dir="${bin}"/>
+			<manifest>
+				<attribute name="Main-Class" value="Rplay"/>
+				<attribute name="Class-Path" value="${jar_cp}" />
+			</manifest>
+		</jar>
+
+		<mkdir dir="${dist_lib}"/>
+		<copy todir="${dist_lib}" flatten="true">
+			<path refid="lib_cp" />
+		</copy>
+	</target>
+
+	<target name="run">
+		<!--
+		<java fork="true" classname="RPlayNoGui">
+			<classpath path="${dist_jar}"/>
+			<arg value="myAirport"/>
+		</java>
+		-->
+		<java fork="true" classname="Rplay">
+			<classpath path="${dist_jar}"/>
+		</java>
+	</target>
+
+</project>

src/LaunchThread.java

@@ -1,19 +1,24 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
+import java.net.ServerSocket;
+import java.net.Socket;
 import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
+import com.apple.dnssd.DNSSDException;
+
 
 /**
  * LaunchThread class which starts services
  * @author bencall
  *
  */
 public class LaunchThread extends Thread{
-	private RTSPResponder repondeur;
-	private BonjourEmitter emetteur;
+	private BonjourEmitter emitter;
 	private String name;
+	private boolean stopThread = false;
 
 	/**
 	 * Constructor
@@ -24,9 +29,7 @@ public LaunchThread(String name){
 		this.name = name;
 	}
 
-
-	public void run(){
-		int port = 5000;
+	private byte[] getHardwareAdress() {
 		byte[] hwAddr = null;
 
 		InetAddress local;
@@ -36,38 +39,70 @@ public void run(){
 			if (ni != null) {
 				hwAddr = ni.getHardwareAddress();
 			}
-		} catch (UnknownHostException e1) {
-			e1.printStackTrace();
+		} catch (UnknownHostException e) {
+			e.printStackTrace();
 		} catch (SocketException e) {
 			e.printStackTrace();
 		}
-
+		return hwAddr;
+	}
+
+
+	private String getStringHardwareAdress(byte[] hwAddr) {
 	    StringBuilder sb = new StringBuilder();
 	    for (byte b : hwAddr) {
 	      sb.append(String.format("%02x", b));
 	    }
+	    return sb.toString();
+	}
+
+
+	public void run(){
+		System.out.println("service started.");
+		int port = 5000;
 
+		ServerSocket servSock = null;
 		try {
-			// DNS Emitter (Bonjour)
-			repondeur = new RTSPResponder(port, hwAddr);
-			emetteur = new BonjourEmitter(name, sb.toString(), repondeur.getPort());
-
-			repondeur.start();
+			// We listen for new connections
+			try {
+				servSock = new ServerSocket(port);
+			} catch (IOException e) {
+				servSock = new ServerSocket();
+			}
 
+			// DNS Emitter (Bonjour)
+			byte[] hwAddr = getHardwareAdress();
+			emitter = new BonjourEmitter(name, getStringHardwareAdress(hwAddr), port);
+
+			servSock.setSoTimeout(1000);
+			while (!stopThread) {
+				try {
+					Socket socket = servSock.accept();
+					System.out.println("got connection from " + socket.toString());
+					new RTSPResponder(hwAddr, socket).start();
+				} catch(SocketTimeoutException e) {
+					// ignore
+				}
+			}
 
-		} catch (Exception e) {
-			// Bonjour error
-			e.printStackTrace();
+		} catch (DNSSDException e) {
+			throw new RuntimeException(e);
+
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+
+		} finally {
+			try {
+				servSock.close(); // will stop all RTSPResponders.
+				emitter.stop(); 
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
 		}
+		System.out.println("service stopped");
 	}
 
 	public synchronized void stopThread(){
-		emetteur.stop();
-
-		try {
-			repondeur.stopThread();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		stopThread = true;
 	}
 }

src/RPlayNoGui.java

@@ -0,0 +1,19 @@
+
+public class RPlayNoGui {
+
+
+	private static final void usage() {
+		System.err.println("Java port of shairport.");
+		System.err.println("usage : ");
+		System.err.println("     java "+RPlayNoGui.class.getCanonicalName()+" <AP_name>");
+	}
+
+	public static void main(String[] args) {
+		if (args.length != 1 && args[1].length()>1) {
+			usage();
+			System.exit(-1);
+		}
+		new LaunchThread(args[0]).start();
+	}
+
+}

src/RTSPPacket.java

@@ -73,7 +73,6 @@ public String getDirectory(){
 	}
 
 	public int getCode(){
-
 		return 200;
 	}
 
@@ -84,4 +83,9 @@ public String valueOfHeader(String headerName){
 		}
 		return headerContent.elementAt(i);
 	}
+
+	@Override
+	public String toString() {
+		return " < " + rawPacket.replaceAll("\r\n", "\r\n < ");
+	}
 }