From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Mon, 1 Aug 2011 08:40:15 +0000 (+0200)
Subject: Fix etherStrip bug
X-Git-Tag: nepi-3.0.0~328
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c06454f6f8ea97f0e8dd52704e29dee123f4f56d;p=nepi.git

Fix etherStrip bug
---

diff --git a/src/nepi/util/tunchannel.py b/src/nepi/util/tunchannel.py
index 5c02a9d9..2ec2d115 100644
--- a/src/nepi/util/tunchannel.py
+++ b/src/nepi/util/tunchannel.py
@@ -99,7 +99,7 @@ def pullPacket(buf, ether_mode):
 def etherStrip(buf):
     if len(buf) < 14:
         return ""
-    if buf[12:14] == '\x08\x10' and buf[16:18] in '\x08\x00':
+    if buf[12:14] == '\x08\x10' and buf[16:18] == '\x08\x00':
         # tagged ethernet frame
         return buf[18:]
     elif buf[12:14] == '\x08\x00':