Make the tests compilable after the latest API changes.

diff --git a/test/Makefile b/test/Makefile
index a7cb85b638b0c527582b15a92eaca84bcacf5e46..fc9a7b4d497e35f90f331e8e32539d2aed85ffcc 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -34,3 +34,6 @@ server_lf.o: server_lf.c
 client_time.o: client_time.c
 
 server_time.o: server_time.c
+
+clean:
+       rm -f *.o *~ client server client_udp server_udp client_lf server_lf client_time server_time

diff --git a/test/client.c b/test/client.c
index 2f8e87aabd8ebc7a43476d3f2104bc12b3709c00..6fdd337f830a31a540e5f632810667f6d3e74f6f 100644 (file)
--- a/test/client.c
+++ b/test/client.c
@@ -1,4 +1,4 @@
-#include "../src/kernel/swift.h"
+#include "../src/kernel/mptp.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -26,14 +26,14 @@ int main(int argc, const char *argv[])
 {
     int sock;
 
-    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT);
+    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_MPTP);
     if (sock < 0) {
         perror("Failed to create socket");
         return -1;
     }
 
-    int size = sizeof(struct sockaddr_swift) + sizeof(struct swift_dest);
-    struct sockaddr_swift *saddr = malloc(size);
+    int size = sizeof(struct sockaddr_mptp) + sizeof(struct mptp_dest);
+    struct sockaddr_mptp *saddr = malloc(size);
     memset(saddr, 0, size);
 
     saddr->count = 1;
@@ -50,8 +50,8 @@ int main(int argc, const char *argv[])
     char buf2[] = "Buffer2";
     struct iovec iov[2];
     struct msghdr msg;
-    int size2 = sizeof(struct sockaddr_swift) + 2 * sizeof(struct swift_dest);
-    struct sockaddr_swift *to = malloc(size2);
+    int size2 = sizeof(struct sockaddr_mptp) + 2 * sizeof(struct mptp_dest);
+    struct sockaddr_mptp *to = malloc(size2);
 
     memset(&msg, 0, sizeof(msg));
     memset(&iov, 0, sizeof(iov));

diff --git a/test/client_lf.c b/test/client_lf.c
index 3ce1b568fb8033b4e5cd2eb49b21e8079688737d..0a36eefa48e4e85d095ef89dcfc6617f77497b4f 100644 (file)
--- a/test/client_lf.c
+++ b/test/client_lf.c
@@ -1,4 +1,4 @@
-#include "../src/kernel/swift.h"
+#include "../src/kernel/mptp.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -15,14 +15,14 @@ int main(int argc, const char *argv[])
 {
     int sock;
 
-    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT);
+    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_MPTP);
     if (sock < 0) {
         perror("Failed to create socket");
         return -1;
     }
 
-    int size = sizeof(struct sockaddr_swift) + sizeof(struct swift_dest);
-    struct sockaddr_swift *saddr = malloc(size);
+    int size = sizeof(struct sockaddr_mptp) + sizeof(struct mptp_dest);
+    struct sockaddr_mptp *saddr = malloc(size);
     memset(saddr, 0, size);
 
     saddr->count = 1;
@@ -45,8 +45,8 @@ int main(int argc, const char *argv[])
     char buf[8192];
     struct iovec iov[2];
     struct msghdr msg;
-    int size2 = sizeof(struct sockaddr_swift) + 2 * sizeof(struct swift_dest);
-    struct sockaddr_swift *to = malloc(size2);
+    int size2 = sizeof(struct sockaddr_mptp) + 2 * sizeof(struct mptp_dest);
+    struct sockaddr_mptp *to = malloc(size2);
 
     memset(&msg, 0, sizeof(msg));
     memset(&iov, 0, sizeof(iov));

diff --git a/test/client_time.c b/test/client_time.c
index d29b7b39789f49d6b3f9b0e8a8c5139504cb89c0..f88df9f8a122b11533edc0f2f8106d2d41ffb2d4 100644 (file)
--- a/test/client_time.c
+++ b/test/client_time.c
@@ -1,4 +1,4 @@
-#include "../src/kernel/swift.h"
+#include "../src/kernel/mptp.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -26,14 +26,14 @@ int main(int argc, const char *argv[])
 {
     int sock;
 
-    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT);
+    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_MPTP);
     if (sock < 0) {
         perror("Failed to create socket");
         return -1;
     }
 
-    int size = sizeof(struct sockaddr_swift) + sizeof(struct swift_dest);
-    struct sockaddr_swift *saddr = malloc(size);
+    int size = sizeof(struct sockaddr_mptp) + sizeof(struct mptp_dest);
+    struct sockaddr_mptp *saddr = malloc(size);
     memset(saddr, 0, size);
 
     saddr->count = 1;
@@ -52,8 +52,8 @@ int main(int argc, const char *argv[])
 #define N 1
     struct iovec iov[N];
     struct msghdr msg;
-    int size2 = sizeof(struct sockaddr_swift) + N * sizeof(struct swift_dest);
-    struct sockaddr_swift *to = malloc(size2);
+    int size2 = sizeof(struct sockaddr_mptp) + N * sizeof(struct mptp_dest);
+    struct sockaddr_mptp *to = malloc(size2);
 
     memset(&msg, 0, sizeof(msg));
     memset(&iov, 0, sizeof(iov));

diff --git a/test/client_udp.c b/test/client_udp.c
index 85aab055d8cccb32a472c6b91ec381164002a8a5..1ba01d7425f668cf3860181ab0dff4d2ea648731 100644 (file)
--- a/test/client_udp.c
+++ b/test/client_udp.c
@@ -1,5 +1,3 @@
-#include "../src/kernel/swift.h"
-
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <stdio.h>

diff --git a/test/server.c b/test/server.c
index 139e89b5f96863d42a12578db12948f248079040..aa55c6938bfa496b23e251819383bdfbd5d96e10 100644 (file)
--- a/test/server.c
+++ b/test/server.c
@@ -1,4 +1,4 @@
-#include "../src/kernel/swift.h"
+#include "../src/kernel/mptp.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -20,14 +20,14 @@ int main(int argc, const char *argv[])
         return -1;
     }
 
-    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT);
+    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_MPTP);
     if (sock < 0) {
         perror("Failed to create socket");
         return -1;
     }
 
-    int size = sizeof(struct sockaddr_swift) + sizeof(struct swift_dest);
-    struct sockaddr_swift *saddr = malloc(size);
+    int size = sizeof(struct sockaddr_mptp) + sizeof(struct mptp_dest);
+    struct sockaddr_mptp *saddr = malloc(size);
     memset(saddr, 0, size);
 
     saddr->count = 1;
@@ -43,8 +43,8 @@ int main(int argc, const char *argv[])
     char buf[NUM_BUF][10240];
     struct iovec iov[NUM_BUF];
     struct msghdr msg;
-       size += (NUM_BUF - 1) * sizeof(struct swift_dest);
-    struct sockaddr_swift *from = malloc(size);
+       size += (NUM_BUF - 1) * sizeof(struct mptp_dest);
+    struct sockaddr_mptp *from = malloc(size);
 
     memset(&msg, 0, sizeof(msg));
     memset(&iov, 0, sizeof(iov));

diff --git a/test/server_lf.c b/test/server_lf.c
index 538b35297a100337b65cf20866b4b6ad5e0be1f0..0ccb4f5d64ed368c73b554b0041f0c6e1a80dd59 100644 (file)
--- a/test/server_lf.c
+++ b/test/server_lf.c
@@ -1,4 +1,4 @@
-#include "../src/kernel/swift.h"
+#include "../src/kernel/mptp.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -19,14 +19,14 @@ int main(int argc, const char *argv[])
         return -1;
     }
 
-    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT);
+    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_MPTP);
     if (sock < 0) {
         perror("Failed to create socket");
         return -1;
     }
 
-    int size = sizeof(struct sockaddr_swift) + sizeof(struct swift_dest);
-    struct sockaddr_swift *saddr = malloc(size);
+    int size = sizeof(struct sockaddr_mptp) + sizeof(struct mptp_dest);
+    struct sockaddr_mptp *saddr = malloc(size);
     memset(saddr, 0, size);
 
     saddr->count = 1;
@@ -49,7 +49,7 @@ int main(int argc, const char *argv[])
     char buf[8192];
     struct iovec iov[1];
     struct msghdr msg;
-    struct sockaddr_swift *from = malloc(size);
+    struct sockaddr_mptp *from = malloc(size);
 
     memset(&msg, 0, sizeof(msg));
     memset(&iov, 0, sizeof(iov));

diff --git a/test/server_time.c b/test/server_time.c
index 83787d8552e938800d817775219e7efcfd54d452..1829e9d96b1ef348f74f0ff2e8c1b023684f4b5d 100644 (file)
--- a/test/server_time.c
+++ b/test/server_time.c
@@ -1,4 +1,4 @@
-#include "../src/kernel/swift.h"
+#include "../src/kernel/mptp.h"
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -20,14 +20,14 @@ int main(int argc, const char *argv[])
         return -1;
     }
 
-    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT);
+    sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_MPTP);
     if (sock < 0) {
         perror("Failed to create socket");
         return -1;
     }
 
-    int size = sizeof(struct sockaddr_swift) + sizeof(struct swift_dest);
-    struct sockaddr_swift *saddr = malloc(size);
+    int size = sizeof(struct sockaddr_mptp) + sizeof(struct mptp_dest);
+    struct sockaddr_mptp *saddr = malloc(size);
     memset(saddr, 0, size);
 
     saddr->count = 1;
@@ -40,12 +40,12 @@ int main(int argc, const char *argv[])
         return -1;
     }
 
-#define N 1
+#define N 16
     char buf[N][4096];
     struct iovec iov[N];
     struct msghdr msg;
-       size += (N - 1) * sizeof(struct swift_dest);
-    struct sockaddr_swift *from = malloc(size);
+       size += (N - 1) * sizeof(struct mptp_dest);
+    struct sockaddr_mptp *from = malloc(size);
 
     memset(&msg, 0, sizeof(msg));
     memset(&iov, 0, sizeof(iov));

diff --git a/test/server_udp.c b/test/server_udp.c
index 6cdfa90ae2ed595ec87144d63d410fea54067340..1361ad3d553326533068c68f1444dc29d48e42a1 100644 (file)
--- a/test/server_udp.c
+++ b/test/server_udp.c
@@ -1,5 +1,3 @@
-#include "../src/kernel/swift.h"
-
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <stdio.h>