From 5f623f898a5a19b1b9d0eb63e7fa53abea58b54d Mon Sep 17 00:00:00 2001
From: Wael <waels@uw.edu>
Date: Sun, 13 Jan 2013 19:50:16 +0000
Subject: [PATCH] From: Wael, these are the files from the homework and the
 lab.

I get an error from the server although, it returnes the right answers.
---
 assignments/week01/athome/client.py   | 10 ++++++++++
 assignments/week01/athome/server.py   | 15 +++++++++++++++
 assignments/week01/lab/echo_client.py |  9 +++++----
 assignments/week01/lab/echo_server.py |  8 +++++++-
 4 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 assignments/week01/athome/client.py
 create mode 100644 assignments/week01/athome/server.py

diff --git a/assignments/week01/athome/client.py b/assignments/week01/athome/client.py
new file mode 100644
index 00000000..c9f93bf3
--- /dev/null
+++ b/assignments/week01/athome/client.py
@@ -0,0 +1,10 @@
+import socket
+
+client = socket.socket()
+client.connect(('localhost', 6060))
+
+client.sendall('5,5')
+data = client.recv(4096)
+print data
+
+client.close()
diff --git a/assignments/week01/athome/server.py b/assignments/week01/athome/server.py
new file mode 100644
index 00000000..a03b3d5f
--- /dev/null
+++ b/assignments/week01/athome/server.py
@@ -0,0 +1,15 @@
+#!/bin/env python
+import socket
+import re
+server = socket.socket()
+server.bind(('localhost', 6060))
+server.listen(2)
+
+while True:
+	conn, addr = server.accept()
+	try:
+		a,b = re.split(',',conn.recv(4096))
+		sum = int(a) + int(b)
+		conn.sendall(str(sum))
+	finally:
+		server.close()
diff --git a/assignments/week01/lab/echo_client.py b/assignments/week01/lab/echo_client.py
index b8898436..58d162f2 100644
--- a/assignments/week01/lab/echo_client.py
+++ b/assignments/week01/lab/echo_client.py
@@ -2,15 +2,16 @@
 import sys
 
 # Create a TCP/IP socket
-
+client = socket.socket()
 # Connect the socket to the port where the server is listening
 server_address = ('localhost', 50000)
-
+client.connect((server_address))
 try:
     # Send data
     message = 'This is the message.  It will be repeated.'
-
+    client.sendall(message)
     # print the response
-
+    print client.recv(4096)
 finally:
     # close the socket to clean up
+    client.close()
diff --git a/assignments/week01/lab/echo_server.py b/assignments/week01/lab/echo_server.py
index e2c52fc6..d276aa6e 100644
--- a/assignments/week01/lab/echo_server.py
+++ b/assignments/week01/lab/echo_server.py
@@ -2,18 +2,24 @@
 import sys
 
 # Create a TCP/IP socket
-
+server = socket.socket()
 # Bind the socket to the port
 server_address = ('localhost', 50000)
 
+server.bind((server_address))
 # Listen for incoming connections
+server.listen(5)
 
 while True:
     # Wait for a connection
+    conn, addr = server.accept()
 
     try:
         # Receive the data and send it back
+	msg = conn.recv(4906)
+	conn.sendall(msg)
         
 
     finally:
         # Clean up the connection
+	server.close()