On Fri, 24 Oct 2014 14:02:56 +0800 "川格" <[email protected]> wrote:
> From a776615f17211b660e32b9ab4bc2d7df1fccd629 Mon Sep 17 00:00:00 2001 > From: muzixing <[email protected]> > Date: Fri, 24 Oct 2014 13:54:59 +0800 > Subject: [PATCH] add_arp_proxy_13 > > > arp_proxy_13 is a ryu app: > * Reply ARP requests > * Avoid broadcast storm instead of STP > --- > ryu/app/arp_proxy_13.py | 188 > ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 188 insertions(+) > create mode 100644 ryu/app/arp_proxy_13.py I got one pep8 warning. Please run pep8 before submitting next time. ryu/app/arp_proxy_13.py:15:2: W291 trailing whitespace > diff --git a/ryu/app/arp_proxy_13.py b/ryu/app/arp_proxy_13.py > new file mode 100644 > index 0000000..b3b50ad > --- /dev/null > +++ b/ryu/app/arp_proxy_13.py > @@ -0,0 +1,188 @@ > +# Copyright (C) 2011 Nippon Telegraph and Telephone Corporation. > +# > +# Licensed under the Apache License, Version 2.0 (the "License"); > +# you may not use this file except in compliance with the License. > +# You may obtain a copy of the License at > +# > +# http://www.apache.org/licenses/LICENSE-2.0 > +# > +# Unless required by applicable law or agreed to in writing, software > +# distributed under the License is distributed on an "AS IS" BASIS, > +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > +# implied. > +# See the License for the specific language governing permissions and > +# limitations under the License. > +# > +# Contributor:Li Cheng @BUPT > +# Homepage:www.muzixing.com > +# Time:2014/10/19 > +# > + > +from ryu.base import app_manager > +from ryu.controller import ofp_event > +from ryu.controller.handler import CONFIG_DISPATCHER, MAIN_DISPATCHER > +from ryu.controller.handler import set_ev_cls > +from ryu.ofproto import ofproto_v1_3 > +from ryu.lib.packet import packet > +from ryu.lib.packet import ethernet > +from ryu.lib.packet import arp > + > +ETHERNET = ethernet.ethernet.__name__ > +ETHERNET_MULTICAST = "ff:ff:ff:ff:ff:ff" Can you use the following instead? https://github.com/osrg/ryu/blob/master/ryu/lib/mac.py#L27 > +ARP = arp.arp.__name__ > + > + > +class ARP_PROXY_13(app_manager.RyuApp): > + OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION] > + > + def __init__(self, *args, **kwargs): > + super(ARP_PROXY_13, self).__init__(*args, **kwargs) > + self.mac_to_port = {} > + self.arp_table = {} > + self.sw = {} > + > + @set_ev_cls(ofp_event.EventOFPSwitchFeatures, CONFIG_DISPATCHER) > + def switch_features_handler(self, ev): > + datapath = ev.msg.datapath > + ofproto = datapath.ofproto > + parser = datapath.ofproto_parser > + > + # install table-miss flow entry > + # > + # We specify NO BUFFER to max_len of the output action due to > + # OVS bug. At this moment, if we specify a lesser number, e.g., > + # 128, OVS will send Packet-In with invalid buffer_id and > + # truncated packet data. In that case, we cannot output packets > + # correctly. > + > + match = parser.OFPMatch() > + actions = [parser.OFPActionOutput(ofproto.OFPP_CONTROLLER, > + ofproto.OFPCML_NO_BUFFER)] > + self.add_flow(datapath, 0, match, actions) > + > + def add_flow(self, datapath, priority, match, actions): > + ofproto = datapath.ofproto > + parser = datapath.ofproto_parser > + > + inst = [parser.OFPInstructionActions(ofproto.OFPIT_APPLY_ACTIONS, > + actions)] > + > + mod = parser.OFPFlowMod(datapath=datapath, priority=priority, > + idle_timeout=5, hard_timeout=15, > + match=match, instructions=inst) > + datapath.send_msg(mod) > + > + @set_ev_cls(ofp_event.EventOFPPacketIn, MAIN_DISPATCHER) > + def _packet_in_handler(self, ev): > + msg = ev.msg > + datapath = msg.datapath > + ofproto = datapath.ofproto > + parser = datapath.ofproto_parser > + in_port = msg.match['in_port'] > + > + pkt = packet.Packet(msg.data) > + > + eth = pkt.get_protocols(ethernet.ethernet)[0] > + dst = eth.dst > + src = eth.src > + dpid = datapath.id > + > + header_list = dict( > + (p.protocol_name, p)for p in pkt.protocols if type(p) != str) > + if ARP in header_list: > + self.arp_table[header_list[ARP].src_ip] = src # ARP learning why not simply? arp = pkt.get_protocol(arp.arp): if arp: self.arp_table[arp.src_ip] = src Same to all the parts using 'header_list' stuff. Thanks! > + > + self.mac_to_port.setdefault(dpid, {}) > + self.logger.info("packet in %s %s %s %s", dpid, src, dst, in_port) > + > + # learn a mac address to avoid FLOOD next time. > + self.mac_to_port[dpid][src] = in_port > + > + if dst in self.mac_to_port[dpid]: > + out_port = self.mac_to_port[dpid][dst] > + else: > + if self.arp_handler(header_list, datapath, in_port, > msg.buffer_id): > + # 1:reply or drop; 0: flood > + print "ARP_PROXY_13" > + return None > + else: > + out_port = ofproto.OFPP_FLOOD > + print 'OFPP_FLOOD' > + > + actions = [parser.OFPActionOutput(out_port)] > + > + # install a flow to avoid packet_in next time > + if out_port != ofproto.OFPP_FLOOD: > + match = parser.OFPMatch(in_port=in_port, eth_dst=dst) > + self.add_flow(datapath, 1, match, actions) > + > + data = None > + if msg.buffer_id == ofproto.OFP_NO_BUFFER: > + data = msg.data > + out = parser.OFPPacketOut(datapath=datapath, buffer_id=msg.buffer_id, > + in_port=in_port, actions=actions, > data=data) > + datapath.send_msg(out) > + > + def arp_handler(self, header_list, datapath, in_port, msg_buffer_id): > + header_list = header_list > + datapath = datapath > + in_port = in_port > + > + if ETHERNET in header_list: > + eth_dst = header_list[ETHERNET].dst > + eth_src = header_list[ETHERNET].src > + > + if eth_dst == ETHERNET_MULTICAST and ARP in header_list: > + arp_dst_ip = header_list[ARP].dst_ip > + if (datapath.id, eth_src, arp_dst_ip) in self.sw: # Break the > loop > + if self.sw[(datapath.id, eth_src, arp_dst_ip)] != in_port: > + out = datapath.ofproto_parser.OFPPacketOut( > + datapath=datapath, > + buffer_id=datapath.ofproto.OFP_NO_BUFFER, > + in_port=in_port, > + actions=[], data=None) > + datapath.send_msg(out) > + return True > + else: > + self.sw[(datapath.id, eth_src, arp_dst_ip)] = in_port > + > + if ARP in header_list: > + hwtype = header_list[ARP].hwtype > + proto = header_list[ARP].proto > + hlen = header_list[ARP].hlen > + plen = header_list[ARP].plen > + opcode = header_list[ARP].opcode > + > + arp_src_ip = header_list[ARP].src_ip > + arp_dst_ip = header_list[ARP].dst_ip > + > + actions = [] > + > + if opcode == arp.ARP_REQUEST: > + if arp_dst_ip in self.arp_table: # arp reply > + actions.append(datapath.ofproto_parser.OFPActionOutput( > + in_port) > + ) > + > + ARP_Reply = packet.Packet() > + ARP_Reply.add_protocol(ethernet.ethernet( > + ethertype=header_list[ETHERNET].ethertype, > + dst=eth_src, > + src=self.arp_table[arp_dst_ip])) > + ARP_Reply.add_protocol(arp.arp( > + opcode=arp.ARP_REPLY, > + src_mac=self.arp_table[arp_dst_ip], > + src_ip=arp_dst_ip, > + dst_mac=eth_src, > + dst_ip=arp_src_ip)) > + > + ARP_Reply.serialize() > + > + out = datapath.ofproto_parser.OFPPacketOut( > + datapath=datapath, > + buffer_id=datapath.ofproto.OFP_NO_BUFFER, > + in_port=datapath.ofproto.OFPP_CONTROLLER, > + actions=actions, data=ARP_Reply.data) > + datapath.send_msg(out) > + return True > + return False > -- > 1.9.4.msysgit.1 ------------------------------------------------------------------------------ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
