Skip to content

Commit fa1324c

Browse files
Samuel GhinetAlin Gabriel Serdean
authored and
blp
committed
datapath-windows: Rename files.
This patch includes the file renaming and accommodations needed for the file renaming to build the forwarding extension for Hyper-V. This patch is also a follow-up for the thread: http://openvswitch.org/pipermail/dev/2014-August/044005.html Signed-off-by: Samuel Ghinet <sghinet@cloudbasesolutions.com> Co-authored-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
1 parent fd972eb commit fa1324c

51 files changed

Lines changed: 304 additions & 303 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build-aux/extract-odp-netlink-windows-dp-h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
s/_LINUX_OPENVSWITCH_H/__OVS_DP_INTERFACE_H_/
1515

1616
# and use the appropriate userspace header.
17-
s,<linux/types\.h>,"OvsTypes.h",
17+
s,<linux/types\.h>,"Types.h",
1818

1919
# Add ETH_ADDR_LEN macro to avoid including userspace packet.h
2020
s,#include <linux/if_ether\.h>,\n#ifndef ETH_ADDR_LEN \

‎datapath-windows/automake.mk‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,48 @@ EXTRA_DIST += \
1313
datapath-windows/ovsext.sln \
1414
datapath-windows/ovsext/Datapath.c \
1515
datapath-windows/ovsext/Datapath.h \
16-
datapath-windows/ovsext/OvsActions.c \
17-
datapath-windows/ovsext/OvsAtomic.h \
18-
datapath-windows/ovsext/OvsBufferMgmt.c \
19-
datapath-windows/ovsext/OvsBufferMgmt.h \
20-
datapath-windows/ovsext/OvsChecksum.c \
21-
datapath-windows/ovsext/OvsChecksum.h \
22-
datapath-windows/ovsext/OvsDebug.c \
23-
datapath-windows/ovsext/OvsDebug.h \
24-
datapath-windows/ovsext/OvsDriver.c \
25-
datapath-windows/ovsext/OvsEth.h \
26-
datapath-windows/ovsext/OvsEvent.c \
27-
datapath-windows/ovsext/OvsEvent.h \
28-
datapath-windows/ovsext/OvsFlow.c \
29-
datapath-windows/ovsext/OvsFlow.h \
30-
datapath-windows/ovsext/OvsIoctl.c \
31-
datapath-windows/ovsext/OvsIoctl.h \
32-
datapath-windows/ovsext/OvsIpHelper.c \
33-
datapath-windows/ovsext/OvsIpHelper.h \
34-
datapath-windows/ovsext/OvsJhash.c \
35-
datapath-windows/ovsext/OvsJhash.h \
36-
datapath-windows/ovsext/OvsNetProto.h \
37-
datapath-windows/ovsext/OvsOid.c \
38-
datapath-windows/ovsext/OvsOid.h \
39-
datapath-windows/ovsext/OvsPacketIO.c \
40-
datapath-windows/ovsext/OvsPacketIO.h \
41-
datapath-windows/ovsext/OvsPacketParser.c \
42-
datapath-windows/ovsext/OvsPacketParser.h \
43-
datapath-windows/ovsext/OvsSwitch.c \
44-
datapath-windows/ovsext/OvsSwitch.h \
45-
datapath-windows/ovsext/OvsTunnel.c \
46-
datapath-windows/ovsext/OvsTunnel.h \
47-
datapath-windows/ovsext/OvsTunnelFilter.c \
48-
datapath-windows/ovsext/OvsTunnelIntf.h \
49-
datapath-windows/ovsext/OvsTypes.h \
50-
datapath-windows/ovsext/OvsUser.c \
51-
datapath-windows/ovsext/OvsUser.h \
52-
datapath-windows/ovsext/OvsUtil.c \
53-
datapath-windows/ovsext/OvsUtil.h \
54-
datapath-windows/ovsext/OvsVport.c \
55-
datapath-windows/ovsext/OvsVport.h \
56-
datapath-windows/ovsext/OvsVxlan.c \
57-
datapath-windows/ovsext/OvsVxlan.h \
16+
datapath-windows/ovsext/Actions.c \
17+
datapath-windows/ovsext/Atomic.h \
18+
datapath-windows/ovsext/BufferMgmt.c \
19+
datapath-windows/ovsext/BufferMgmt.h \
20+
datapath-windows/ovsext/Checksum.c \
21+
datapath-windows/ovsext/Checksum.h \
22+
datapath-windows/ovsext/Debug.c \
23+
datapath-windows/ovsext/Debug.h \
24+
datapath-windows/ovsext/Driver.c \
25+
datapath-windows/ovsext/Ethernet.h \
26+
datapath-windows/ovsext/Event.c \
27+
datapath-windows/ovsext/Event.h \
28+
datapath-windows/ovsext/Flow.c \
29+
datapath-windows/ovsext/Flow.h \
30+
datapath-windows/ovsext/Ioctl.c \
31+
datapath-windows/ovsext/Ioctl.h \
32+
datapath-windows/ovsext/IpHelper.c \
33+
datapath-windows/ovsext/IpHelper.h \
34+
datapath-windows/ovsext/Jhash.c \
35+
datapath-windows/ovsext/Jhash.h \
36+
datapath-windows/ovsext/NetProto.h \
37+
datapath-windows/ovsext/Oid.c \
38+
datapath-windows/ovsext/Oid.h \
39+
datapath-windows/ovsext/PacketIO.c \
40+
datapath-windows/ovsext/PacketIO.h \
41+
datapath-windows/ovsext/PacketParser.c \
42+
datapath-windows/ovsext/PacketParser.h \
43+
datapath-windows/ovsext/Switch.c \
44+
datapath-windows/ovsext/Switch.h \
45+
datapath-windows/ovsext/Tunnel.c \
46+
datapath-windows/ovsext/Tunnel.h \
47+
datapath-windows/ovsext/TunnelFilter.c \
48+
datapath-windows/ovsext/TunnelIntf.h \
49+
datapath-windows/ovsext/Types.h \
50+
datapath-windows/ovsext/User.c \
51+
datapath-windows/ovsext/User.h \
52+
datapath-windows/ovsext/Util.c \
53+
datapath-windows/ovsext/Util.h \
54+
datapath-windows/ovsext/Vport.c \
55+
datapath-windows/ovsext/Vport.h \
56+
datapath-windows/ovsext/Vxlan.c \
57+
datapath-windows/ovsext/Vxlan.h \
5858
datapath-windows/ovsext/ovsext.inf \
5959
datapath-windows/ovsext/ovsext.rc \
6060
datapath-windows/ovsext/ovsext.vcxproj \

datapath-windows/ovsext/OvsActions.c renamed to datapath-windows/ovsext/Actions.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616

1717
#include "precomp.h"
1818

19-
#include "OvsSwitch.h"
20-
#include "OvsVport.h"
21-
#include "OvsEvent.h"
22-
#include "OvsUser.h"
23-
#include "OvsNetProto.h"
24-
#include "OvsFlow.h"
25-
#include "OvsVxlan.h"
26-
#include "OvsChecksum.h"
27-
#include "OvsPacketIO.h"
19+
#include "Switch.h"
20+
#include "Vport.h"
21+
#include "Event.h"
22+
#include "User.h"
23+
#include "NetProto.h"
24+
#include "Flow.h"
25+
#include "Vxlan.h"
26+
#include "Checksum.h"
27+
#include "PacketIO.h"
2828

2929
#ifdef OVS_DBG_MOD
3030
#undef OVS_DBG_MOD
3131
#endif
3232
#define OVS_DBG_MOD OVS_DBG_ACTION
33-
#include "OvsDebug.h"
33+
#include "Debug.h"
3434

3535
typedef struct _OVS_ACTION_STATS {
3636
UINT64 rxVxlan;

datapath-windows/ovsext/OvsAtomic.h renamed to datapath-windows/ovsext/Atomic.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef __OVS_ATOMIC_H_
18-
#define __OVS_ATOMIC_H_ 1
17+
#ifndef __ATOMIC_H_
18+
#define __ATOMIC_H_ 1
1919

2020
static __inline UINT64
2121
atomic_add64(UINT64 *ptr, UINT32 val)
@@ -29,4 +29,4 @@ atomic_inc64(UINT64 *ptr)
2929
return InterlockedIncrement64((LONGLONG volatile *) ptr);
3030
}
3131

32-
#endif /* __OVS_ATOMIC_H_ */
32+
#endif /* __ATOMIC_H_ */

datapath-windows/ovsext/OvsBufferMgmt.c renamed to datapath-windows/ovsext/BufferMgmt.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@
7777
*/
7878

7979
#include "precomp.h"
80-
#include "OvsSwitch.h"
80+
#include "Switch.h"
8181

8282
#ifdef OVS_DBG_MOD
8383
#undef OVS_DBG_MOD
8484
#endif
8585
#define OVS_DBG_MOD OVS_DBG_BUFMGMT
86-
#include "OvsDebug.h"
87-
#include "OvsNetProto.h"
88-
#include "OvsFlow.h"
89-
#include "OvsChecksum.h"
90-
#include "OvsPacketParser.h"
86+
#include "Debug.h"
87+
#include "NetProto.h"
88+
#include "Flow.h"
89+
#include "Checksum.h"
90+
#include "PacketParser.h"
9191

9292
/*
9393
* --------------------------------------------------------------------------

datapath-windows/ovsext/OvsBufferMgmt.h renamed to datapath-windows/ovsext/BufferMgmt.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef __OVS_BUFFER_MGMT_H_
18-
#define __OVS_BUFFER_MGMT_H_ 1
17+
#ifndef __BUFFER_MGMT_H_
18+
#define __BUFFER_MGMT_H_ 1
1919

2020
#define MEM_ALIGN MEMORY_ALLOCATION_ALIGNMENT
2121
#define MEM_ALIGN_SIZE(_x) ((MEM_ALIGN - 1 + (_x))/MEM_ALIGN * MEM_ALIGN)
@@ -121,4 +121,4 @@ NDIS_STATUS OvsSetCtxSourcePortNo(PNET_BUFFER_LIST nbl, UINT32 portNo);
121121

122122
NDIS_STATUS OvsGetCtxSourcePortNo(PNET_BUFFER_LIST nbl, UINT32 *portNo);
123123

124-
#endif /* __OVS_BUFFER_MGMT_H_ */
124+
#endif /* __BUFFER_MGMT_H_ */

datapath-windows/ovsext/OvsChecksum.c renamed to datapath-windows/ovsext/Checksum.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*/
1616

1717
#include "precomp.h"
18-
#include "OvsChecksum.h"
19-
#include "OvsFlow.h"
18+
#include "Checksum.h"
19+
#include "Flow.h"
2020

2121
#ifdef OVS_DBG_MOD
2222
#undef OVS_DBG_MOD
2323
#endif
2424
#define OVS_DBG_MOD OVS_DBG_CHECKSUM
25-
#include "OvsDebug.h"
26-
#include "OvsPacketParser.h"
25+
#include "Debug.h"
26+
#include "PacketParser.h"
2727

2828
#ifndef htons
2929
#define htons(_x) (((UINT16)(_x) >> 8) + (((UINT16)(_x) << 8) & 0xff00))

datapath-windows/ovsext/OvsChecksum.h renamed to datapath-windows/ovsext/Checksum.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef __OVS_CHECKSUM_H_
18-
#define __OVS_CHECKSUM_H_ 1
17+
#ifndef __CHECKSUM_H_
18+
#define __CHECKSUM_H_ 1
1919

2020
typedef union _OVS_PACKET_HDR_INFO *POVS_PACKET_HDR_INFO;
2121

@@ -36,4 +36,4 @@ NDIS_STATUS OvsValidateIPChecksum(PNET_BUFFER_LIST curNbl,
3636
NDIS_STATUS OvsValidateUDPChecksum(PNET_BUFFER_LIST curNbl,
3737
BOOLEAN udpCsumZero);
3838

39-
#endif /* __OVS_CHECKSUM_H_ */
39+
#endif /* __CHECKSUM_H_ */

‎datapath-windows/ovsext/Datapath.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@
2424

2525
#include "precomp.h"
2626
#include "Datapath.h"
27-
#include "OvsJhash.h"
28-
#include "OvsSwitch.h"
29-
#include "OvsVport.h"
30-
#include "OvsEvent.h"
31-
#include "OvsUser.h"
32-
#include "OvsPacketIO.h"
33-
#include "OvsNetProto.h"
34-
#include "OvsFlow.h"
35-
#include "OvsUser.h"
27+
#include "Jhash.h"
28+
#include "Switch.h"
29+
#include "Vport.h"
30+
#include "Event.h"
31+
#include "User.h"
32+
#include "PacketIO.h"
33+
#include "NetProto.h"
34+
#include "Flow.h"
35+
#include "User.h"
3636

3737
#ifdef OVS_DBG_MOD
3838
#undef OVS_DBG_MOD
3939
#endif
4040
#define OVS_DBG_MOD OVS_DBG_DATAPATH
41-
#include "OvsDebug.h"
41+
#include "Debug.h"
4242

4343
#define NETLINK_FAMILY_NAME_LEN 48
4444

‎datapath-windows/ovsext/Datapath.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
* OVS_USE_NL_INTERFACE = 1 => netlink inteface to use with ported dpif-linux.c
2222
*/
2323
#if defined OVS_USE_NL_INTERFACE && OVS_USE_NL_INTERFACE == 0
24-
#include "OvsIoctl.h"
24+
#include "Ioctl.h"
2525

2626
#else
2727

28-
#ifndef __OVS_DATAPATH_H_
29-
#define __OVS_DATAPATH_H_ 1
28+
#ifndef __DATAPATH_H_
29+
#define __DATAPATH_H_ 1
3030

3131
typedef struct _OVS_DEVICE_EXTENSION {
3232
INT numberOpenInstance;
@@ -77,6 +77,6 @@ typedef struct _OVS_MESSAGE {
7777
/* Variable length nl_attrs follow. */
7878
} OVS_MESSAGE, *POVS_MESSAGE;
7979

80-
#endif /* __OVS_DATAPATH_H_ */
80+
#endif /* __DATAPATH_H_ */
8181

8282
#endif /* OVS_USE_NL_INTERFACE */

0 commit comments

Comments
 (0)