Get rid of ip.h, migrating its users to packets.h.

diff --git a/include/Makefile.am b/include/Makefile.am
index c9d3bd41c6af66c990025130103721490c3fc628..409b2d636b8e0f3d536600a7b7c70e4740c4bff8 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -8,7 +8,6 @@ noinst_HEADERS = \
        fault.h \
        flow.h \
        hash.h \
-       ip.h \
        list.h \
        netlink.h \
        ofp-print.h \

diff --git a/include/ip.h b/include/ip.h
deleted file mode 100644 (file)
index 7d9789c..0000000
--- a/include/ip.h
+++ /dev/null
@@ -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 IP_H
-#define IP_H 1
-
-#define IP_FMT "%"PRIu8".%"PRIu8".%"PRIu8".%"PRIu8
-#define IP_ARGS(ip)                             \
-        ((uint8_t *) ip)[0],                    \
-        ((uint8_t *) ip)[1],                    \
-        ((uint8_t *) ip)[2],                    \
-        ((uint8_t *) ip)[3]
-
-#endif /* ip.h */

diff --git a/include/packets.h b/include/packets.h
index 4b5177030d6f04a307657ba7af545a05b5e3bce2..78e2db07e586d99f98602b599e23ccf981413738 100644 (file)
--- a/include/packets.h
+++ b/include/packets.h
@@ -123,6 +123,13 @@ struct vlan_eth_header {
 };
 BUILD_ASSERT_DECL(VLAN_ETH_HEADER_LEN == sizeof(struct vlan_eth_header));
 
+#define IP_FMT "%"PRIu8".%"PRIu8".%"PRIu8".%"PRIu8
+#define IP_ARGS(ip)                             \
+        ((uint8_t *) ip)[0],                    \
+        ((uint8_t *) ip)[1],                    \
+        ((uint8_t *) ip)[2],                    \
+        ((uint8_t *) ip)[3]
+
 #define IP_VER(ip_ihl_ver) ((ip_ihl_ver) >> 4)
 #define IP_IHL(ip_ihl_ver) ((ip_ihl_ver) & 15)
 

diff --git a/lib/flow.c b/lib/flow.c
index 937ce94717d62b5250f4275722498395ed08ff91..2d428b4bcb690cbab1a1d78aab725d6333baad00 100644 (file)
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include "buffer.h"
 #include "hash.h"
-#include "ip.h"
 #include "openflow.h"
 #include "packets.h"
 

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index a35c25487add95e4128d9bd44ed5bb226266d529..8ee1af58704253df51d04f259c50c139458f4bd2 100644 (file)
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -42,7 +42,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "ip.h"
 #include "compiler.h"
 #include "util.h"
 #include "openflow.h"