From 0075ae54c600e9abb587467303ab4524ea8ef9b5 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sat, 11 Feb 2012 01:09:54 +0100
Subject: [PATCH] appliance_setup: use packet class in 8888 detection
---
appliance_setup/device_types.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/appliance_setup/device_types.py b/appliance_setup/device_types.py
index ba23748..162cbf9 100755
--- a/appliance_setup/device_types.py
+++ b/appliance_setup/device_types.py
@@ -287,9 +287,10 @@ class Ether8888DeviceFactory (DeviceFactory):
s = socket.socket(socket.AF_PACKET, socket.SOCK_RAW, self.proto)
s.bind((i,self.proto))
ifName,ifProto,pktType,hwType,hwAddr = s.getsockname()
- txFrame = struct.pack("!6s6sH",bcAddr,hwAddr,self.proto) + "\x00"*0x10
+ packet = Ether8888Packet (localAddr = hwAddr, remoteAddr = bcAddr)
+ request = packet.encode ("\0\0", "\0\0", 0, 0, "\0"*0x10)
# Send and wait for response
- s.send (txFrame)
+ s.send (request)
sockets.append (s)
found = True
--
GitLab