From aaf17ffee7553d75d35c4feca289f55ad91947b6 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 31 Aug 2014 15:26:01 +0000 Subject: [PATCH] moved incomplete interface configuration via RT-LAB to seperate branch git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@181 8ec27952-4edc-4aab-86aa-e87bb2611832 --- .../models/send_receive/include/interface.h | 13 ---------- clients/opal/models/send_receive/s2ss.mk | 2 +- .../opal/models/send_receive/src/interface.c | 26 ------------------- clients/opal/models/send_receive/src/s2ss.c | 1 - 4 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 clients/opal/models/send_receive/include/interface.h delete mode 100644 clients/opal/models/send_receive/src/interface.c diff --git a/clients/opal/models/send_receive/include/interface.h b/clients/opal/models/send_receive/include/interface.h deleted file mode 100644 index 6ed00a284..000000000 --- a/clients/opal/models/send_receive/include/interface.h +++ /dev/null @@ -1,13 +0,0 @@ -/** OPAL Interface setup - * - * @author Steffen Vogel - * @copyright 2014, Institute for Automation of Complex Power Systems, EONERC - * @file - */ - -#ifndef _INTERFACE_H_ -#define _INTERFACE_H_ - -int if_setup(const char *op, const char *iface, const char *addr); - -#endif /* _INTERFACE_H_ */ diff --git a/clients/opal/models/send_receive/s2ss.mk b/clients/opal/models/send_receive/s2ss.mk index 5af739955..3e97f6e63 100644 --- a/clients/opal/models/send_receive/s2ss.mk +++ b/clients/opal/models/send_receive/s2ss.mk @@ -51,7 +51,7 @@ INCLUDES = -I. LIBPATH = -L. CC_OPTS = LD_OPTS = -OBJS = ${PROGRAM}.o Sched.o Interface.o Socket.o +OBJS = s2ss.o msg.o sched.o socket.o ADDLIB = -lOpalCore -lOpalUtils LIBS = -lOpalAsyncApiCore $(ADDLIB) $(TARGET_LIB) diff --git a/clients/opal/models/send_receive/src/interface.c b/clients/opal/models/send_receive/src/interface.c deleted file mode 100644 index c1883cc6c..000000000 --- a/clients/opal/models/send_receive/src/interface.c +++ /dev/null @@ -1,26 +0,0 @@ -/** OPAL Interface setup - * - * @author Steffen Vogel - * @copyright 2014, Institute for Automation of Complex Power Systems, EONERC - * @file - */ - -#include "config.h" -#include "interface.h" - -int if_setup(const char *op, const char *iface, const char *addr) -{ - char cmd[256]; - - /* Setup remote address */ - snprintf(cmd, 256, "ip addr %s %s/32 dev %s", op, addr, iface); - if (system(cmd)) - OpalPrint("Failed to add local address to interface"); - - /* Setup route for single IP address */ - snprintf(cmd, 256, "ip route %s %s/32 dev %s", op, addr, iface); - if (system(cmd)) - OpalPrint("Failed to add route for remote address"); - - return 0; -} diff --git a/clients/opal/models/send_receive/src/s2ss.c b/clients/opal/models/send_receive/src/s2ss.c index e5439a728..fc2e22a3a 100644 --- a/clients/opal/models/send_receive/src/s2ss.c +++ b/clients/opal/models/send_receive/src/s2ss.c @@ -41,7 +41,6 @@ #include "config.h" #include "msg.h" #include "socket.h" -#include "interface.h" /* This is just for initializing the shared memory access to communicate * with the RT-LAB model. It's easier to remember the arguments like this */