Skip to content
Snippets Groups Projects
Commit eab8f20a authored by Ethan Robert's avatar Ethan Robert
Browse files

Changed teacher version in order to adapt to the API

parent 4ec77e4d
No related branches found
No related tags found
No related merge requests found
import socket import requests
from time import sleep from time import sleep
MASK = 22 MASK = 22
...@@ -14,22 +14,10 @@ RANGES = { ...@@ -14,22 +14,10 @@ RANGES = {
('HEVÉA', '4A20'): ['172.18.49.80', '172.18.49.107'], ('HEVÉA', '4A20'): ['172.18.49.80', '172.18.49.107'],
('IF', '4A39-4A41'): ['172.18.49.109', '172.18.49.123'], ('IF', '4A39-4A41'): ['172.18.49.109', '172.18.49.123'],
('SEQUOÏA', '4A43'): ['172.18.49.125', '172.18.49.132'], ('SEQUOÏA', '4A43'): ['172.18.49.125', '172.18.49.132'],
('SAULE', '4A24'): ['172.18.49.133', '172.18.49.159'] ('SAULE', '4A24'): ['172.18.49.133', '172.18.49.159'],
('DEBUG'): ['127.0.0.1', '127.0.0.1']
} }
class Socket:
def __init__(self, address):
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.address = address
def update(self):
self.socket.connect((address, 25566))
message = self.socket.recvfrom(1024).decode("UTF-8")
return message
class ConnectionHandler: class ConnectionHandler:
def __init__(self, room): def __init__(self, room):
...@@ -44,19 +32,35 @@ class ConnectionHandler: ...@@ -44,19 +32,35 @@ class ConnectionHandler:
self.addresses = [row[0][0:10] + str(k) for k in numbers] self.addresses = [row[0][0:10] + str(k) for k in numbers]
print(self.addresses) print(self.addresses)
# Create sockets for all of these addresses # Hold a message list
self.sockets = [Socket(a) for a in self.addresses] self.messages {}
for a in self.addresses:
self.messages[a] = ""
def update(self): def update(self):
for s in self.sockets: changes = {}
print(s.update())
for a in self.addresses:
response = requests.get("http://" + a + ":45566")
message = response.content.decode("utf-8")
if message != self.messages[a]:
changes[a] = messages
return changes
connections = ConnectionHandler(("SEQUOÏA", "4A43")) connections = ConnectionHandler(("DEBUG"))
while True: while True:
connections.update() changes = connections.update()
for c in changes:
print(changes[c])
time.sleep(30) time.sleep(30)
print("----------------------------------------------------")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment