From 34a80b6097950ce3a769c65f70fc917c6c6c5db6 Mon Sep 17 00:00:00 2001 From: Adrian Bondrescu Date: Sun, 24 Jun 2012 11:32:48 +0300 Subject: [PATCH] Rename swift.* files to mptp.* --- src/kernel/Kbuild | 2 +- src/kernel/{swift.c => mptp.c} | 2 +- src/kernel/mptp.h | 15 +++++++-------- src/kernel/swift.h | 31 ------------------------------- 4 files changed, 9 insertions(+), 41 deletions(-) rename src/kernel/{swift.c => mptp.c} (99%) delete mode 100644 src/kernel/swift.h diff --git a/src/kernel/Kbuild b/src/kernel/Kbuild index cddb47c..57f5e50 100644 --- a/src/kernel/Kbuild +++ b/src/kernel/Kbuild @@ -1,3 +1,3 @@ EXTRA_CFLAGS = -g -obj-m = swift.o +obj-m = mptp.o diff --git a/src/kernel/swift.c b/src/kernel/mptp.c similarity index 99% rename from src/kernel/swift.c rename to src/kernel/mptp.c index ba0776b..6f1bddb 100644 --- a/src/kernel/swift.c +++ b/src/kernel/mptp.c @@ -5,7 +5,7 @@ #include #include -#include "swift.h" +#include "mptp.h" #include "debug.h" MODULE_DESCRIPTION("Multi-Party Transport Protocol"); diff --git a/src/kernel/mptp.h b/src/kernel/mptp.h index b837617..59c5b17 100644 --- a/src/kernel/mptp.h +++ b/src/kernel/mptp.h @@ -4,27 +4,26 @@ #define IPPROTO_MPTP 137 #define MIN_MPTP_PORT 1 -#define MAX_MPTP_PORT 65536 +#define MAX_MPTP_PORT 256 #ifndef __KERNEL__ #include #endif struct mptp_dest { - uint32_t addr; - uint16_t port; - uint16_t bytes; + uint32_t addr; + uint8_t port; }; struct sockaddr_mptp { - int count; - struct mptp_dest dests[0]; + int count; + struct mptp_dest dests[0]; }; #ifdef __KERNEL__ struct mptphdr { - uint16_t src; - uint16_t dst; + uint8_t src; + uint8_t dst; __be16 len; }; #endif diff --git a/src/kernel/swift.h b/src/kernel/swift.h deleted file mode 100644 index 59c5b17..0000000 --- a/src/kernel/swift.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _MPTP_H -#define _MPTP_H - -#define IPPROTO_MPTP 137 - -#define MIN_MPTP_PORT 1 -#define MAX_MPTP_PORT 256 - -#ifndef __KERNEL__ -#include -#endif - -struct mptp_dest { - uint32_t addr; - uint8_t port; -}; - -struct sockaddr_mptp { - int count; - struct mptp_dest dests[0]; -}; - -#ifdef __KERNEL__ -struct mptphdr { - uint8_t src; - uint8_t dst; - __be16 len; -}; -#endif - -#endif -- 2.20.1