From b7235b395a270e80bbf9ffadbff3098bd9a7d6de Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 22 Nov 2013 13:41:33 +0900 Subject: [PATCH] topology.switches: stop abusing Packet.next() Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/topology/switches.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ryu/topology/switches.py b/ryu/topology/switches.py index bd31fa16..a92f8df4 100644 --- a/ryu/topology/switches.py +++ b/ryu/topology/switches.py @@ -394,10 +394,11 @@ class LLDPPacket(object): @staticmethod def lldp_parse(data): pkt = packet.Packet(data) - eth_pkt = pkt.next() + i = iter(pkt) + eth_pkt = i.next() assert type(eth_pkt) == ethernet.ethernet - lldp_pkt = pkt.next() + lldp_pkt = i.next() if type(lldp_pkt) != lldp.lldp: raise LLDPPacket.LLDPUnknownFormat()