From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A8907A0352; Thu, 16 Jan 2020 09:12:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7C2AF1C1BE; Thu, 16 Jan 2020 09:12:07 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 789631C1BB for ; Thu, 16 Jan 2020 09:12:06 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2020 00:12:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,325,1574150400"; d="scan'208";a="257249438" Received: from unknown (HELO dpdk-xiaoqimai-dut.sh.intel.com) ([10.240.179.33]) by fmsmga002.fm.intel.com with ESMTP; 16 Jan 2020 00:12:03 -0800 From: Xiao Qimai To: dts@dpdk.org Cc: Xiao Qimai Date: Thu, 16 Jan 2020 16:08:48 +0800 Message-Id: <1579162128-439249-1-git-send-email-qimaix.xiao@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V2]dep/lldp: fix lldp for python3 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" python3 will not allow concat str to bytes Signed-off-by: Xiao Qimai --- 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 @@ -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