From: Xiao Qimai <qimaix.xiao@intel.com>
To: dts@dpdk.org
Cc: Xiao Qimai <qimaix.xiao@intel.com>
Subject: [dts] [PATCH V2]dep/lldp: fix lldp for python3
Date: Thu, 16 Jan 2020 16:11:27 +0800 [thread overview]
Message-ID: <1579162287-439514-1-git-send-email-qimaix.xiao@intel.com> (raw)
python3 will not allow concat str to bytes
Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
dep/lldp.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/dep/lldp.py b/dep/lldp.py
index 9792e05..faa3b4d 100644
--- a/dep/lldp.py
+++ b/dep/lldp.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
## This file is part of Scapy
## See http://www.secdev.org/projects/scapy for more informations
## Copyright (C) Philippe Biondi <phil@secdev.org>
@@ -78,7 +79,7 @@ class LLDPGeneric(Packet):
def post_build(self, p, pay):
if self.length is None:
l = len(p) - 2
- p = chr((self.type << 1) ^ (l >> 8)) + chr(l & 0xff) + bytes.decode(p[2:], encoding='gbk')
+ p = chr((self.type << 1) ^ (l >> 8)).encode() + chr(l & 0xff).encode() + p[2:]
return p+pay
@@ -211,15 +212,13 @@ class LLDPManagementAddress(LLDPGeneric):
# TODO Remove redundant code. LLDPGeneric.post_build()
if self.length is None:
l = len(p) - 2
- p = chr((self.type << 1) ^ (l >> 8)) + chr(l & 0xff) + p[2:].decode()
+ p = chr((self.type << 1) ^ (l >> 8)).encode() + chr(l & 0xff).encode() + p[2:]
if self.addrlen is None:
addrlen = len(p) - 2 - 8 - len(self.oid) + 1
- if isinstance(p, type('abc')):
- p = p[:2]+ struct.pack("B", addrlen).decode() + p[3:]
- else:
- p = p[:2].decode() + struct.pack("B", addrlen).decode() + p[3:].decode()
- return bytes(p, encoding="utf-8")+pay
+ p = p[:2] + struct.pack("B", addrlen) + p[3:]
+
+ return p+pay
_LLDPDot1Subtype = {1: "Port VLAN Id"}
--
2.17.1
next reply other threads:[~2020-01-16 8:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 8:11 Xiao Qimai [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-16 8:08 Xiao Qimai
2020-01-16 8:58 ` Tu, Lijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1579162287-439514-1-git-send-email-qimaix.xiao@intel.com \
--to=qimaix.xiao@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).