From: TJ <hacker@iam.tj>
Date: Sun, 3 May 2015 10:48:48 +0000 (+0100)
Subject: NetworkServerUDP: add additional logging
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=WeStealzYourDataz.git;a=commitdiff_plain;h=423aefc27a1cb0fb1e4502d7772b7e6578ce1a0a

NetworkServerUDP: add additional logging
---

diff --git a/src/uk/ac/ntu/n0521366/wsyd/libs/net/NetworkServerUDP.java b/src/uk/ac/ntu/n0521366/wsyd/libs/net/NetworkServerUDP.java
index a40ea55..f3ad6e5 100644
--- a/src/uk/ac/ntu/n0521366/wsyd/libs/net/NetworkServerUDP.java
+++ b/src/uk/ac/ntu/n0521366/wsyd/libs/net/NetworkServerUDP.java
@@ -146,39 +146,12 @@ public class NetworkServerUDP extends NetworkServerAbstract {
             
                 // add or update the last-seen time of the Sender host in the known services map
                 LastSeenHost host = new LastSeenHost((InetSocketAddress)packetReceive.getSocketAddress());
-                this._serviceToHostMap.replace(messageReceived.getSender(), host);
+                this._serviceToHostMap.put(messageReceived.getSender(), host);
+                log(Level.FINEST, _title, MessageFormat.format("Added \"{0}\" to service map", messageReceived.getSender()));
 
-                /* TODO: serverListen() message may be an ACKnowledgement which shouldn't be pubished...
-                 * But it might be useful to keep track of ACKs in a separate queue that the owner thread can query to check
-                 * a message was delivered
-                 */
                 // pass the message to the process() method in the Owner Thread
                 publish(messageReceived);
 
-                // create and send an acknowledgement of receipt
-                NetworkMessage ack = NetworkMessage.createNetworkMessage("ACK", messageReceived.getSender(), null);
-                serverSend(ack);
-
-                // FIXME: serverListen() can this block be deleted now its handled by serverSend() ?
-                /*
-                 try {
-                    byte[] dataAck = NetworkMessage.serialize(ack);
-                    DatagramPacket packetAck = new DatagramPacket(dataAck, dataAck.length);
-
-                    // extract remote host address and port for sending acknowledgement
-                    packetAck.setAddress(packetReceive.getAddress());
-                    packetAck.setPort(packetReceive.getPort());
-
-                    // acknowledge receipt
-                    this.getSocket().send(packetAck);
-
-
-                } catch (IOException e) {
-                    // TODO: serverListen() fill in IOException blank log message
-                    log(Level.WARNING, _title, "", null);
-                }
-                */
-
                 result = true; // successful
             }
 
@@ -198,12 +171,15 @@ public class NetworkServerUDP extends NetworkServerAbstract {
              * Deeper sub-classes must be listed before their super classes
              */
             // TODO: serverListen() add ObjectStreamException handler
+            System.err.println("ObjectStreamException");
 
         } catch (IOException e) {
             // TODO: serverListen() add IOException handler
+            System.err.println("IOException");
 
         } catch (ClassNotFoundException e) {
             // TODO: serverListen() add ClassNotFoundException handler
+            System.err.println("ClassNotFoundException");
         }
 
         return result;
@@ -237,6 +213,15 @@ public class NetworkServerUDP extends NetworkServerAbstract {
 
                         // acknowledge receipt
                         this.getSocket().send(packetSend);
+                        log(Level.FINEST, _title,
+                            MessageFormat.format("Sending packet for {0} to {1} ({3}:{4}) from {2}",
+                                message.getIntent(),
+                                message.getTarget(),
+                                message.getSender(),
+                                packetSend.getAddress().getHostAddress(),
+                                packetSend.getPort()
+                            )
+                        );
 
                         result = true; // successful
                     } catch (IOException e) {