On Mon, 14 May 2012 10:25:15 +0900 Simon Horman <[email protected]> wrote:
> On Mon, May 14, 2012 at 10:08:34AM +0900, FUJITA Tomonori wrote: > > On Mon, 14 May 2012 09:56:38 +0900 > > Simon Horman <[email protected]> wrote: > > > > > Hi Fujita-san, > > > > > > On Sun, May 13, 2012 at 09:02:58PM +0900, FUJITA Tomonori wrote: > > >> Signed-off-by: FUJITA Tomonori <[email protected]> > > >> --- > > >> ryu/ofproto/ofproto_v1_0.py | 63 > > >> ++++++++++++++++++++++++++++++++---- > > >> ryu/ofproto/ofproto_v1_0_parser.py | 26 ++++++++++++++- > > >> 2 files changed, 81 insertions(+), 8 deletions(-) > > >> > > >> diff --git a/ryu/ofproto/ofproto_v1_0.py b/ryu/ofproto/ofproto_v1_0.py > > >> index 2f5f649..91ce666 100644 > > >> --- a/ryu/ofproto/ofproto_v1_0.py > > >> +++ b/ryu/ofproto/ofproto_v1_0.py > > >> @@ -1,4 +1,4 @@ > > >> -# Copyright (C) 2011 Nippon Telegraph and Telephone Corporation. > > >> +# Copyright (C) 2011, 2012 Nippon Telegraph and Telephone Corporation. > > >> # Copyright (C) 2011, 2012 Isaku Yamahata <yamahata at valinux co jp> > > >> # > > >> # Licensed under the Apache License, Version 2.0 (the "License"); > > >> @@ -234,6 +234,7 @@ OFP_ACTION_PACK_STR = '!H' > > >> # enum nx_action_subtype (truncated) > > >> NXAST_RESUBMIT = 1 > > >> NXAST_SET_TUNNEL = 2 > > >> +NXAST_REG_MOVE = 6 > > >> NXAST_SET_TUNNEL64 = 9 > > >> NXAST_MULTIPATH = 10 > > >> NXAST_RESUBMIT_TABLE = 14 > > >> @@ -246,6 +247,10 @@ NX_ACTION_SET_TUNNEL_PACK_STR = '!HHIH2xI' > > >> NX_ACTION_SET_TUNNEL_SIZE = 16 > > >> assert calcsize(NX_ACTION_SET_TUNNEL_PACK_STR) == > > >> NX_ACTION_SET_TUNNEL_SIZE > > >> > > >> +NX_ACTION_REG_MOVE_PACK_STR = '!HHIHHHHII' > > >> +NX_ACTION_REG_MOVE_SIZE = 24 > > >> +assert calcsize(NX_ACTION_REG_MOVE_PACK_STR) == NX_ACTION_REG_MOVE_SIZE > > >> + > > >> NX_ACTION_SET_TUNNEL64_PACK_STR = '!HHIH6xQ' > > >> NX_ACTION_SET_TUNNEL64_SIZE = 24 > > >> assert calcsize(NX_ACTION_SET_TUNNEL64_PACK_STR) == > > >> NX_ACTION_SET_TUNNEL64_SIZE > > >> @@ -555,18 +560,62 @@ def nxm_header_w(vendor, field, length): > > >> return nxm_header__(vendor, field, 1, (length) * 2) > > >> > > >> > > >> -NXM_OF_IN_PORT = nxm_header(0x0000, 0, 2) > > >> +NXM_OF_IN_PORT = nxm_header(0x0000, 0, 2) > > >> + > > >> +NXM_OF_ETH_DST = nxm_header(0x0000, 1, 6) > > >> +NXM_OF_ETH_DST_W = nxm_header_w(0x0000, 1, 6) > > >> +NXM_OF_ETH_SRC = nxm_header(0x0000, 2, 6) > > >> +NXM_OF_ETH_TYPE = nxm_header(0x0000, 3, 2) > > >> + > > >> +NXM_OF_VLAN_TCI = nxm_header(0x0000, 4, 2) > > >> +NXM_OF_VLAN_TCI_W = nxm_header_w(0x0000, 4, 2) > > >> + > > >> +NXM_OF_IP_TOS = nxm_header(0x0000, 5, 1) > > >> + > > >> +NXM_OF_IP_PROTO = nxm_header(0x0000, 6, 1) > > >> + > > >> +NXM_OF_IP_SRC = nxm_header(0x0000, 7, 4) > > >> +NXM_OF_IP_SRC_W = nxm_header_w(0x0000, 7, 4) > > >> +NXM_OF_IP_DST = nxm_header(0x0000, 8, 4) > > >> +NXM_OF_IP_DST_W = nxm_header_w(0x0000, 8, 4) > > >> + > > >> +NXM_OF_TCP_SRC = nxm_header(0x0000, 9, 2) > > >> +NXM_OF_TCP_SRC_W = nxm_header_w(0x0000, 9, 2) > > >> +NXM_OF_TCP_DST = nxm_header(0x0000, 10, 2) > > >> +NXM_OF_TCP_DST_W = nxm_header_w(0x0000, 10, 2) > > >> > > >> -NXM_OF_ETH_DST = nxm_header(0x0000, 1, 6) > > >> -NXM_OF_ETH_DST_W = nxm_header_w(0x0000, 1, 6) > > >> -NXM_OF_ETH_SRC = nxm_header(0x0000, 2, 6) > > >> -NXM_OF_ETH_TYPE = nxm_header(0x0000, 3, 2) > > >> +NXM_OF_UDP_SRC = nxm_header(0x0000, 11, 2) > > >> +NXM_OF_UDP_SRC_W = nxm_header_w(0x0000, 11, 2) > > >> +NXM_OF_UDP_DST = nxm_header(0x0000, 12, 2) > > >> +NXM_OF_UDP_DST_W = nxm_header_w(0x0000, 12, 2) > > >> > > >> -NXM_OF_IP_TOS = nxm_header(0x0000, 5, 1) > > >> +NXM_OF_ICMP_TYPE = nxm_header(0x0000, 13, 1) > > >> +NXM_OF_ICMP_CODE = nxm_header(0x0000, 14, 1) > > > > > > It might be worh adding NXM_OF_ARP_OP as I believe it is a valid > > > src value for NXAST_REG_MOVE and all the other valid values seem > > > to be present as of this patch. > > > > > > NXM_OF_ARP_OP = nxm_header(0x0000, 15, 2) > > > > Yeah, here's an updated one. > > Thanks, this one looks good. > > > >From 87887aaaa8be60a47368e7b8e6c3a28858bb2325 Mon Sep 17 00:00:00 2001 > > From: FUJITA Tomonori <[email protected]> > > Date: Mon, 14 May 2012 10:10:26 +0900 > > Subject: [PATCH] add Nicira Extension NXAST_REG_MOVE support > > > > Signed-off-by: FUJITA Tomonori <[email protected]> > > Reviewed-by: Simon Horman <[email protected]> Applied. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
