This commit is contained in:
Yohann D'ANELLO 2021-01-05 16:03:16 +01:00
parent 5422d12ed1
commit f85b52524a
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
3 changed files with 6 additions and 5 deletions

View File

@ -687,7 +687,7 @@ class Squirrel(Hazelnut):
self.clean_inundation()
# Broadcast a GoAway
gatlv = GoAwayTLV().construct(GoAwayType.EXIT, f"I am leaving! Good bye!")
gatlv = GoAwayTLV().construct(GoAwayType.EXIT, "I am leaving! Good bye!")
pkt = Packet.construct(gatlv)
for hazelnut in self.activehazelnuts.values():
self.send_packet(hazelnut[0], pkt)

View File

@ -219,9 +219,10 @@ class NeighbourTLV(TLV):
self.port.to_bytes(2, sys.byteorder)
def handle(self, squirrel: Any, sender: Any) -> None:
if squirrel.address == str(self.ip_address) and squirrel.port == self.port :
#This case should never happen (and in our protocol it is not possible), but we include this test as a security measure.
return
if squirrel.address == str(self.ip_address) and squirrel.port == self.port:
# This case should never happen (and in our protocol it is not possible),
# but we include this test as a security measure.
return
if not (str(self.ip_address), self.port) in squirrel.activehazelnuts \
and not (str(self.ip_address), self.port) in squirrel.potentialhazelnuts:
squirrel.potentialhazelnuts[(str(self.ip_address), self.port)] = \

View File

@ -5,7 +5,7 @@ import curses
from argparse import ArgumentParser
from typing import Any
from .hazel import Hazelnut, Squirrel, Worm, HazelManager, Inondator
from .hazel import Hazelnut, Squirrel
from .messages import Packet, HelloTLV
from .term_manager import TermManager