From 3309bc3eb8747489c212111d1c9a3cd066fc7cf6 Mon Sep 17 00:00:00 2001
From: Tommy Olofsson <tommy.olofsson.90@gmail.com>
Date: Sun, 19 Jun 2016 23:56:21 +0200
Subject: [PATCH] Print when sending as well.
---
simulator/extctrl2014.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/simulator/extctrl2014.py b/simulator/extctrl2014.py
index 23782c1..c852fa0 100644
--- a/simulator/extctrl2014.py
+++ b/simulator/extctrl2014.py
@@ -378,6 +378,11 @@ class ExtCtrl(object):
while self.cookie == None:
self.cond.wait(1)
+ def send(self, data):
+ if self.packetdebug:
+ print "Sending", Packet(data)
+ self.ethernet.send(data)
+
def send_INIT(self):
flags = kind_INIT | flag_NEED_ACK
fragmenter = Fragmenter(destination=self.other,
@@ -387,7 +392,7 @@ class ExtCtrl(object):
index=self.local_index)
for i in self.retries(self.local_index):
for f in fragmenter.fragments(max_length=self.max_length):
- self.ethernet.send(f.getvalue())
+ self.send(f.getvalue())
self.next_index()
def send_INIT_ACK(self):
@@ -399,7 +404,7 @@ class ExtCtrl(object):
index=self.remote_index)
fragmenter.encode_uint32(self.local_index)
for f in fragmenter.fragments(max_length=self.max_length):
- self.ethernet.send(f.getvalue())
+ self.send(f.getvalue())
def send_ACK(self, packet):
flags = packet.kind | flag_IS_ACK
@@ -409,7 +414,7 @@ class ExtCtrl(object):
cookie=packet.cookie,
index=packet.index)
for f in fragmenter.fragments(max_length=self.max_length):
- self.ethernet.send(f.getvalue())
+ self.send(f.getvalue())
def send_DATA_with_ack(self, data):
flags = kind_DATA | flag_NEED_ACK
@@ -421,7 +426,7 @@ class ExtCtrl(object):
fragmenter.write(data)
for i in self.retries(self.local_index):
for f in fragmenter.fragments(max_length=self.max_length):
- self.ethernet.send(f.getvalue())
+ self.send(f.getvalue())
self.next_index()
def send_DATA(self, data):
@@ -433,7 +438,7 @@ class ExtCtrl(object):
index=self.local_index)
fragmenter.write(data)
for f in fragmenter.fragments(max_length=self.max_length):
- self.ethernet.send(f.getvalue())
+ self.send(f.getvalue())
self.next_index()
def writer(self):
--
GitLab