From 384c14b359c9f9f2c86c1149feb9a39af77f6045 Mon Sep 17 00:00:00 2001
From: senft-desktop <senftt@gmail.com>
Date: Thu, 29 Nov 2012 18:23:19 +0100
Subject: [PATCH] Moved addrToBytes to BufferUtil

---
 ws2012/P2P/uebungen/4/src/node/Node.java       | 14 +++-----------
 ws2012/P2P/uebungen/4/src/node/UDPHandler.java |  4 +++-
 ws2012/P2P/uebungen/4/src/util/BufferUtil.java | 10 ++++++++++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ws2012/P2P/uebungen/4/src/node/Node.java b/ws2012/P2P/uebungen/4/src/node/Node.java
index f0fc3cf7..ba11799a 100644
--- a/ws2012/P2P/uebungen/4/src/node/Node.java
+++ b/ws2012/P2P/uebungen/4/src/node/Node.java
@@ -115,7 +115,7 @@ public class Node {
 		buffer.put(MessageType.NEW_NEIGHBOR);
 		buffer.putInt(ack.getId());
 
-        byte[] addr = addrToBytes((InetSocketAddress) neighbor);
+        byte[] addr = BufferUtil.addrToBytes((InetSocketAddress) neighbor);
         buffer.put(addr);
 		buffer.flip();
 
@@ -205,7 +205,8 @@ public class Node {
     public void gatherInformationOfNetwork() {
         byte[] myAddr;
         try {
-            myAddr = addrToBytes(((InetSocketAddress) channel.getLocalAddress()));
+            myAddr = BufferUtil.addrToBytes(((InetSocketAddress) channel
+                    .getLocalAddress()));
             sendBroadcast(MessageType.STATUS, myAddr);
         } catch (IOException e) {
             // TODO Auto-generated catch block
@@ -295,15 +296,6 @@ public class Node {
 		return false;
 	}
 
-    byte[] addrToBytes(InetSocketAddress addr) {
-        ByteBuffer buffer = ByteBuffer.allocate(8);
-        for (String part : addr.getHostString().split("\\.")) {
-            buffer.put(Byte.valueOf(part));
-        }
-        buffer.putInt(addr.getPort());
-        return buffer.array();
-    }
-
 	public int getNeighborId(SocketAddress addr) {
 		for (int i = 0; i < neighbors.size(); i++) {
 			if (neighbors.get(i).toString().equals(addr.toString())) {
diff --git a/ws2012/P2P/uebungen/4/src/node/UDPHandler.java b/ws2012/P2P/uebungen/4/src/node/UDPHandler.java
index 0da1cb9a..dfec8155 100644
--- a/ws2012/P2P/uebungen/4/src/node/UDPHandler.java
+++ b/ws2012/P2P/uebungen/4/src/node/UDPHandler.java
@@ -9,6 +9,8 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import util.BufferUtil;
+
 public class UDPHandler implements Runnable {
     private final static Logger LOGGER = Logger.getLogger(Node.class.getName());
 
@@ -87,7 +89,7 @@ public class UDPHandler implements Runnable {
 
                 // Broadcast to my neighbors
                 node.sendBroadcast(packet_id, command,
-                        node.addrToBytes(originalSender));
+                        BufferUtil.addrToBytes(originalSender));
 
                 LOGGER.log(
                         Level.INFO,
diff --git a/ws2012/P2P/uebungen/4/src/util/BufferUtil.java b/ws2012/P2P/uebungen/4/src/util/BufferUtil.java
index 8a866fe2..182ce91a 100644
--- a/ws2012/P2P/uebungen/4/src/util/BufferUtil.java
+++ b/ws2012/P2P/uebungen/4/src/util/BufferUtil.java
@@ -1,5 +1,6 @@
 package util;
 
+import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 
 public class BufferUtil {
@@ -15,4 +16,13 @@ public class BufferUtil {
 		clone.flip();
 		return clone;
 	}
+
+    public static byte[] addrToBytes(InetSocketAddress addr) {
+        ByteBuffer buffer = ByteBuffer.allocate(8);
+        for (String part : addr.getHostString().split("\\.")) {
+            buffer.put(Byte.valueOf(part));
+        }
+        buffer.putInt(addr.getPort());
+        return buffer.array();
+    }
 }