From 73056818e9f8b6a24b708d383c8453bd25eadb9a Mon Sep 17 00:00:00 2001 From: Jean Tourrilhes Date: Thu, 30 Oct 2014 16:17:16 -0700 Subject: [PATCH] openflow.h: Add header for OpenFlow v1.5. Signed-off-by: Jean Tourrilhes Signed-off-by: Ben Pfaff --- include/openflow/automake.mk | 4 +++ include/openflow/openflow-1.5.h | 44 +++++++++++++++++++++++++++++++++ include/openflow/openflow.h | 1 + 3 files changed, 49 insertions(+) create mode 100644 include/openflow/openflow-1.5.h diff --git a/include/openflow/automake.mk b/include/openflow/automake.mk index 14f7a476c..4194996a5 100644 --- a/include/openflow/automake.mk +++ b/include/openflow/automake.mk @@ -5,6 +5,7 @@ noinst_HEADERS += \ include/openflow/openflow-1.2.h \ include/openflow/openflow-1.3.h \ include/openflow/openflow-1.4.h \ + include/openflow/openflow-1.5.h \ include/openflow/openflow-common.h \ include/openflow/openflow.h @@ -22,6 +23,7 @@ HSTAMP_FILES = \ include/openflow/openflow-1.2.hstamp \ include/openflow/openflow-1.3.hstamp \ include/openflow/openflow-1.4.hstamp \ + include/openflow/openflow-1.5.hstamp \ include/openflow/openflow-common.hstamp \ include/openflow/openflow.hstamp CLEANFILES += $(HSTAMP_FILES) @@ -41,6 +43,8 @@ include/openflow/openflow-1.3.hstamp: \ include/openflow/openflow-1.2.h include/openflow/openflow-1.4.hstamp: \ include/openflow/openflow-1.4.h +include/openflow/openflow-1.5.hstamp: \ + include/openflow/openflow-1.5.h include/openflow/nicira-ext.hstamp: \ include/openflow/openflow.h \ include/openflow/openflow-common.h \ diff --git a/include/openflow/openflow-1.5.h b/include/openflow/openflow-1.5.h new file mode 100644 index 000000000..a5a51c0de --- /dev/null +++ b/include/openflow/openflow-1.5.h @@ -0,0 +1,44 @@ +/* Copyright (c) 2008, 2014 The Board of Trustees of The Leland Stanford +* Junior University +* Copyright (c) 2011, 2014 Open Networking Foundation +* +* 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. +*/ + +/* OpenFlow: protocol between controller and datapath. */ + +#ifndef OPENFLOW_15_H +#define OPENFLOW_15_H 1 + +#include "openflow/openflow-1.4.h" + + + +#endif /* openflow/openflow-1.5.h */ diff --git a/include/openflow/openflow.h b/include/openflow/openflow.h index 6ec6588ca..b9cbdcaed 100644 --- a/include/openflow/openflow.h +++ b/include/openflow/openflow.h @@ -22,5 +22,6 @@ #include "openflow/openflow-1.2.h" #include "openflow/openflow-1.3.h" #include "openflow/openflow-1.4.h" +#include "openflow/openflow-1.5.h" #endif /* openflow/openflow.h */ -- 2.20.1