SunnyQjm/openflow
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Nicira action processing

Browse Source 
No custom Nicira actions in reference code so remove handlers from codebase.
This commit is contained in:
Glen Gibb committed 2009-10-14 15:56:36 -07:00
1 parent 5f171ff224
commit 2b1c086060
8 files changed
-165
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

datapath/Modules.mk
-2
View File
@@ -18,7 +18,6 @@ ofdatapath_sources = \
dp_notify.c \
flow.c \
forward.c \
nx_act.c \
private-msg.c \
table-hash.c \
table-linear.c
@@ -32,7 +31,6 @@ ofdatapath_headers = \
flow.h \
forward.h \
dp_act.h \
nx_act.h \
private-msg.h \
table.h
datapath/dp_act.c
-9
View File
@@ -17,7 +17,6 @@
#include "forward.h"
#include "dp_act.h"
#include "openflow/nicira-ext.h"
#include "nx_act.h"
#include "flow.h"
@@ -375,10 +374,6 @@ validate_vendor(struct datapath *dp, const struct sw_flow_key *key,
avh = (struct ofp_action_vendor_header *)ah;
switch(ntohl(avh->vendor)) {
case NX_VENDOR_ID:
ret = nx_validate_act(dp, key, (struct nx_action_header *)avh, len);
break;
default:
return OFPBAC_BAD_VENDOR;
}
@@ -453,10 +448,6 @@ execute_vendor(struct sk_buff *skb, const struct sw_flow_key *key,
* made to make_writable or its equivalent first. */
switch(ntohl(avh->vendor)) {
case NX_VENDOR_ID:
skb = nx_execute_act(skb, key, (struct nx_action_header *)avh);
break;
default:
/* This should not be possible due to prior validation. */
if (net_ratelimit())
datapath/nx_act.c
-27
View File
@@ -1,27 +0,0 @@
/*
* Distributed under the terms of the GNU GPL version 2.
* Copyright (c) 2008 Nicira Networks
*/
/* Functions for Nicira-extended actions. */
#include "openflow/nicira-ext.h"
#include "dp_act.h"
#include "nx_act.h"
uint16_t
nx_validate_act(struct datapath *dp, const struct sw_flow_key *key,
const struct nx_action_header *nah, uint16_t len)
{
if (len < sizeof *nah)
return OFPBAC_BAD_LEN;
return OFPBAC_BAD_VENDOR_TYPE;
}
struct sk_buff *
nx_execute_act(struct sk_buff *skb, const struct sw_flow_key *key,
const struct nx_action_header *nah)
{
return skb;
}
datapath/nx_act.h
-14
View File
@@ -1,14 +0,0 @@
#ifndef NX_ACT_H
#define NX_ACT_H 1
#include "datapath.h"
uint16_t nx_validate_act(struct datapath *dp, const struct sw_flow_key *key,
const struct nx_action_header *nah, uint16_t len);
struct sk_buff *nx_execute_act(struct sk_buff *skb,
const struct sw_flow_key *key,
const struct nx_action_header *nah);
#endif /* nx_act.h */
udatapath/automake.mk
-2
View File
@@ -10,8 +10,6 @@ udatapath_ofdatapath_SOURCES = \
udatapath/datapath.h \
udatapath/dp_act.c \
udatapath/dp_act.h \
udatapath/nx_act.c \
udatapath/nx_act.h \
udatapath/udatapath.c \
udatapath/private-msg.c \
udatapath/private-msg.h \
udatapath/dp_act.c
-9
View File
@@ -38,7 +38,6 @@
#include "packets.h"
#include "dp_act.h"
#include "openflow/nicira-ext.h"
#include "nx_act.h"
static uint16_t
@@ -367,10 +366,6 @@ validate_vendor(struct datapath *dp, const struct sw_flow_key *key,
avh = (struct ofp_action_vendor_header *)ah;
switch(ntohl(avh->vendor)) {
case NX_VENDOR_ID:
ret = nx_validate_act(dp, key, avh, len);
break;
default:
return OFPBAC_BAD_VENDOR;
}
@@ -447,10 +442,6 @@ execute_vendor(struct ofpbuf *buffer, const struct sw_flow_key *key,
= (struct ofp_action_vendor_header *)ah;
switch(ntohl(avh->vendor)) {
case NX_VENDOR_ID:
nx_execute_act(buffer, key, avh);
break;
default:
/* This should not be possible due to prior validation. */
printf("attempt to execute action with unknown vendor: %#x\n",
udatapath/nx_act.c
-54
View File
@@ -1,54 +0,0 @@
/* Copyright (c) 2008, 2009 The Board of Trustees of The Leland Stanford
* Junior University
*
* We are making the OpenFlow specification and associated documentation
* (Software) available for public use and benefit with the expectation
* that others will use, modify and enhance the Software and contribute
* those enhancements back to the community. However, since we would
* like to make the Software available for broadest use, with as few
* restrictions as possible permission is hereby granted, free of
* charge, to any person obtaining a copy of this Software to deal in
* the Software under the copyrights without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
* The name and trademarks of copyright holder(s) may NOT be used in
* advertising or publicity pertaining to the Software or any
* derivatives without specific, written prior permission.
*/
/* Functions for Nicira-extended actions. */
#include "openflow/nicira-ext.h"
#include "nx_act.h"
uint16_t
nx_validate_act(struct datapath *dp UNUSED,
const struct sw_flow_key *key UNUSED,
const struct ofp_action_vendor_header *avh UNUSED,
uint16_t len UNUSED)
{
/* Nothing to validate yet */
return OFPBAC_BAD_VENDOR_TYPE;
}
void
nx_execute_act(struct ofpbuf *buffer UNUSED,
const struct sw_flow_key *key UNUSED,
const struct ofp_action_vendor_header *avh UNUSED)
{
/* Nothing to execute yet */
}
udatapath/nx_act.h
-48
View File
@@ -1,48 +0,0 @@
/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
* Junior University
*
* We are making the OpenFlow specification and associated documentation
* (Software) available for public use and benefit with the expectation
* that others will use, modify and enhance the Software and contribute
* those enhancements back to the community. However, since we would
* like to make the Software available for broadest use, with as few
* restrictions as possible permission is hereby granted, free of
* charge, to any person obtaining a copy of this Software to deal in
* the Software under the copyrights without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
* The name and trademarks of copyright holder(s) may NOT be used in
* advertising or publicity pertaining to the Software or any
* derivatives without specific, written prior permission.
*/
#ifndef NX_ACT_H
#define NX_ACT_H 1
#include "switch-flow.h"
#include "datapath.h"
uint16_t nx_validate_act(struct datapath *dp, const struct sw_flow_key *key,
const struct ofp_action_vendor_header *avh, uint16_t len);
void nx_execute_act(struct ofpbuf *buffer,
const struct sw_flow_key *key,
const struct ofp_action_vendor_header *avh);
#endif /* nx_act.h */