Skip to content

nigel clegg assignment_01 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nclegg wants to merge 2 commits into from
Closed

nigel clegg assignment_01 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d90d17c
updated client and server
nclegg Jan 8, 2014
fb354f8
rm of some TODOs
nclegg Jan 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions assignments/session01/echo_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,30 @@

def client(msg, log_buffer=sys.stderr):
server_address = ('localhost', 10000)
# TODO: Replace the following line with your code which will instantiate
# a TCP socket with IPv4 Addressing, call the socket you make 'sock'
sock = None

sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_IP)

print >>log_buffer, 'connecting to {0} port {1}'.format(*server_address)
# TODO: connect your socket to the server here.
sock.connect(server_address)

# this try/finally block exists purely to allow us to close the socket
# when we are finished with it
try:
print >>log_buffer, 'sending "{0}"'.format(msg)
# TODO: send your message to the server here.

# TODO: the server should be sending you back your message as a series
# of 16-byte chunks. You will want to log them as you receive
# each one. You will also need to check to make sure that
# you have received the entire message you sent __before__
# closing the socket.
#
# Make sure that you log each chunk you receive. Use the print
# statement below to do it. (The tests expect this log format)
chunk = ''
print >>log_buffer, 'received "{0}"'.format(chunk)

sock.sendall(msg)

buffer_size = 16
done = False

while not done:
chunk = sock.recv(buffer_size)
print >>log_buffer, 'received "{0}"'.format(chunk)

# test last bytes received
if len(chunk) < buffer_size:
done = True

finally:
# TODO: after you break out of the loop receiving echoed chunks from
# the server you will want to close your client socket.
sock.close()
print >>log_buffer, 'closing socket'


Expand All @@ -39,4 +38,4 @@ def client(msg, log_buffer=sys.stderr):
sys.exit(1)

msg = sys.argv[1]
client(msg)
client(msg)
60 changes: 20 additions & 40 deletions assignments/session01/echo_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,65 +5,45 @@
def server(log_buffer=sys.stderr):
# set an address for our server
address = ('127.0.0.1', 10000)
# TODO: Replace the following line with your code which will instantiate
# a TCP socket with IPv4 Addressing, call the socket you make 'sock'
sock = None
# TODO: Set an option to allow the socket address to be reused immediately
# see the end of http://docs.python.org/2/library/socket.html

sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_IP)


# allow imediate socket re-use http://docs.python.org/2/library/socket.html
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)

# log that we are building a server
print >>log_buffer, "making a server on {0}:{1}".format(*address)

# TODO: bind your new sock 'sock' to the address above and begin to listen
# for incoming connections
sock.bind(address)
sock.listen(1)

try:
# the outer loop controls the creation of new connection sockets. The
# server will handle each incoming connection one at a time.
while True:
print >>log_buffer, 'waiting for a connection'

# TODO: make a new socket when a client connects, call it 'conn',
# at the same time you should be able to get the address of
# the client so we can report it below. Replace the
# following line with your code. It is only here to prevent
# syntax errors
addr = ('bar', 'baz')
conn, addr = sock.accept()

try:
print >>log_buffer, 'connection - {0}:{1}'.format(*addr)

# the inner loop will receive messages sent by the client in
# buffers. When a complete message has been received, the
# loop will exit
while True:
# TODO: receive 16 bytes of data from the client. Store
# the data you receive as 'data'. Replace the
# following line with your code. It's only here as
# a placeholder to prevent an error in string
# formatting
data = ''
data = conn.recv(16)
print >>log_buffer, 'received "{0}"'.format(data)
# TODO: you will need to check here to see if any data was
# received. If so, send the data you got back to
# the client. If not, exit the inner loop and wait
# for a new connection from a client

if not data:
break
conn.sendall(data)

finally:
# TODO: When the inner loop exits, this 'finally' clause will
# be hit. Use that opportunity to close the socket you
# created above when a client connected. Replace the
# call to `pass` below, which is only there to prevent
# syntax problems
pass
conn.close()
print >>log_buffer, 'closing socket'

except KeyboardInterrupt:
# TODO: Use the python KeyboardIntterupt exception as a signal to
# close the server socket and exit from the server function.
# Replace the call to `pass` below, which is only there to
# prevent syntax problems
pass
sock.close()
print >>log_buffer, 'connection closed'


if __name__ == '__main__':
server()
sys.exit(0)
sys.exit(0)