From 636a82c80b187eb00f3c5e1fc5a955fee762a418 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Wed, 23 May 2012 10:00:33 +0200 Subject: [PATCH] EchoHandler and control channel handling --- distribution-server/dist-daemon | 12 ++++++++---- node/node-daemon | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/distribution-server/dist-daemon b/distribution-server/dist-daemon index d222bd9..cd81922 100755 --- a/distribution-server/dist-daemon +++ b/distribution-server/dist-daemon @@ -31,7 +31,7 @@ class Client: def __init__(self, connstream): self.stream = connstream - self.channel_map[0] = Channel() + self.channel_map[0] = Channel(EchoHandler()) def process_data(self, data): self.buff += data @@ -49,9 +49,9 @@ class Client: channel_numeric = to_numeric(channel_identifier) if channel_numeric in self.channel_map: - print "Received data on channel %d: %s" % (channel_numeric, data) + self.channel_map[channel_numeric].process_chunk(data) else: - print "Received data on NON-EXISTENT channel %d" % channel_numeric + print "WARNING: Received data on non-existent channel %d" % channel_numeric class Channel: numeric = 0 @@ -66,8 +66,12 @@ class Channel: self.handler.process(chunk) class Handler: - def process(chunk): + def process(self, chunk): pass + +class EchoHandler(Handler): + def process(self, chunk): + print "Received %s" % chunk bindsocket = socket.socket() bindsocket.bind(('0.0.0.0', 9151)) diff --git a/node/node-daemon b/node/node-daemon index 9da0871..9351c5e 100755 --- a/node/node-daemon +++ b/node/node-daemon @@ -22,6 +22,6 @@ s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) ssl_sock = ssl.wrap_socket(s, cert_reqs=ssl.CERT_REQUIRED, ca_certs=allowed_certs) ssl_sock.connect(('localhost', 9151)) -ssl_sock.write(to_identifier(3) + 'test data' + EOC + to_identifier(4190) + 'SAMPLEDATA' + EOC) +ssl_sock.write(to_identifier(0) + 'test data' + EOC + to_identifier(4190) + 'SAMPLEDATA' + EOC) ssl_sock.close()