Remove unused Nicira message processing code
No longer sending NXT_FLOW_END_CONFIG messages so remove code associated with this message.
This commit is contained in:
Glen Gibb committed
1 parent
ec0c97d6a1
commit
5f171ff224
8 files changed
-148
No files matched your search
@@ -19,7 +19,6 @@ ofdatapath_sources = \
|
||||
flow.c \
|
||||
forward.c \
|
||||
nx_act.c \
|
||||
nx_msg.c \
|
||||
private-msg.c \
|
||||
table-hash.c \
|
||||
table-linear.c
|
||||
@@ -34,7 +33,6 @@ ofdatapath_headers = \
|
||||
forward.h \
|
||||
dp_act.h \
|
||||
nx_act.h \
|
||||
nx_msg.h \
|
||||
private-msg.h \
|
||||
table.h
|
||||
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#include "openflow/nicira-ext.h"
|
||||
#include "openflow/private-ext.h"
|
||||
#include "dp_act.h"
|
||||
#include "nx_msg.h"
|
||||
#include "private-msg.h"
|
||||
#include "chain.h"
|
||||
#include "flow.h"
|
||||
@@ -409,8 +408,6 @@ recv_vendor(struct sw_chain *chain, const struct sender *sender,
|
||||
|
||||
switch(ntohl(ovh->vendor))
|
||||
{
|
||||
case NX_VENDOR_ID:
|
||||
return nx_recv_msg(chain, sender, msg);
|
||||
case PRIVATE_VENDOR_ID:
|
||||
return private_recv_msg(chain, sender, msg);
|
||||
default:
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
/*
|
||||
* Distributed under the terms of the GNU GPL version 2.
|
||||
* Copyright (c) 2008 Nicira Networks
|
||||
*/
|
||||
|
||||
#include "chain.h"
|
||||
#include "datapath.h"
|
||||
#include "openflow/nicira-ext.h"
|
||||
#include "nx_msg.h"
|
||||
|
||||
|
||||
int
|
||||
nx_recv_msg(struct sw_chain *chain, const struct sender *sender,
|
||||
const void *msg)
|
||||
{
|
||||
const struct nicira_header *nh = msg;
|
||||
|
||||
switch (ntohl(nh->subtype)) {
|
||||
|
||||
case NXT_FLOW_END_CONFIG: {
|
||||
return 0;
|
||||
}
|
||||
|
||||
default:
|
||||
dp_send_error_msg(chain->dp, sender, OFPET_BAD_REQUEST,
|
||||
OFPBRC_BAD_SUBTYPE, msg, ntohs(nh->header.length));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
#ifndef NX_MSG_H
|
||||
#define NX_MSG_H 1
|
||||
|
||||
int nx_recv_msg(struct sw_chain *chain, const struct sender *sender,
|
||||
const void *msg);
|
||||
|
||||
#endif /* nx_msg.h */
|
||||
@@ -12,8 +12,6 @@ udatapath_ofdatapath_SOURCES = \
|
||||
udatapath/dp_act.h \
|
||||
udatapath/nx_act.c \
|
||||
udatapath/nx_act.h \
|
||||
udatapath/nx_msg.c \
|
||||
udatapath/nx_msg.h \
|
||||
udatapath/udatapath.c \
|
||||
udatapath/private-msg.c \
|
||||
udatapath/private-msg.h \
|
||||
|
||||
@@ -54,7 +54,6 @@
|
||||
#include "table.h"
|
||||
#include "vconn.h"
|
||||
#include "xtoxll.h"
|
||||
#include "nx_msg.h"
|
||||
#include "private-msg.h"
|
||||
#include "dp_act.h"
|
||||
|
||||
@@ -1682,9 +1681,6 @@ recv_vendor(struct datapath *dp, const struct sender *sender,
|
||||
|
||||
switch (ntohl(ovh->vendor))
|
||||
{
|
||||
case NX_VENDOR_ID:
|
||||
return nx_recv_msg(dp, sender, oh);
|
||||
|
||||
case PRIVATE_VENDOR_ID:
|
||||
return private_recv_msg(dp, sender, oh);
|
||||
|
||||
|
||||
@@ -1,56 +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.
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
#include <arpa/inet.h>
|
||||
#include "openflow/nicira-ext.h"
|
||||
#include "nx_msg.h"
|
||||
|
||||
int nx_recv_msg(struct datapath *dp, const struct sender *sender,
|
||||
const void *oh)
|
||||
{
|
||||
const struct nicira_header *nh = oh;
|
||||
|
||||
switch (ntohl(nh->subtype)) {
|
||||
case NXT_FLOW_END_CONFIG: {
|
||||
return 0;
|
||||
}
|
||||
|
||||
default:
|
||||
dp_send_error_msg(dp, sender, OFPET_BAD_REQUEST,
|
||||
OFPBRC_BAD_SUBTYPE, oh, ntohs(nh->header.length));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -1,43 +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_MSG_H
|
||||
#define NX_MSG_H 1
|
||||
|
||||
#include "datapath.h"
|
||||
|
||||
struct sender;
|
||||
|
||||
int nx_recv_msg(struct datapath *, const struct sender *, const void *);
|
||||
|
||||
#endif /* nx_msg.h */
|
||||
Reference in new issue
Block a user