From 3f282a5a9ec02ab58fef9ed106c1b3b4275499c7 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
Date: Thu, 19 May 2016 14:00:30 +0200
Subject: [PATCH] updated AsyncIP to RT-LAB 11, removed some warnings  and
 fixed a typo

---
 clients/opal/udp/models/send_receive/s2ss.mk  | 28 +++++++++++++------
 .../opal/udp/models/send_receive/src/s2ss.c   |  4 +--
 .../opal/udp/models/send_receive/src/socket.c |  2 ++
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/clients/opal/udp/models/send_receive/s2ss.mk b/clients/opal/udp/models/send_receive/s2ss.mk
index b2b20b766..d285033b4 100644
--- a/clients/opal/udp/models/send_receive/s2ss.mk
+++ b/clients/opal/udp/models/send_receive/s2ss.mk
@@ -1,17 +1,26 @@
+# ----------------------------------------------------------------------------#
 # Specify program name
-PROGRAM = AsyncIP
+PROGRAM = s2ss
 
+# ----------------------------------------------------------------------------#
 # Specify default values if we are not compiling from RT-LAB
+#
+# ----------------------------------------------------------------------------#
 TARGET_OPALRT_ROOT = /usr/opalrt
 
+# ----------------------------------------------------------------------------#
 # QNX v6.x
+#
 ifeq "$(SYSNAME)" "nto"
 	CC = gcc
 	LD = $(CC)
 	TARGET_LIB = -lsocket
 endif
+# ----------------------------------------------------------------------------#
 
+# ----------------------------------------------------------------------------#
 # RedHawk Linux
+#
 ifeq "$(shell uname)" "Linux"
 	RTLAB_INTEL_COMPILER ?= 1
 
@@ -37,6 +46,7 @@ ifeq "$(shell uname)" "Linux"
 
 	TARGET_LIB = -lpthread -lm -ldl -lutil -lrt $(RH_LIBS) $(INTEL_LIBS)
 endif
+# ----------------------------------------------------------------------------#
 
 # Support for debugging symbols
 ifeq ($(DEBUG),1)
@@ -48,16 +58,16 @@ else
 endif
 
 INCLUDES = -I. 
-LIBPATH  = -L. 
-CC_OPTS = -std=c99
-LD_OPTS = 
-OBJS = s2ss.o msg.o utils.o socket.o
+LIBPATH  = -L. $(OPAL_LIBPATH)
+CC_OPTS  = -std=c99
+LD_OPTS  = 
+OBJS     = s2ss.o msg.o utils.o socket.o
 
-ADDLIB = -lOpalCore -lOpalUtils
-LIBS   = -lOpalAsyncApiCore $(ADDLIB) $(TARGET_LIB)
+ADDLIB   = -lOpalCore -lOpalUtils
+LIBS     = -lOpalAsyncApiCore $(ADDLIB) $(TARGET_LIB) $(OPAL_LIBS)
 
-CFLAGS  = -c $(CC_OPTS) $(CC_DEBUG_OPTS) $(RH_FLAGS) $(INCLUDES)
-LDFLAGS = $(LD_OPTS) $(LD_DEBUG_OPTS) $(LIBPATH)
+CFLAGS   = -c $(CC_OPTS) $(CC_DEBUG_OPTS) $(RH_FLAGS) $(INCLUDES)
+LDFLAGS  = $(LD_OPTS) $(LD_DEBUG_OPTS) $(LIBPATH)
 
 all: $(PROGRAM)
 
diff --git a/clients/opal/udp/models/send_receive/src/s2ss.c b/clients/opal/udp/models/send_receive/src/s2ss.c
index 9e88a2eac..d48922534 100644
--- a/clients/opal/udp/models/send_receive/src/s2ss.c
+++ b/clients/opal/udp/models/send_receive/src/s2ss.c
@@ -23,10 +23,10 @@
 #include <unistd.h>
 #include <signal.h>
 #include <time.h>
+#include <pthread.h>
 
 #if defined(__QNXNTO__)
   #include <process.h>
-  #include <pthread.h>
   #include <devctl.h>
   #include <sys/dcmd_chr.h>
 #elif defined(__linux__)
@@ -138,7 +138,7 @@ static void *SendToIPPort(void *arg)
 
 		msg.sequence = seq++;
 		msg.ts.sec = now.tv_sec;
-		msg.ts.nsec = now.tc_nsec;
+		msg.ts.nsec = now.tv_nsec;
 
 		/* Perform the actual write to the ip port */
 		if (SendPacket((char *) &msg, MSG_LEN(&msg)) < 0)
diff --git a/clients/opal/udp/models/send_receive/src/socket.c b/clients/opal/udp/models/send_receive/src/socket.c
index 59fc2e0c4..298404a51 100644
--- a/clients/opal/udp/models/send_receive/src/socket.c
+++ b/clients/opal/udp/models/send_receive/src/socket.c
@@ -16,9 +16,11 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 /* Define RTLAB before including OpalPrint.h for messages to be sent
  * to the OpalDisplay. Otherwise stdout will be used. */