From dd3204530ff883c3108f06cd7ba0d3228d124a71 Mon Sep 17 00:00:00 2001
From: josh <josh@45c1a28c-8058-47b2-ae61-ca45b979098e>
Date: Sat, 8 Mar 2008 23:01:19 +0000
Subject: [PATCH] implemented SPED method for Server, beginning to send data
 from Client

git-svn-id: svn://anubis/gvsu@41 45c1a28c-8058-47b2-ae61-ca45b979098e
---
 cs654/proj1/KaZaClient.java |  6 +++++-
 cs654/proj1/KaZaServer.java | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cs654/proj1/KaZaClient.java b/cs654/proj1/KaZaClient.java
index 20d0f95..687db05 100644
--- a/cs654/proj1/KaZaClient.java
+++ b/cs654/proj1/KaZaClient.java
@@ -18,11 +18,15 @@ public class KaZaClient
 
         try {
             m_socket = new Socket(server, KaZaServer.LISTEN_PORT);
+            DataOutputStream os = new DataOutputStream(
+                                      m_socket.getOutputStream());
+            os.writeBytes("HELO " + userName + "\n");
+            os.writeBytes("SPED " + kbps + "\n");
+            // TODO: publish file list
         } catch (Exception e) {
             return;
         }
 
-        // TODO: publish our name and file list
         Thread fsThread = new Thread(new FileServer(LISTEN_PORT, m_sharedFolder));
         m_connected = true;
     }
diff --git a/cs654/proj1/KaZaServer.java b/cs654/proj1/KaZaServer.java
index 5429a90..f1bf9db 100644
--- a/cs654/proj1/KaZaServer.java
+++ b/cs654/proj1/KaZaServer.java
@@ -43,7 +43,7 @@ public class KaZaServer implements Runnable
         {
             s = new Socket(peerName, LISTEN_PORT);
             DataOutputStream os = new DataOutputStream(s.getOutputStream());
-            os.writeBytes("USER KaZaServer\n");
+            os.writeBytes("HELO KaZaServer\n");
         }
         catch (Exception e)
         {
@@ -72,6 +72,7 @@ public class KaZaServer implements Runnable
     private class ClientInfo
     {
         String userName = "Anonymous";
+        int speed = 1500;
         HashMap<String, String> files = new HashMap<String, String>();
     }
 
@@ -125,6 +126,18 @@ public class KaZaServer implements Runnable
                             m_clientInfo.userName = inLine.substring(5);
                         }
                     }
+                    else if (opCode.equals("SPED"))
+                    {
+                        /* user is telling us their connection speed */
+                        if (tokens.hasMoreTokens())
+                        {
+                            int speed = Integer.parseInt(tokens.nextToken());
+                            synchronized (m_clientData)
+                            {
+                                m_clientInfo.speed = speed;
+                            }
+                        }
+                    }
                     else if (opCode.equals("DESC"))
                     {
                         /* user is giving us a description of a file */