diff src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java @ 463:5bef0f09f088

create NetworkAddress class
author mir3636
date Wed, 06 Jul 2016 18:12:33 +0900
parents b5459c7c8e4d
children f7210f834403
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java	Mon Jul 04 20:19:31 2016 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java	Wed Jul 06 18:12:33 2016 +0900
@@ -30,23 +30,22 @@
     	for (Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements();) {
     		NetworkInterface ni = e.nextElement();
     		if (ni.isUp() && ni.supportsMulticast() && !ni.isLoopback()) {
-    			for (InterfaceAddress ipaddress : ni.getInterfaceAddresses()) {
-    				byte [] netmask = getNetMask(ipaddress);
+                TreeManagement treeManager = new TreeManagement(ni.getDisplayName(), ConnectionParams.DEFAULT_VNC_ROOT, myRfb.getViewer().getShowTree(),treeId++);
+                addNetworkInterface(ni, treeManager);  // it looks like only last address is used
+                for (InterfaceAddress ipaddress : ni.getInterfaceAddresses()) {
+                    byte [] netmask = getNetMask(ipaddress);
                     String hostName = ipaddress.getAddress().toString();
                     if (useHostName) {
                         hostName = ipaddress.getAddress().getHostName();
                     }
-                    TreeManagement treeManager = new TreeManagement(hostName, ConnectionParams.DEFAULT_VNC_ROOT, myRfb.getViewer().getShowTree(),treeId);
-    				treeManager.getList().getFirst().setPort(myRfb.getAcceptPort());
+                    treeManager.getList().getFirst().setPort(myRfb.getAcceptPort());
     				byte[] netaddr = ipaddress.getAddress().getAddress();
     				for(int i=0;i<netaddr.length;i++) {
     					netaddr[i] &= netmask[i];
     				}
-    				treeManager.setNetMask(netmask,netaddr);
-    				addNetworkInterface(ni, treeManager);  // it looks like only last address is used
-    				System.out.println("Interfaces :" + ni.getName() + " treeId=" + treeId + " " + hostName);
+    				treeManager.setNetMask(netmask,netaddr,ipaddress.getAddress());
+                    System.out.println("Interfaces :" + ni.getName() + " treeId=" + treeId + " " + hostName);
     			}
-				treeId++;
     		}
         }
     }