Projekt auf neue Bibliotheksstruktur umgestellt.

.gitignore

@@ -5,10 +5,9 @@
 # *.[oa]
 # *~
 
-test/
+Debug/
+Release/
 res/
-*.ncb
-*.o
-*.txt
+install/
 *.user
-Visual Studio 2008/
+*.bak

CppTest/CppTest.pro

@@ -0,0 +1,32 @@
+TEMPLATE = app
+CONFIG += console c++11
+CONFIG -= app_bundle
+CONFIG -= qt
+
+QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter -Wno-unused-but-set-variable
+QMAKE_CXXFLAGS += -Wstrict-aliasing=0
+QMAKE_LIBS += -lm -lstdc++ -pthread
+
+CONFIG(debug, debug|release) {
+	QMAKE_CXXFLAGS -= -Os
+	QMAKE_CFLAGS -= -Os
+    QMAKE_CXXFLAGS += -D_DEBUG
+    QMAKE_CFLAGS += -D_DEBUG
+    QMAKE_LIBS += -lgfanetd
+}
+
+CONFIG(release, debug|release) {
+    QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-unused-but-set-variable
+    QMAKE_CFLAGS += -Wno-unused-parameter -Wno-unused-but-set-variable
+    QMAKE_LIBS += -lgfanet
+}
+
+SOURCES += main.cpp
+
+#INCLUDEPATH += ../../../libgfanet
+#message($$OUT_PWD)
+
+linux-buildroot-g++ {
+    target.path = /opt/GfA/net
+    INSTALLS += target
+}

CppTest/main.cpp

@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include <gfa/gfanet.h>
+
+
+int main(int argc, char **argv)
+{
+//	char szIn[256];
+//	scanf("%s\n", szIn);
+//	printf("%s\n", szIn);
+	
+	int nRet = 0;
+	NETINTERFACE_LIST nil;
+	ETC_NETWORK_INTERFACES eni;
+	GetAvailableInterfaces(nil);
+	ParseEtcNetworkInterfaces(eni);
+//	WriteEtcNetworkInterfaces(eni, "/home/wrk/share/gfanet/libgfanet/res/interfaces.new");
+    WriteEtcNetworkInterfaces(eni, "/opt/GfA/net/interfaces.new");
+/*
+//	FILE *fp = popen("/sbin/ifdown eth1", "w");
+	FILE *fp = popen("/sbin/ifup eth1", "w");
+	if(fp)
+	{
+		nRet = pclose(fp);
+	}
+*/
+     return nRet;
+}

buildall.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+set -e
+set -o pipefail
+
+#########################################################################################
+#########################################################################################
+#########################################################################################
+
+CWD=$(pwd)
+MAKE=/usr/bin/make
+PROJ=/home/wrk/share/gfanet/gfanet.pro
+CRTINST=/home/wrk/share/gfalibtools/create.sh
+INSTDIR=$CWD/install
+
+rm -f $INSTDIR/*.sh
+
+#########################################################################################
+#########################################################################################
+#########################################################################################
+# Desktop
+
+QMAKE=/home/wrk/Qt5.7.0/5.7/gcc_64/bin/qmake
+SPEC=linux-g++
+
+#########################################################################################
+# Debug
+
+BUILDDIR=Debug/Desktop_Qt_5_7_1_GCC_64bit
+mkdir -p $BUILDDIR
+cd $BUILDDIR
+$QMAKE $PROJ -spec $SPEC CONFIG+=debug CONFIG+=qml_debug && $MAKE qmake_all
+$MAKE clean -j2
+$MAKE -j2
+sudo $MAKE install
+$CRTINST $(pwd) $CWD debug $SPEC
+cd $CWD
+
+#########################################################################################
+# Release
+
+BUILDDIR=Release/Desktop_Qt_5_7_1_GCC_64bit
+mkdir -p $BUILDDIR
+cd $BUILDDIR
+$QMAKE $PROJ -spec $SPEC && $MAKE qmake_all
+$MAKE clean -j2
+$MAKE -j2
+sudo $MAKE install
+$CRTINST $(pwd) $CWD release $SPEC
+cd $CWD
+
+#########################################################################################
+#########################################################################################
+#########################################################################################
+# Sitara
+
+QMAKE=/opt/GfA/TC_L44104_C493_QT57/usr/bin/qmake
+SPEC=devices/linux-buildroot-g++
+
+#########################################################################################
+# Debug
+
+BUILDDIR=Debug/Sitara_1
+mkdir -p $BUILDDIR
+cd $BUILDDIR
+$QMAKE $PROJ -spec $SPEC CONFIG+=debug CONFIG+=qml_debug && $MAKE qmake_all
+$MAKE clean -j2
+$MAKE -j2
+$MAKE install_toolchain
+$CRTINST $(pwd) $CWD debug $SPEC
+cd $CWD
+
+#########################################################################################
+# Release
+
+BUILDDIR=Release/Sitara_1
+mkdir -p $BUILDDIR
+cd $BUILDDIR
+$QMAKE $PROJ -spec $SPEC && $MAKE qmake_all
+$MAKE clean -j2
+$MAKE -j2
+$MAKE install_toolchain
+$CRTINST $(pwd) $CWD release $SPEC
+cd $CWD

gfanet.pro

@@ -0,0 +1,115 @@
+TEMPLATE = lib
+VERSION = 1.0
+CONFIG += c++11 shared thread
+CONFIG -= qt app_bundle
+
+####################################################################################
+
+SOURCES += \
+    src/gfanet.cpp \
+    src/interfaces.cpp \
+    src/inet4s.cpp \
+    src/inet4d.cpp \
+    src/inet4m.cpp \
+    src/util.cpp
+
+HEADERS += \
+    src/gfanet.h \
+    src/interfaces.h \
+    src/inet4s.h \
+    src/inet4d.h \
+    src/inet4m.h \
+    src/util.h
+
+####################################################################################
+
+GFA_LIB_PATH = /usr/lib/gfa
+GFA_INC_PATH = /usr/include/gfa
+QMAKE_RPATHLINKDIR += $$[QT_SYSROOT]$$GFA_LIB_PATH
+QMAKE_RPATHDIR += $$GFA_LIB_PATH
+QMAKE_DEL_DIR = rmdir --ignore-fail-on-non-empty
+QMAKE_LN_SHLIB = :
+
+####################################################################################
+
+CONFIG(debug, debug|release) {
+    QMAKE_CXXFLAGS -= -Os
+    QMAKE_CFLAGS -= -Os
+    QMAKE_CXXFLAGS += -D_DEBUG
+    QMAKE_CFLAGS += -D_DEBUG
+	TARGET = $$join(TARGET,,,d)
+}
+
+####################################################################################
+
+target.path = $$GFA_LIB_PATH
+INSTALLS += target
+
+####################################################################################
+
+linux-g++ {
+	includes.path = $$GFA_INC_PATH
+	includes.extra += -$(INSTALL_FILE) $$PWD/src/gfanet.h $(INSTALL_ROOT)$$includes.path
+	includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/interfaces.h $(INSTALL_ROOT)$$includes.path
+	includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/inet4s.h $(INSTALL_ROOT)$$includes.path
+	includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/inet4d.h $(INSTALL_ROOT)$$includes.path
+	includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/inet4m.h $(INSTALL_ROOT)$$includes.path
+	includes.uninstall += -$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfanet.h
+	includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/interfaces.h
+	includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/inet4s.h
+	includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/inet4d.h
+	includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/inet4m.h
+	INSTALLS += includes
+}
+
+####################################################################################
+
+linux-buildroot-g++ {
+	exists($$[QT_SYSROOT]) {
+		library.path = $$[QT_SYSROOT]$$target.path
+		library.extra += -$(INSTALL_PROGRAM) $(TARGET) $(INSTALL_ROOT)$$library.path/$(TARGET)
+		library.extra += $$escape_expand(\\n\\t)-$(SYMLINK) $(TARGET) $(INSTALL_ROOT)$$library.path/$(TARGET0)
+		library.extra += $$escape_expand(\\n\\t)-$(SYMLINK) $(TARGET) $(INSTALL_ROOT)$$library.path/$(TARGET1)
+		library.extra += $$escape_expand(\\n\\t)-$(SYMLINK) $(TARGET) $(INSTALL_ROOT)$$library.path/$(TARGET2)
+		library.uninstall += -$(DEL_FILE) $(INSTALL_ROOT)$$library.path/$(TARGET)
+		library.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$library.path/$(TARGET0)
+		library.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$library.path/$(TARGET1)
+		library.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$library.path/$(TARGET2)
+		INSTALLS += library
+
+		includes.path = $$[QT_SYSROOT]$$GFA_INC_PATH
+		includes.extra += -$(INSTALL_FILE) $$PWD/src/gfanet.h $(INSTALL_ROOT)$$includes.path
+		includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/interfaces.h $(INSTALL_ROOT)$$includes.path
+		includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/inet4s.h $(INSTALL_ROOT)$$includes.path
+		includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/inet4d.h $(INSTALL_ROOT)$$includes.path
+		includes.extra += $$escape_expand(\\n\\t)-$(INSTALL_FILE) $$PWD/src/inet4m.h $(INSTALL_ROOT)$$includes.path
+		includes.uninstall += -$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/gfanet.h
+		includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/interfaces.h
+		includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/inet4s.h
+		includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/inet4d.h
+		includes.uninstall += $$escape_expand(\\n\\t)-$(DEL_FILE) $(INSTALL_ROOT)$$includes.path/inet4m.h
+		INSTALLS += includes
+
+		itoolchain.target = install_toolchain
+		itoolchain.depends = install_library install_includes
+		QMAKE_EXTRA_TARGETS += itoolchain
+
+		utoolchain.target = uninstall_toolchain
+		utoolchain.depends = uninstall_library uninstall_includes
+		QMAKE_EXTRA_TARGETS += utoolchain
+	}
+    QMAKE_CXXFLAGS += -D_TARGET_BUILD
+    QMAKE_CFLAGS += -D_TARGET_BUILD
+}
+
+####################################################################################
+
+deploylib.target = deploylib
+deploylib.commands = @echo BASENAME="$(QMAKE_TARGET)" > deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo TARGET="$(TARGET)" >> deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo TARGET0="$(TARGET0)" >> deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo TARGET1="$(TARGET1)" >> deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo TARGET2="$(TARGET2)" >> deploytargets
+deploylib.commands += $$escape_expand(\\n\\t)@echo HEADERS="\\\"gfanet.h interfaces.h inet4s.h inet4d.h inet4m.h\\\"" >> deploytargets
+PRE_TARGETDEPS += deploylib
+QMAKE_EXTRA_TARGETS += deploylib

libgfanet/.gitignore

@@ -1,11 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-
-Debug/
-Release/
-res/
-*.user

libgfanet/deploy.sh

@@ -1,80 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-# install gfanet "%{CurrentBuild:Type}" "%{CurrentKit:Name}" "%{SysRoot:FilePath}" "%{sourceDir}"
-# clean gfanet "%{CurrentBuild:Type}" "%{CurrentKit:Name}" "%{SysRoot:FilePath}" "%{sourceDir}"
-# deploy gfanet "%{CurrentBuild:Type}" "%{CurrentKit:Name}" "%{SysRoot:FilePath}" "%{sourceDir}" "%{CurrentDevice:HostAddress}" "%{CurrentDevice:UserName}" "root"
-
-COMMAND=$1
-LIB_BASE=$2
-BUILD_TYPE=$3
-KIT_NAME=$4
-SYS_ROOT=$5
-SRC_DIR=$6
-
-#echo $SRC_DIR
-#exit 0
-
-if [ "$BUILD_TYPE" == "debug" ]; then
-	LIB_NAME="lib"$LIB_BASE"d.so"
-elif [ "$BUILD_TYPE" == "release" ]; then
-	LIB_NAME="lib"$LIB_BASE".so"
-else
-	echo "Invalid Build-type: "$BUILD_TYPE
-	exit 1
-fi
-
-if [ "$KIT_NAME" == "Desktop Qt 5.7.0 GCC 64bit" ]; then
-	LIB_PREFIX=$SYS_ROOT"/usr/lib"
-	INC_PREFIX=$SYS_ROOT"/usr/include/gfa"
-elif [ "$KIT_NAME" == "GfA-Device" ]; then
-	LIB_PREFIX=$SYS_ROOT"/usr/lib"
-	INC_PREFIX=$SYS_ROOT"/usr/include/gfa"
-else
-	echo "Invalid Kit-name: "$KIT_NAME
-	exit 1
-fi
-
-LIB_TARGET=$LIB_NAME".1.0.0"
-LIB_LINK0=$LIB_NAME
-LIB_LINK1=$LIB_NAME".1"
-
-if [ "$COMMAND" == "deploy" ]; then
-	HOST=$7
-	USER=$8@$HOST
-	PASS=$9
-#	echo pscp -pw $PASS $LIB_NAME $USER:/usr/lib/$LIB_TARGET
-	pscp -pw $PASS $LIB_NAME $USER:/usr/lib/$LIB_TARGET > /dev/null
-	plink -batch -t -pw $PASS $USER ln -sfn /usr/lib/$LIB_TARGET /usr/lib/$LIB_LINK0
-	plink -batch -t -pw $PASS $USER ln -sfn /usr/lib/$LIB_TARGET /usr/lib/$LIB_LINK1
-	exit 0
-fi
-
-if [ ! -d "$INC_PREFIX" ]; then
-	sudo mkdir -p "$INC_PREFIX"
-fi
-
-if [ -f $LIB_PREFIX/$LIB_LINK0 ]; then
-	sudo rm -f $LIB_PREFIX/$LIB_LINK0
-fi
-if [ -f $LIB_PREFIX/$LIB_LINK1 ]; then
-	sudo rm -f $LIB_PREFIX/$LIB_LINK1
-fi
-if [ -f $LIB_PREFIX/$LIB_TARGET ]; then
-	sudo rm -f $LIB_PREFIX/$LIB_TARGET
-fi
-
-if [ "$COMMAND" == "clean" ]; then
-	sudo rm -f $LIB_PREFIX/$LIB_LINK0
-	sudo rm -f $LIB_PREFIX/$LIB_LINK1
-	sudo rm -f $LIB_PREFIX/$LIB_TARGET
-	sudo rm -f "$INC_PREFIX/gfanet.h" "$INC_PREFIX/interfaces.h" "$INC_PREFIX/inet4s.h" "$INC_PREFIX/inet4d.h" "$INC_PREFIX/inet4m.h"
-fi
-
-if [ "$COMMAND" == "install" ]; then
-	sudo cp $LIB_NAME $LIB_PREFIX/$LIB_TARGET
-	sudo ln -s $LIB_PREFIX/$LIB_TARGET $LIB_PREFIX/$LIB_LINK0
-	sudo ln -s $LIB_PREFIX/$LIB_TARGET $LIB_PREFIX/$LIB_LINK1
-	sudo cp -f "$SRC_DIR/gfanet.h" "$SRC_DIR/interfaces.h" "$SRC_DIR/inet4s.h" "$SRC_DIR/inet4d.h" "$SRC_DIR/inet4m.h" "$INC_PREFIX"
-fi

libgfanet/libgfanet.pro

@@ -1,38 +0,0 @@
-TEMPLATE = lib
-TARGET = gfanet
-CONFIG += plugin c++11
-CONFIG -= app_bundle
-CONFIG -= qt
-
-CONFIG(debug, debug|release) {
-    QMAKE_CXXFLAGS -= -Os
-    QMAKE_CFLAGS -= -Os
-    QMAKE_CXXFLAGS += -D_DEBUG
-    QMAKE_CFLAGS += -D_DEBUG
-	TARGET = gfanetd
-}
-
-# Input
-SOURCES += \
-    gfanet.cpp \
-    util.cpp \
-    interfaces.cpp \
-    inet4s.cpp \
-    inet4d.cpp \
-    inet4m.cpp
-
-HEADERS += \
-    gfanet.h \
-    util.h \
-    interfaces.h \
-    inet4s.h \
-    inet4d.h \
-    inet4m.h
-
-linux-buildroot-g++ {
-#	target.path = /usr/lib/lib$${TARGET}.so.1.0.0
-#	INSTALLS += target
-}
-
-#message($$[QT_INSTALL_QML])
-#message($$qtLibraryTarget($$TARGET))

libnetinterfaces/libnetinterfaces.pro

@@ -1,8 +1,19 @@
 TEMPLATE = lib
 TARGET = netinterfaces
-QT += sql qml
+QT += qml
 CONFIG += qt plugin c++11
 
+PDUMP="/home/wrk/Qt5.7.0/5.7/gcc_64/bin/qmlplugindump"
+VERSION=1.0
+PDUMPFILE=net.qmltypes
+IMPORTPATH="/home/wrk/Qt5.7.0/5.7/gcc_64/qml"
+URI = gfa.plugins.qml.net
+
+QMAKE_LIBDIR += $$[QT_SYSROOT]/usr/lib/gfa
+QMAKE_RPATHLINKDIR += $$[QT_SYSROOT]/usr/lib/gfa
+QMAKE_RPATHDIR += /usr/lib/gfa
+QMAKE_DEL_DIR = rmdir --ignore-fail-on-non-empty
+
 CONFIG(debug, debug|release) {
     QMAKE_CXXFLAGS -= -Os
     QMAKE_CFLAGS -= -Os
@@ -15,11 +26,6 @@ CONFIG(release, debug|release) {
     QMAKE_LIBS += -lgfanet -lgfaipc
 }
 
-#TARGET = $$qtLibraryTarget($$TARGET)
-#message($$TARGET)
-uri = gfa.plugins.qml.net
-
-# Input
 SOURCES += \
     netinterfaces.cpp \
     netinterfaces_plugin.cpp
@@ -28,24 +34,28 @@ HEADERS += \
     netinterfaces.h \
     netinterfaces_plugin.h
 
-DISTFILES = qmldir
-#DISTFILES += gfa.plugins.qml.net.qmltypes
+copy_qmldir.target = $$OUT_PWD/qmldir
+copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
+copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
+QMAKE_EXTRA_TARGETS += copy_qmldir
+PRE_TARGETDEPS += $$copy_qmldir.target
 
-!equals(_PRO_FILE_PWD_, $$OUT_PWD)
-{
-    copy_qmldir.target = $$OUT_PWD/qmldir
-    copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
-    copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
-    QMAKE_EXTRA_TARGETS += copy_qmldir
-    PRE_TARGETDEPS += $$copy_qmldir.target
+installPath = $$[QT_INSTALL_QML]/$$replace(URI, \\., /)
+USER_GROUP = $$system(stat -c "%U:%G" $$[QT_INSTALL_QML])
+
+qmldir.path = $$installPath
+qmldir.extra += -$(INSTALL_FILE) qmldir $$installPath
+qmldir.uninstall += -$(DEL_FILE) $$installPath/qmldir
+
+pdump.path = $$installPath
+linux-g++ {
+	pdump.extra += "$$PDUMP" -v "$$URI" "$$VERSION" "$$IMPORTPATH" > "$$installPath/$$PDUMPFILE"
 }
+pdump.extra += $$escape_expand(\\n\\t)chown -R $$USER_GROUP $$installPath
 
-qmldir.files = qmldir
+linux-g++ {
+	pdump.uninstall += -$(DEL_FILE) $$installPath/$$PDUMPFILE
+}
 
-#unix {
-    installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-    qmldir.path = $$installPath
-    target.path = $$installPath
-    INSTALLS += target qmldir
-#    message($${installPath})
-#}
+target.path = $$installPath
+INSTALLS += target qmldir pdump

libnetinterfaces/netinterfaces.cpp

@@ -1,6 +1,6 @@
 #include <signal.h>
 #include "netinterfaces.h"
-#include "../debug.h"
+#include "debug.h"
 
 #ifndef _countof
 #define _countof(a)					(sizeof(a) / sizeof(*a))

libnetinterfaces/netinterfaces.h

@@ -9,7 +9,7 @@
 #include <QList>
 #include <QQmlListProperty>
 #include <qqmlparserstatus.h>
-#include "../../gfaipc/src/mutex.h"
+#include <gfa/mutex.h>
 #include <gfa/gfanet.h>
 
 /////////////////////////////////////////////////////////////////////////////

libnetinterfaces/pdump.sh

@@ -10,7 +10,7 @@ OUTFILE="/home/wrk/Qt5.7.0/5.7/gcc_64/qml/gfa/plugins/qml/net/net.qmltypes"
 IMPORTPATH="/home/wrk/Qt5.7.0/5.7/gcc_64/qml/gfa/plugins/qml/net"
 
 # Target:
-#OUTFILE="/opt/GfA/TC_L312_C493_QT57/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/qml/gfa/plugins/qml/net/net.qmltypes"
-#IMPORTPATH="/opt/GfA/TC_L312_C493_QT57/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/qml/gfa/plugins/qml/net"
+#OUTFILE="$SITARA_TOOLCHAIN_ROOT/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/qml/gfa/plugins/qml/net/net.qmltypes"
+#IMPORTPATH="$SITARA_TOOLCHAIN_ROOT/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/qml/gfa/plugins/qml/net"
 
 $PDUMP $URI $VERSION $IMPORTPATH > $OUTFILE

src/debug.h

@@ -0,0 +1,28 @@
+// debug.h :
+//
+
+#if !defined(AGD_DEBUG_H__39391BF3_0394_4846_BFCB_028512359FF5__INCLUDED_)
+#define AGD_DEBUG_H__39391BF3_0394_4846_BFCB_028512359FF5__INCLUDED_
+
+#include <assert.h>
+#include <stdio.h>
+
+/////////////////////////////////////////////////////////////////////////////
+// debug.h - Declarations:
+
+#ifdef _DEBUG
+#define TRACE(...)					printf(__VA_ARGS__), fflush(stdout)
+#define ETRACE(...)					fprintf(stderr, __VA_ARGS__), fflush(stderr)
+#define ASSERT						assert
+#else	//	_DEBUG
+#define TRACE(...)					(void)0
+#define ETRACE(...)					(void)0
+#define ASSERT(e)					(void)0
+#endif	//	_DEBUG
+
+#ifndef UNUSED
+#define UNUSED(p)					(void)p
+#endif	//	UNUSED
+
+/////////////////////////////////////////////////////////////////////////////
+#endif	//	!defined(AGD_DEBUG_H__39391BF3_0394_4846_BFCB_028512359FF5__INCLUDED_)

libgfanet/gfanet.h → src/gfanet.h

@@ -44,6 +44,7 @@ typedef struct _NETINTERFACE
 	NETINTERFACE_STATS stats;
 }NETINTERFACE, *LPNETINTERFACE;
 typedef const NETINTERFACE *LPCNETINTERFACE;
+
 typedef std::vector<NETINTERFACE> NETINTERFACE_LIST;
 
 /////////////////////////////////////////////////////////////////////////////

libgfanet/interfaces.cpp → src/interfaces.cpp

@@ -6,10 +6,10 @@
 #include <poll.h>
 #include "util.h"
 #include "interfaces.h"
-#include "../debug.h"
+#include "debug.h"
 
 #define _ETC_NETWORK_INTERFACES			"/etc/network/interfaces"
-//#define _ETC_NETWORK_INTERFACES			"/home/wrk/share/gfanet/libgfanet/res/interfaces"
+//#define _ETC_NETWORK_INTERFACES			"/home/wrk/share/gfanet/gfanet/res/interfaces"
 
 unsigned long g_nItfID = 0;