Changeset 27

Timestamp:

Aug 21, 2012 12:26:43 PM (7 years ago)

Author:

psaiteja

Message:

Working VSN client implementation. It can take in UDP and TCP proxy server port numbers, and forwarding server details as command line arguments. It runs a UDP server to listen to hashlist updates from the server.

File:

• VSNClient/appClientModule/ClientProxy.java (modified) (8 diffs)

VSNClient/appClientModule/ClientProxy.java

@@ -40 +40 @@
                 int fwdUdpPort = 5601;
                 
+                if(args.length >= 1){
+                        port = Integer.parseInt(args[0]);
+                }
+                if(args.length >= 3){
+                        fwdProxyServer = args[1];
+                        fwdProxyPort = Integer.parseInt(args[2]);
+                }
+                if(args.length >= 4){
+                        udpport = Integer.parseInt(args[3]);
+                }
+                if(args.length >= 5){
+                        fwdUdpPort = Integer.parseInt(args[4]);
+                }
+                
                 // create and start the ClientProxy thread, using a 20 second timeout
                 // value to keep the threads from piling up too much
                 System.err.println("  **  Starting ClientProxy on port " + port + ". Press CTRL-C to end.  **\n");
-                ClientProxy jp = new ClientProxy(port, fwdProxyServer, fwdProxyPort, 5);
-                jp.setDebug(1, System.out);             // or set the debug level to 2 for tons of output
-                jp.start();
+                ClientProxy cp = new ClientProxy(port, fwdProxyServer, fwdProxyPort, 5);
+                cp.setDebug(1, System.out);             // or set the debug level to 2 for tons of output
+                cp.start();
                 
-                jp.udpthread = new UDPClientThread(udpport, fwdUdpPort, fwdProxyServer, jp.conn);
-                
+                cp.udpthread = new UDPClientThread(udpport, fwdUdpPort, fwdProxyServer, cp.conn);
+                cp.udpthread.start();
                 
                 // run forever; if you were calling this class from another
@@ -62 +76 @@
                 // if we ever had a condition that stopped the loop above,
                 // we'd want to do this to kill the running thread
-                //jp.closeSocket();
+                //cp.closeSocket();
                 //return;
         }
@@ -176 +190 @@
                                         System.out.println("Table does not exist");
                                         Statement stmt = conn.createStatement();
-                                        stmt.executeUpdate("CREATE TABLE ClientHashlist (UrlHash VARCHAR(36) NOT NULL PRIMARY KEY, ObjectHash VARCHAR(36) NOT NULL, hashTime TIMESTAMP NOT NULL)");
+                                        stmt.executeUpdate("CREATE TABLE ClientHashlist (UrlHash VARCHAR(40) NOT NULL PRIMARY KEY, ObjectHash VARCHAR(40) NOT NULL, hashTime TIMESTAMP NOT NULL)");
                                         Statement stmt2 = conn.createStatement();
                                         stmt2.executeUpdate("CREATE INDEX hashIndex on ClientHashlist(UrlHash ASC)");
@@ -261 +275 @@
         public void informUDPserver()
         {
+                System.out.println("Sending 'Hello' message to VSN Server");
                 String msg = "Hello";
                 try{
-                        DatagramPacket firstpacket  = new DatagramPacket(msg.getBytes(), msg.length(), InetAddress.getByAddress(fwdServer.getBytes()), fwdUdpPort);
+                        DatagramPacket firstpacket  = new DatagramPacket(msg.getBytes(), msg.length(), InetAddress.getByName(fwdServer), fwdUdpPort);
                         UDPClient.send(firstpacket);
                 }
@@ -294 +309 @@
                         try{
                                 UDPClient.receive(receivePacket);
-                                String IPAddress = new String(receivePacket.getAddress().getAddress()); 
+                                String IPAddress = receivePacket.getAddress().getHostAddress(); 
                                 int port = receivePacket.getPort(); 
                                 
@@ -300 +315 @@
                                         String data = new String(receivePacket.getData());
                                         String [] data_array = data.split("\n");
+                                        
                                         for(int i=0;i<data_array.length;i++){
                                                 if(data_array[i].length()>0){
@@ -336 +352 @@
                                                 }
                                         }
+                                        System.out.println("Updated client hashlist by adding/updating "+(data_array.length-1)+" entries");
                                 }
                         }
@@ -475 +492 @@
                                         urldigest.append(Integer.toHexString(0xFF & udigest[i]));
                                 }
-                                
+                                System.out.println(urldigest);
                                         try {           
                                                 Statement stmt2 = conn.createStatement();