From 3811e6579c9e3e735daba624d5939223f1279c13 Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Sun, 25 Oct 2015 13:09:38 +0100
Subject: [PATCH] Get it compiling and linking on Linux.
---
gtests/net/packetdrill/Makefile.Linux | 2 +-
gtests/net/packetdrill/run_system_call.c | 18 ++++++++++--------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/gtests/net/packetdrill/Makefile.Linux b/gtests/net/packetdrill/Makefile.Linux
index 371e5ff3..964c8e76 100644
--- a/gtests/net/packetdrill/Makefile.Linux
+++ b/gtests/net/packetdrill/Makefile.Linux
@@ -1,2 +1,2 @@
-packetdrill-ext-libs := -lpthread -lrt
+packetdrill-ext-libs := -lpthread -lrt -lsctp
include Makefile.common
diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c
index 4dcd2469..f85ce8f5 100644
--- a/gtests/net/packetdrill/run_system_call.c
+++ b/gtests/net/packetdrill/run_system_call.c
@@ -414,7 +414,7 @@ static int get_sockstorage_arg(struct expression *arg, struct sockaddr_storage *
}
#endif
-#if defined(__FreeBSD__) || defined(__Linux__)
+#if defined(__FreeBSD__) || defined(linux)
int check_u8_expr(struct expression *expr, u8 value, char *val_name, char **error) {
if (expr->type != EXPR_ELLIPSIS) {
u8 script_val;
@@ -431,7 +431,7 @@ int check_u8_expr(struct expression *expr, u8 value, char *val_name, char **erro
}
#endif
-#if defined(__FreeBSD__) || defined(__Linux__)
+#if defined(__FreeBSD__) || defined(linux)
int check_u16_expr(struct expression *expr, u16 value, char *val_name, char **error) {
if (expr->type != EXPR_ELLIPSIS) {
u16 script_val;
@@ -463,7 +463,7 @@ int check_s32_expr(struct expression *expr, s16 value, char *val_name, char **er
return STATUS_OK;
}
-#if defined(__FreeBSD__) || defined(__Linux__)
+#if defined(__FreeBSD__) || defined(linux)
int check_u32_expr(struct expression *expr, u16 value, char *val_name, char **error) {
if (expr->type != EXPR_ELLIPSIS) {
u32 script_val;
@@ -2804,7 +2804,7 @@ error_out:
static int syscall_sctp_sendmsg(struct state *state, struct syscall_spec *syscall,
struct expression_list *args, char **error)
{
-#if defined(__FreeBSD__) || defined(__Linux__)
+#if defined(__FreeBSD__) || defined(linux)
int result, script_fd, live_fd, len;
void *msg = NULL;
struct sockaddr_storage to;
@@ -2884,7 +2884,7 @@ static int syscall_sctp_sendmsg(struct state *state, struct syscall_spec *syscal
#endif
}
-#if defined(__FreeBSD__) || defined(__Linux__)
+#if defined(__FreeBSD__) || defined(linux)
static int check_sctp_sndrcvinfo(struct sctp_sndrcvinfo_expr *expr,
struct sctp_sndrcvinfo *sctp_sndrcvinfo,
char** error) {
@@ -2993,7 +2993,7 @@ static int syscall_sctp_recvmsg(struct state *state, struct syscall_spec *syscal
struct expression_list *args,
char **error)
{
-#if defined(__FreeBSD__) || defined(__Linux__)
+#if defined(__FreeBSD__) || defined(linux)
int script_fd, live_fd, live_msg_flags, result;
void *msg;
u32 len;
@@ -3356,7 +3356,7 @@ static int check_sctp_shutdown_event(struct sctp_shutdown_event_expr *expr,
}
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(linux)
static int check_sctp_sender_dry_event(struct sctp_sender_dry_event_expr *expr,
struct sctp_sender_dry_event *sctp_event,
char **error) {
@@ -3378,7 +3378,7 @@ static int check_sctp_sender_dry_event(struct sctp_sender_dry_event_expr *expr,
}
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__)
static int check_sctp_send_failed_event(struct sctp_send_failed_event_expr *expr,
struct sctp_send_failed_event *sctp_event,
char **error) {
@@ -3436,12 +3436,14 @@ static int check_sctp_notification(struct iovec *iov,
error))
return STATUS_ERR;
break;
+#if defined(__FreeBSD__)
case EXPR_SCTP_SEND_FAILED_EVENT:
if (check_sctp_send_failed_event(script_iov_base->value.sctp_send_failed_event,
(struct sctp_send_failed_event *) iov->iov_base,
error))
return STATUS_ERR;
break;
+#endif
case EXPR_ELLIPSIS:
break;
default:
--
GitLab