# HG changeset patch
# User one
# Date 1343724089 -32400
# Node ID 280de47f460d589d19fec8e64d4cb1e97e0b7568
# Parent  48d458bb921a62039946b6df8fcd4523a72c8dfd
port option

diff -r 48d458bb921a -r 280de47f460d src/wifibroadcast/WifiBroadcastTest.java
--- a/src/wifibroadcast/WifiBroadcastTest.java	Tue Jul 31 17:31:08 2012 +0900
+++ b/src/wifibroadcast/WifiBroadcastTest.java	Tue Jul 31 17:41:29 2012 +0900
@@ -24,6 +24,8 @@
     private boolean tcp;
     private String nis = "en1";
     private boolean selectMode = false;
+    private int portIndex = 0;
+    private int addressIndex = 0;
 
     public WifiBroadcastTest() {
         ports.add(0,DefaultPort);
@@ -153,27 +155,32 @@
 	}
 
 	public String getOptString(String[] args, String str, int i) {
-		if (i<args.length) { str = args[i]; }
-		return str;
+	    if (i<args.length) { str = args[i]; }
+	    return str;
 	}
 
-    private void setAddress(String[] args, int i) {
-        String adr = getOptString(args,addresses.get(0),i);
-        int p;
-        if ((p=adr.indexOf(":"))>0) {
-            String sp = adr.substring(p+1);
-            adr = adr.substring(0,p-1);
-            if (ports.size()>i) ports.remove(i);
-            ports.add(i,Integer.parseInt(sp));
-        }
-        if (addresses.size()>i) addresses.remove(i);
-        addresses.add(i,adr);
-    }
+	private void setAddress(String[] args, int i) {
+	    String adr = getOptString(args,addresses.get(0),i);
+	    int p;
+	    if ((p=adr.indexOf(":"))>0) {
+	        String sp = adr.substring(p+1);
+	        adr = adr.substring(0,p-1);
+	        portIndex = addressIndex;
+	        if (ports.size()>portIndex) ports.remove(portIndex);
+	        ports.add(portIndex,Integer.parseInt(sp));
+	        portIndex ++; 
+	    }
+	    if (addresses.size()>addressIndex) addresses.remove(addressIndex);
+	    addresses.add(addressIndex,adr);
+	    addressIndex++;
+	}
 
 	private void setPort(String[] args, int i) {
-	       if (ports.size()>i) ports.remove(i);
-	        ports.add(i,Integer.parseInt(args[i]));
-    }
+	    String sport = getOptString(args,"0", i);
+	    if (ports.size()>portIndex) ports.remove(portIndex);
+	    ports.add(portIndex,Integer.parseInt(sport));
+	    portIndex++;
+	}
 
     public Thread sender(final WifiReceiver wbs, final int count) {
         wbs.selectMode(selectMode);