diff options
31 files changed, 1221 insertions, 30 deletions
@@ -10,5 +10,7 @@ debug .project .cproject .metadata -Makefile -Makefile.* +/Makefile +/Makefile.* +/src/Makefile +/src/Makefile.* diff --git a/workspace/LogReceiver/LogReceiver b/workspace/LogReceiver/LogReceiver Binary files differindex 8ada72f..bf4036a 100755 --- a/workspace/LogReceiver/LogReceiver +++ b/workspace/LogReceiver/LogReceiver diff --git a/workspace/LogReceiver/Makefile b/workspace/LogReceiver/Makefile new file mode 100644 index 0000000..cd541af --- /dev/null +++ b/workspace/LogReceiver/Makefile @@ -0,0 +1,278 @@ +############################################################################# +# Makefile for building: LogReceiver +# Generated by qmake (2.01a) (Qt 4.7.2) on: Wed Aug 24 10:11:58 2011 +# Project: LogReceiver.pro +# Template: app +# Command: /usr/local/Trolltech/QtEmbedded-4.7.2/bin/qmake -o Makefile LogReceiver.pro +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/qws/linux-x86-g++ -I. -I/usr/local/Trolltech/QtEmbedded-4.7.2/include/QtCore -I/usr/local/Trolltech/QtEmbedded-4.7.2/include/QtNetwork -I/usr/local/Trolltech/QtEmbedded-4.7.2/include/QtGui -I/usr/local/Trolltech/QtEmbedded-4.7.2/include -I../customdhcpcd/src -I. -I. +LINK = g++ +LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/local/Trolltech/QtEmbedded-4.7.2/lib +LIBS = $(SUBLIBS) -L/usr/local/Trolltech/QtEmbedded-4.7.2/lib -lsysfs -lQtGui -L/usr/local/Trolltech/QtEmbedded-4.7.2/lib -lQtNetwork -lQtCore -lpthread +AR = ar cqs +RANLIB = +QMAKE = /usr/local/Trolltech/QtEmbedded-4.7.2/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = ndgui.cpp \ + main.cpp \ + logreceiver.cpp \ + abortbootdialog.cpp \ + chooseinterfacedialog.cpp moc_ndgui.cpp \ + moc_logreceiver.cpp \ + moc_abortbootdialog.cpp \ + moc_chooseinterfacedialog.cpp +OBJECTS = ndgui.o \ + main.o \ + logreceiver.o \ + abortbootdialog.o \ + chooseinterfacedialog.o \ + moc_ndgui.o \ + moc_logreceiver.o \ + moc_abortbootdialog.o \ + moc_chooseinterfacedialog.o +DIST = /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/g++.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/unix.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/linux.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/qws.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/qconfig.pri \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/modules/qt_webkit_version.pri \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt_functions.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt_config.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/exclusive_builds.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/default_pre.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/release.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/default_post.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/warn_on.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/unix/thread.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/moc.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/resources.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/uic.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/yacc.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/lex.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/include_source_dir.prf \ + LogReceiver.pro +QMAKE_TARGET = LogReceiver +DESTDIR = +TARGET = LogReceiver + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile $(TARGET) + +$(TARGET): ui_ndgui.h ui_logreceiver.h $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: LogReceiver.pro /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/qws/linux-x86-g++/qmake.conf /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/g++.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/unix.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/linux.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/qws.conf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/qconfig.pri \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/modules/qt_webkit_version.pri \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt_functions.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt_config.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/exclusive_builds.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/default_pre.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/release.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/default_post.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/warn_on.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/unix/thread.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/moc.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/resources.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/uic.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/yacc.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/lex.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/include_source_dir.prf \ + /usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.prl \ + /usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.prl \ + /usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.prl + $(QMAKE) -o Makefile LogReceiver.pro +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/g++.conf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/unix.conf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/linux.conf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/common/qws.conf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/qconfig.pri: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/modules/qt_webkit_version.pri: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt_functions.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt_config.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/exclusive_builds.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/default_pre.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/release.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/default_post.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/warn_on.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/qt.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/unix/thread.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/moc.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/resources.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/uic.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/yacc.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/lex.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/mkspecs/features/include_source_dir.prf: +/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.prl: +/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.prl: +/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.prl: +qmake: FORCE + @$(QMAKE) -o Makefile LogReceiver.pro + +dist: + @$(CHK_DIR_EXISTS) .tmp/LogReceiver1.0.0 || $(MKDIR) .tmp/LogReceiver1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents ndgui.h logreceiver.h abortbootdialog.h chooseinterfacedialog.h .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents ndgui.cpp main.cpp logreceiver.cpp abortbootdialog.cpp chooseinterfacedialog.cpp .tmp/LogReceiver1.0.0/ && $(COPY_FILE) --parents ndgui.ui logreceiver.ui .tmp/LogReceiver1.0.0/ && (cd `dirname .tmp/LogReceiver1.0.0` && $(TAR) LogReceiver1.0.0.tar LogReceiver1.0.0 && $(COMPRESS) LogReceiver1.0.0.tar) && $(MOVE) `dirname .tmp/LogReceiver1.0.0`/LogReceiver1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/LogReceiver1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile + + +check: first + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +compiler_moc_header_make_all: moc_ndgui.cpp moc_logreceiver.cpp moc_abortbootdialog.cpp moc_chooseinterfacedialog.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_ndgui.cpp moc_logreceiver.cpp moc_abortbootdialog.cpp moc_chooseinterfacedialog.cpp +moc_ndgui.cpp: ui_ndgui.h \ + logreceiver.h \ + chooseinterfacedialog.h \ + abortbootdialog.h \ + ndgui.h + /usr/local/Trolltech/QtEmbedded-4.7.2/bin/moc $(DEFINES) $(INCPATH) ndgui.h -o moc_ndgui.cpp + +moc_logreceiver.cpp: logreceiver.h + /usr/local/Trolltech/QtEmbedded-4.7.2/bin/moc $(DEFINES) $(INCPATH) logreceiver.h -o moc_logreceiver.cpp + +moc_abortbootdialog.cpp: abortbootdialog.h + /usr/local/Trolltech/QtEmbedded-4.7.2/bin/moc $(DEFINES) $(INCPATH) abortbootdialog.h -o moc_abortbootdialog.cpp + +moc_chooseinterfacedialog.cpp: chooseinterfacedialog.h + /usr/local/Trolltech/QtEmbedded-4.7.2/bin/moc $(DEFINES) $(INCPATH) chooseinterfacedialog.h -o moc_chooseinterfacedialog.cpp + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_ndgui.h ui_logreceiver.h +compiler_uic_clean: + -$(DEL_FILE) ui_ndgui.h ui_logreceiver.h +ui_ndgui.h: ndgui.ui + /usr/local/Trolltech/QtEmbedded-4.7.2/bin/uic ndgui.ui -o ui_ndgui.h + +ui_logreceiver.h: logreceiver.ui + /usr/local/Trolltech/QtEmbedded-4.7.2/bin/uic logreceiver.ui -o ui_logreceiver.h + +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_header_clean compiler_uic_clean + +####### Compile + +ndgui.o: ndgui.cpp ndgui.h \ + ui_ndgui.h \ + logreceiver.h \ + chooseinterfacedialog.h \ + abortbootdialog.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ndgui.o ndgui.cpp + +main.o: main.cpp ndgui.h \ + ui_ndgui.h \ + logreceiver.h \ + chooseinterfacedialog.h \ + abortbootdialog.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp + +logreceiver.o: logreceiver.cpp logreceiver.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o logreceiver.o logreceiver.cpp + +abortbootdialog.o: abortbootdialog.cpp abortbootdialog.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o abortbootdialog.o abortbootdialog.cpp + +chooseinterfacedialog.o: chooseinterfacedialog.cpp chooseinterfacedialog.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o chooseinterfacedialog.o chooseinterfacedialog.cpp + +moc_ndgui.o: moc_ndgui.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_ndgui.o moc_ndgui.cpp + +moc_logreceiver.o: moc_logreceiver.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_logreceiver.o moc_logreceiver.cpp + +moc_abortbootdialog.o: moc_abortbootdialog.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_abortbootdialog.o moc_abortbootdialog.cpp + +moc_chooseinterfacedialog.o: moc_chooseinterfacedialog.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_chooseinterfacedialog.o moc_chooseinterfacedialog.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/workspace/LogReceiver/Makefile.Debug b/workspace/LogReceiver/Makefile.Debug new file mode 100644 index 0000000..29db2ad --- /dev/null +++ b/workspace/LogReceiver/Makefile.Debug @@ -0,0 +1,178 @@ +############################################################################# +# Makefile for building: LogReceiver +# Generated by qmake (2.01a) (Qt 4.7.2) on: Wed Jul 6 13:39:02 2011 +# Project: LogReceiver.pro +# Template: app +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/local/Trolltech/Qt-4.7.2/mkspecs/linux-g++ -I. -I/usr/local/Trolltech/Qt-4.7.2/include/QtCore -I/usr/local/Trolltech/Qt-4.7.2/include/QtNetwork -I/usr/local/Trolltech/Qt-4.7.2/include/QtGui -I/usr/local/Trolltech/Qt-4.7.2/include -Idebug -I. +LINK = g++ +LFLAGS = -Wl,-rpath,/usr/local/Trolltech/Qt-4.7.2/lib +LIBS = $(SUBLIBS) -L/usr/local/Trolltech/Qt-4.7.2/lib -lQtGui -L/usr/local/Trolltech/Qt-4.7.2/lib -L/usr/X11R6/lib -lQtNetwork -lQtCore -lpthread +AR = ar cqs +RANLIB = +QMAKE = /usr/local/Trolltech/Qt-4.7.2/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = debug/ + +####### Files + +SOURCES = main.cpp \ + logreceiver.cpp debug/moc_logreceiver.cpp +OBJECTS = debug/main.o \ + debug/logreceiver.o \ + debug/moc_logreceiver.o +DIST = /usr/local/Trolltech/Qt-4.7.2/mkspecs/common/g++.conf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/common/unix.conf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/common/linux.conf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/qconfig.pri \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/modules/qt_webkit_version.pri \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/qt_functions.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/qt_config.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/exclusive_builds.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/default_pre.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/debug.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/debug_and_release.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/default_post.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/build_pass.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/warn_on.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/qt.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/unix/thread.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/moc.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/resources.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/uic.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/yacc.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/lex.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/include_source_dir.prf \ + LogReceiver.pro +QMAKE_TARGET = LogReceiver +DESTDIR = +TARGET = LogReceiver + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile.Debug $(TARGET) + +$(TARGET): ui_logreceiver.h $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +qmake: FORCE + @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Debug LogReceiver.pro + +dist: + @$(CHK_DIR_EXISTS) debug/LogReceiver1.0.0 || $(MKDIR) debug/LogReceiver1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) debug/LogReceiver1.0.0/ && $(COPY_FILE) --parents logreceiver.h debug/LogReceiver1.0.0/ && $(COPY_FILE) --parents main.cpp logreceiver.cpp debug/LogReceiver1.0.0/ && $(COPY_FILE) --parents logreceiver.ui debug/LogReceiver1.0.0/ && (cd `dirname debug/LogReceiver1.0.0` && $(TAR) LogReceiver1.0.0.tar LogReceiver1.0.0 && $(COMPRESS) LogReceiver1.0.0.tar) && $(MOVE) `dirname debug/LogReceiver1.0.0`/LogReceiver1.0.0.tar.gz . && $(DEL_FILE) -r debug/LogReceiver1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile.Debug + + +check: first + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +compiler_moc_header_make_all: debug/moc_logreceiver.cpp +compiler_moc_header_clean: + -$(DEL_FILE) debug/moc_logreceiver.cpp +debug/moc_logreceiver.cpp: ui_logreceiver.h \ + logreceiver.h + /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) logreceiver.h -o debug/moc_logreceiver.cpp + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_logreceiver.h +compiler_uic_clean: + -$(DEL_FILE) ui_logreceiver.h +ui_logreceiver.h: logreceiver.ui + /usr/local/Trolltech/Qt-4.7.2/bin/uic logreceiver.ui -o ui_logreceiver.h + +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_header_clean compiler_uic_clean + +####### Compile + +debug/main.o: main.cpp logreceiver.h \ + ui_logreceiver.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o main.cpp + +debug/logreceiver.o: logreceiver.cpp logreceiver.h \ + ui_logreceiver.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/logreceiver.o logreceiver.cpp + +debug/moc_logreceiver.o: debug/moc_logreceiver.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_logreceiver.o debug/moc_logreceiver.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/workspace/LogReceiver/Makefile.Release b/workspace/LogReceiver/Makefile.Release new file mode 100644 index 0000000..64e6a9f --- /dev/null +++ b/workspace/LogReceiver/Makefile.Release @@ -0,0 +1,178 @@ +############################################################################# +# Makefile for building: LogReceiver +# Generated by qmake (2.01a) (Qt 4.7.2) on: Wed Jul 6 13:39:02 2011 +# Project: LogReceiver.pro +# Template: app +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) +INCPATH = -I/usr/local/Trolltech/Qt-4.7.2/mkspecs/linux-g++ -I. -I/usr/local/Trolltech/Qt-4.7.2/include/QtCore -I/usr/local/Trolltech/Qt-4.7.2/include/QtNetwork -I/usr/local/Trolltech/Qt-4.7.2/include/QtGui -I/usr/local/Trolltech/Qt-4.7.2/include -Irelease -I. +LINK = g++ +LFLAGS = -Wl,-O1 -Wl,-rpath,/usr/local/Trolltech/Qt-4.7.2/lib +LIBS = $(SUBLIBS) -L/usr/local/Trolltech/Qt-4.7.2/lib -lQtGui -L/usr/local/Trolltech/Qt-4.7.2/lib -L/usr/X11R6/lib -lQtNetwork -lQtCore -lpthread +AR = ar cqs +RANLIB = +QMAKE = /usr/local/Trolltech/Qt-4.7.2/bin/qmake +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = release/ + +####### Files + +SOURCES = main.cpp \ + logreceiver.cpp release/moc_logreceiver.cpp +OBJECTS = release/main.o \ + release/logreceiver.o \ + release/moc_logreceiver.o +DIST = /usr/local/Trolltech/Qt-4.7.2/mkspecs/common/g++.conf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/common/unix.conf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/common/linux.conf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/qconfig.pri \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/modules/qt_webkit_version.pri \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/qt_functions.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/qt_config.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/exclusive_builds.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/default_pre.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/release.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/debug_and_release.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/default_post.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/build_pass.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/warn_on.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/qt.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/unix/thread.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/moc.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/resources.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/uic.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/yacc.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/lex.prf \ + /usr/local/Trolltech/Qt-4.7.2/mkspecs/features/include_source_dir.prf \ + LogReceiver.pro +QMAKE_TARGET = LogReceiver +DESTDIR = +TARGET = LogReceiver + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile.Release $(TARGET) + +$(TARGET): ui_logreceiver.h $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +qmake: FORCE + @$(QMAKE) CONFIG+=debug_and_release -o Makefile.Release LogReceiver.pro + +dist: + @$(CHK_DIR_EXISTS) release/LogReceiver1.0.0 || $(MKDIR) release/LogReceiver1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) release/LogReceiver1.0.0/ && $(COPY_FILE) --parents logreceiver.h release/LogReceiver1.0.0/ && $(COPY_FILE) --parents main.cpp logreceiver.cpp release/LogReceiver1.0.0/ && $(COPY_FILE) --parents logreceiver.ui release/LogReceiver1.0.0/ && (cd `dirname release/LogReceiver1.0.0` && $(TAR) LogReceiver1.0.0.tar LogReceiver1.0.0 && $(COMPRESS) LogReceiver1.0.0.tar) && $(MOVE) `dirname release/LogReceiver1.0.0`/LogReceiver1.0.0.tar.gz . && $(DEL_FILE) -r release/LogReceiver1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile.Release + + +check: first + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +compiler_moc_header_make_all: release/moc_logreceiver.cpp +compiler_moc_header_clean: + -$(DEL_FILE) release/moc_logreceiver.cpp +release/moc_logreceiver.cpp: ui_logreceiver.h \ + logreceiver.h + /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) logreceiver.h -o release/moc_logreceiver.cpp + +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_logreceiver.h +compiler_uic_clean: + -$(DEL_FILE) ui_logreceiver.h +ui_logreceiver.h: logreceiver.ui + /usr/local/Trolltech/Qt-4.7.2/bin/uic logreceiver.ui -o ui_logreceiver.h + +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_moc_header_clean compiler_uic_clean + +####### Compile + +release/main.o: main.cpp logreceiver.h \ + ui_logreceiver.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o main.cpp + +release/logreceiver.o: logreceiver.cpp logreceiver.h \ + ui_logreceiver.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/logreceiver.o logreceiver.cpp + +release/moc_logreceiver.o: release/moc_logreceiver.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_logreceiver.o release/moc_logreceiver.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/workspace/LogReceiver/logreceiver.cpp b/workspace/LogReceiver/logreceiver.cpp index 93e8373..e0ae336 100644 --- a/workspace/LogReceiver/logreceiver.cpp +++ b/workspace/LogReceiver/logreceiver.cpp @@ -209,26 +209,42 @@ void LogReceiver::checkInternetConnection(QList<QString> &interfaces) { } void LogReceiver::checkInternetConnectionViaTCP(QString ifName) { - const bool canStartIAP = (configurationManager.capabilities() & QNetworkConfigurationManager::CanStartAndStopInterfaces); - QList<QNetworkConfiguration> configs = configurationManager.allConfigurations(); - QNetworkConfiguration cfg; - foreach(QNetworkConfiguration nC, configs) { - if(nC.name() == ifName) { - cfg = nC; - } - } - - if(!cfg.isValid() || (!canStartIAP && cfg.state() != QNetworkConfiguration::Active)) { - - return; - } - session = new QNetworkSession(cfg, this); - session->open(); - session->waitForOpened(-1); - - - QTcpSocket *tcpSocket = new QTcpSocket(this); - tcpSocket->connectToHost(); + const bool canStartIAP = (configurationManager.capabilities() + & QNetworkConfigurationManager::CanStartAndStopInterfaces); + QList<QNetworkConfiguration> configs = + configurationManager.allConfigurations(); + QNetworkConfiguration cfg; + foreach(QNetworkConfiguration nC, configs) + { + if (nC.name() == ifName) { + qDebug() << "found config" << nC.name(); + cfg = nC; + break; + } + } + if (!cfg.isValid() || (!canStartIAP && cfg.state() + != QNetworkConfiguration::Active)) { + qDebug() << "config is not valid" << cfg.name(); + return; + } + QNetworkSession *session = new QNetworkSession(cfg, this); + session->open(); + if (session->waitForOpened(-1)) { + + QTcpSocket *tcpSocket = new QTcpSocket(this); + tcpSocket->connectToHost(QString("209.85.148.105"), 80); + if (!tcpSocket->waitForConnected()) { + qDebug() << tcpSocket->errorString(); + emit updateStatusLabel(ifName, "connection not possible"); + } else { + emit updateStatusLabel(ifName, "connection possible"); + emit connectionEstablished(ifName); + } + } + else { + qDebug() << "couldn't open session"; + } + session->close(); } void LogReceiver::handleNewConnection() { @@ -258,6 +274,21 @@ void LogReceiver::handleNewInput() { } } + +void LogReceiver::handleNewInput_(QLocalSocket *client) { + + QString data(client->readAll()); + + data = data.trimmed(); + + QStringList lines = data.split("\n"); + + for (int i=0; i < lines.length(); i++) { + handleNewInputLine(lines.at(i)); + } +} + + void LogReceiver::handleNewInputLine(QString data) { QString logMsg(data); @@ -323,9 +354,6 @@ void LogReceiver::handleNewInputLine(QString data) { void LogReceiver::handleProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) { QProcess* p = qobject_cast<QProcess * >(QObject::sender()); - - - QString ifName = clientProcessToIfNameMap.value(p,"ifName"); if(ifName.compare("ifName") == 0) { @@ -341,9 +369,19 @@ void LogReceiver::handleProcessFinished(int exitCode, qDebug() << "process normal exit"; qDebug() << "check internet connction"; emit updateStatusLabel(ifName, "check connectivity"); - checkInternetConnection(ifName); + //checkInternetConnection(ifName); + checkInternetConnectionViaTCP(ifName); } - + } + if (numberOfProcesses == 1) { + QLocalSocket *s; + qDebug() << "try to read socket buffer.."; + foreach(s, clients.keys()) { + if (s->bytesAvailable() > 0) { + qDebug() << "read socket buffer.."; + handleNewInput_(s); + } + } } numberOfProcesses = numberOfProcesses -1; if (numberOfProcesses <= 0) { diff --git a/workspace/LogReceiver/logreceiver.h b/workspace/LogReceiver/logreceiver.h index 143cbef..e53ad1d 100644 --- a/workspace/LogReceiver/logreceiver.h +++ b/workspace/LogReceiver/logreceiver.h @@ -55,6 +55,7 @@ private: int numberOfProcesses; + void handleNewInput_(QLocalSocket *s); void runDHCPCD(QList<QString> &interfaces); void runDHCPCD(QString interface); QList<QString>checkCarrierState(QList<QString> &interfaces); diff --git a/workspace/customdhcpcd/Debug/customdhcpcd b/workspace/customdhcpcd/Debug/customdhcpcd Binary files differdeleted file mode 100755 index 6212e3b..0000000 --- a/workspace/customdhcpcd/Debug/customdhcpcd +++ /dev/null diff --git a/workspace/customdhcpcd/Debug/src/arp.d b/workspace/customdhcpcd/Debug/src/arp.d new file mode 100644 index 0000000..e639f20 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/arp.d @@ -0,0 +1,21 @@ +src/arp.d src/arp.o: ../src/arp.c ../src/config.h ../src/common.h \ + ../src/arp.h ../src/interface.h ../src/logger.h ../src/signal.h \ + ../src/socket.h ../src/dhcp.h ../src/dhcpcd.h + +../src/config.h: + +../src/common.h: + +../src/arp.h: + +../src/interface.h: + +../src/logger.h: + +../src/signal.h: + +../src/socket.h: + +../src/dhcp.h: + +../src/dhcpcd.h: diff --git a/workspace/customdhcpcd/Debug/src/client.d b/workspace/customdhcpcd/Debug/src/client.d new file mode 100644 index 0000000..585c535 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/client.d @@ -0,0 +1,37 @@ +src/client.d src/client.o: ../src/client.c ../src/config.h \ + ../src/common.h ../src/arp.h ../src/interface.h ../src/client.h \ + ../src/dhcpcd.h ../src/configure.h ../src/dhcp.h ../src/info.h \ + ../src/ipv4ll.h ../src/logger.h ../src/signal.h ../src/socket.h \ + ../src/logwriter.h ../src/status.h ../src/duid.h + +../src/config.h: + +../src/common.h: + +../src/arp.h: + +../src/interface.h: + +../src/client.h: + +../src/dhcpcd.h: + +../src/configure.h: + +../src/dhcp.h: + +../src/info.h: + +../src/ipv4ll.h: + +../src/logger.h: + +../src/signal.h: + +../src/socket.h: + +../src/logwriter.h: + +../src/status.h: + +../src/duid.h: diff --git a/workspace/customdhcpcd/Debug/src/common.d b/workspace/customdhcpcd/Debug/src/common.d new file mode 100644 index 0000000..235fc5e --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/common.d @@ -0,0 +1,6 @@ +src/common.d src/common.o: ../src/common.c ../src/common.h \ + ../src/logger.h + +../src/common.h: + +../src/logger.h: diff --git a/workspace/customdhcpcd/Debug/src/configure.d b/workspace/customdhcpcd/Debug/src/configure.d new file mode 100644 index 0000000..16416f6 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/configure.d @@ -0,0 +1,28 @@ +src/configure.d src/configure.o: ../src/configure.c ../src/config.h \ + ../src/common.h ../src/configure.h ../src/dhcpcd.h ../src/interface.h \ + ../src/dhcp.h ../src/info.h ../src/logger.h ../src/signal.h \ + ../src/socket.h ../src/status.h ../src/logwriter.h + +../src/config.h: + +../src/common.h: + +../src/configure.h: + +../src/dhcpcd.h: + +../src/interface.h: + +../src/dhcp.h: + +../src/info.h: + +../src/logger.h: + +../src/signal.h: + +../src/socket.h: + +../src/status.h: + +../src/logwriter.h: diff --git a/workspace/customdhcpcd/Debug/src/dhcp.d b/workspace/customdhcpcd/Debug/src/dhcp.d new file mode 100644 index 0000000..82e54dd --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/dhcp.d @@ -0,0 +1,17 @@ +src/dhcp.d src/dhcp.o: ../src/dhcp.c ../src/config.h ../src/common.h \ + ../src/dhcpcd.h ../src/dhcp.h ../src/interface.h ../src/logger.h \ + ../src/socket.h + +../src/config.h: + +../src/common.h: + +../src/dhcpcd.h: + +../src/dhcp.h: + +../src/interface.h: + +../src/logger.h: + +../src/socket.h: diff --git a/workspace/customdhcpcd/Debug/src/dhcpcd.d b/workspace/customdhcpcd/Debug/src/dhcpcd.d new file mode 100644 index 0000000..05c8d7e --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/dhcpcd.d @@ -0,0 +1,26 @@ +src/dhcpcd.d src/dhcpcd.o: ../src/dhcpcd.c ../src/config.h \ + ../src/client.h ../src/dhcpcd.h ../src/common.h ../src/dhcp.h \ + ../src/interface.h ../src/logger.h ../src/socket.h ../src/version.h \ + ../src/logwriter.h ../src/status.h + +../src/config.h: + +../src/client.h: + +../src/dhcpcd.h: + +../src/common.h: + +../src/dhcp.h: + +../src/interface.h: + +../src/logger.h: + +../src/socket.h: + +../src/version.h: + +../src/logwriter.h: + +../src/status.h: diff --git a/workspace/customdhcpcd/Debug/src/discover.d b/workspace/customdhcpcd/Debug/src/discover.d new file mode 100644 index 0000000..9188993 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/discover.d @@ -0,0 +1 @@ +src/discover.d src/discover.o: ../src/discover.c diff --git a/workspace/customdhcpcd/Debug/src/duid.d b/workspace/customdhcpcd/Debug/src/duid.d new file mode 100644 index 0000000..1434db7 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/duid.d @@ -0,0 +1,12 @@ +src/duid.d src/duid.o: ../src/duid.c ../src/config.h ../src/common.h \ + ../src/duid.h ../src/interface.h ../src/logger.h + +../src/config.h: + +../src/common.h: + +../src/duid.h: + +../src/interface.h: + +../src/logger.h: diff --git a/workspace/customdhcpcd/Debug/src/info.d b/workspace/customdhcpcd/Debug/src/info.d new file mode 100644 index 0000000..0a3490d --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/info.d @@ -0,0 +1,17 @@ +src/info.d src/info.o: ../src/info.c ../src/config.h ../src/common.h \ + ../src/dhcp.h ../src/dhcpcd.h ../src/interface.h ../src/logger.h \ + ../src/info.h + +../src/config.h: + +../src/common.h: + +../src/dhcp.h: + +../src/dhcpcd.h: + +../src/interface.h: + +../src/logger.h: + +../src/info.h: diff --git a/workspace/customdhcpcd/Debug/src/interface.d b/workspace/customdhcpcd/Debug/src/interface.d new file mode 100644 index 0000000..581c831 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/interface.d @@ -0,0 +1,15 @@ +src/interface.d src/interface.o: ../src/interface.c ../src/config.h \ + ../src/common.h ../src/dhcp.h ../src/dhcpcd.h ../src/interface.h \ + ../src/logger.h + +../src/config.h: + +../src/common.h: + +../src/dhcp.h: + +../src/dhcpcd.h: + +../src/interface.h: + +../src/logger.h: diff --git a/workspace/customdhcpcd/Debug/src/ipv4ll.d b/workspace/customdhcpcd/Debug/src/ipv4ll.d new file mode 100644 index 0000000..7d02ead --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/ipv4ll.d @@ -0,0 +1,17 @@ +src/ipv4ll.d src/ipv4ll.o: ../src/ipv4ll.c ../src/config.h ../src/arp.h \ + ../src/interface.h ../src/ipv4ll.h ../src/dhcp.h ../src/dhcpcd.h \ + ../src/common.h + +../src/config.h: + +../src/arp.h: + +../src/interface.h: + +../src/ipv4ll.h: + +../src/dhcp.h: + +../src/dhcpcd.h: + +../src/common.h: diff --git a/workspace/customdhcpcd/Debug/src/logger.d b/workspace/customdhcpcd/Debug/src/logger.d new file mode 100644 index 0000000..bbf1cf8 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/logger.d @@ -0,0 +1,10 @@ +src/logger.d src/logger.o: ../src/logger.c ../src/common.h \ + ../src/logger.h ../src/logwriter.h ../src/dhcpcd.h + +../src/common.h: + +../src/logger.h: + +../src/logwriter.h: + +../src/dhcpcd.h: diff --git a/workspace/customdhcpcd/Debug/src/logwriter.d b/workspace/customdhcpcd/Debug/src/logwriter.d new file mode 100644 index 0000000..83dc4b5 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/logwriter.d @@ -0,0 +1,19 @@ +src/logwriter.d src/logwriter.o: ../src/logwriter.c ../src/common.h \ + ../src/dhcp.h ../src/dhcpcd.h ../src/interface.h ../src/config.h \ + ../src/logger.h ../src/logwriter.h ../src/status.h + +../src/common.h: + +../src/dhcp.h: + +../src/dhcpcd.h: + +../src/interface.h: + +../src/config.h: + +../src/logger.h: + +../src/logwriter.h: + +../src/status.h: diff --git a/workspace/customdhcpcd/Debug/src/signal.d b/workspace/customdhcpcd/Debug/src/signal.d new file mode 100644 index 0000000..0185fc3 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/signal.d @@ -0,0 +1,8 @@ +src/signal.d src/signal.o: ../src/signal.c ../src/common.h \ + ../src/logger.h ../src/signal.h + +../src/common.h: + +../src/logger.h: + +../src/signal.h: diff --git a/workspace/customdhcpcd/Debug/src/socket.d b/workspace/customdhcpcd/Debug/src/socket.d new file mode 100644 index 0000000..785c170 --- /dev/null +++ b/workspace/customdhcpcd/Debug/src/socket.d @@ -0,0 +1,17 @@ +src/socket.d src/socket.o: ../src/socket.c ../src/config.h ../src/dhcp.h \ + ../src/dhcpcd.h ../src/common.h ../src/interface.h ../src/logger.h \ + ../src/socket.h + +../src/config.h: + +../src/dhcp.h: + +../src/dhcpcd.h: + +../src/common.h: + +../src/interface.h: + +../src/logger.h: + +../src/socket.h: diff --git a/workspace/customdhcpcd/Debug/src/subdir.mk b/workspace/customdhcpcd/Debug/src/subdir.mk index 86fb69b..38890b3 100644 --- a/workspace/customdhcpcd/Debug/src/subdir.mk +++ b/workspace/customdhcpcd/Debug/src/subdir.mk @@ -3,14 +3,75 @@ ################################################################################ # Add inputs and outputs from these tool invocations to the build variables +O_SRCS += \ +../src/arp.o \ +../src/client.o \ +../src/common.o \ +../src/configure.o \ +../src/dhcp.o \ +../src/dhcpcd.o \ +../src/duid.o \ +../src/info.o \ +../src/interface.o \ +../src/ipv4ll.o \ +../src/logger.o \ +../src/logwriter.o \ +../src/signal.o \ +../src/socket.o + C_SRCS += \ -../src/customdhcpcd.c +../src/arp.c \ +../src/client.c \ +../src/common.c \ +../src/configure.c \ +../src/customdhcpcd.c \ +../src/dhcp.c \ +../src/dhcpcd.c \ +../src/discover.c \ +../src/duid.c \ +../src/info.c \ +../src/interface.c \ +../src/ipv4ll.c \ +../src/logger.c \ +../src/logwriter.c \ +../src/signal.c \ +../src/socket.c OBJS += \ -./src/customdhcpcd.o +./src/arp.o \ +./src/client.o \ +./src/common.o \ +./src/configure.o \ +./src/customdhcpcd.o \ +./src/dhcp.o \ +./src/dhcpcd.o \ +./src/discover.o \ +./src/duid.o \ +./src/info.o \ +./src/interface.o \ +./src/ipv4ll.o \ +./src/logger.o \ +./src/logwriter.o \ +./src/signal.o \ +./src/socket.o C_DEPS += \ -./src/customdhcpcd.d +./src/arp.d \ +./src/client.d \ +./src/common.d \ +./src/configure.d \ +./src/customdhcpcd.d \ +./src/dhcp.d \ +./src/dhcpcd.d \ +./src/discover.d \ +./src/duid.d \ +./src/info.d \ +./src/interface.d \ +./src/ipv4ll.d \ +./src/logger.d \ +./src/logwriter.d \ +./src/signal.d \ +./src/socket.d # Each subdirectory must supply rules for building sources it contributes diff --git a/workspace/customdhcpcd/src/Makefile b/workspace/customdhcpcd/src/Makefile new file mode 100644 index 0000000..13d9f28 --- /dev/null +++ b/workspace/customdhcpcd/src/Makefile @@ -0,0 +1,34 @@ +# Makefile based on BSD's pmake. +# Our mk stubs also work with GNU make. +# Copyright 2008 Roy Marples <roy@marples.name> + +PROG= dhcpcd +SRCS= arp.c client.c common.c configure.c dhcp.c dhcpcd.c duid.c \ + info.c interface.c ipv4ll.c logger.c logwriter.c signal.c socket.c +MAN= dhcpcd.8 + +VERSION= 3.2.3 +CLEANFILES= version.h dhcpcd.8 + +BINDIR= ${PREFIX}/sbin + +.SUFFIXES: .in + +MK= mk +include ${MK}/os.mk +include ${MK}/cc.mk +include ${MK}/prog.mk + +# os.mk should define this, but heh +INFOD?= /var/db + +LDADD+= ${LIBRESOLV} ${LIBRT} +CFLAGS+= -g -Wall -DINFODIR=\"${INFOD}\" ${FORK} ${RC} + +# As version.h is generated by us, hardcode the depend correctly. +${SRCS}: version.h +version.h: + echo "#define VERSION \"${VERSION}\""> version.h + +.in: + sed 's:@PREFIX@:${PREFIX}:g; s:@INFODIR@:${INFOD}:g' $< > $@ diff --git a/workspace/customdhcpcd/src/mk/cc.mk b/workspace/customdhcpcd/src/mk/cc.mk new file mode 100644 index 0000000..d52597b --- /dev/null +++ b/workspace/customdhcpcd/src/mk/cc.mk @@ -0,0 +1,23 @@ +# Copyright 2008 Roy Marples <roy@marples.name> + +# Setup some good default CFLAGS +CFLAGS?= -O2 + +# Default to using the C99 standard +CSTD?= c99 +_CSTD_SH= if test -n "${CSTD}"; then echo "-std=${CSTD}"; else echo ""; fi +_CSTD!= ${_CSTD_SH} +CFLAGS+= ${_CSTD}$(shell ${_CSTD_SH}) + +# Try and use some good cc flags +_CC_FLAGS= -pedantic -Wall -Wunused -Wimplicit -Wshadow -Wformat=2 \ + -Wmissing-declarations -Wno-missing-prototypes -Wwrite-strings \ + -Wbad-function-cast -Wnested-externs -Wcomment -Winline \ + -Wchar-subscripts -Wcast-align -Wno-format-nonliteral \ + -Wdeclaration-after-statement -Wsequence-point -Wextra +_CC_FLAGS_SH= for f in ${_CC_FLAGS}; do \ + if ${CC} $$f -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \ + then printf "%s" "$$f "; fi \ + done +_CC_FLAGS!= ${_CC_FLAGS_SH} +CFLAGS+= ${_CC_FLAGS}$(shell ${CC_FLAGS_SH}) diff --git a/workspace/customdhcpcd/src/mk/depend.mk b/workspace/customdhcpcd/src/mk/depend.mk new file mode 100644 index 0000000..a4d717a --- /dev/null +++ b/workspace/customdhcpcd/src/mk/depend.mk @@ -0,0 +1,11 @@ +# This only works for make implementations that always include a .depend if +# it exists. Only GNU make does not do this. + +# Copyright 2008 Roy Marples <roy@marples.name> + +CLEANFILES+= .depend + +.depend: ${SRCS} + ${CC} ${CFLAGS} -MM ${SRCS} > .depend + +depend: .depend diff --git a/workspace/customdhcpcd/src/mk/dist.mk b/workspace/customdhcpcd/src/mk/dist.mk new file mode 100644 index 0000000..1d3669d --- /dev/null +++ b/workspace/customdhcpcd/src/mk/dist.mk @@ -0,0 +1,11 @@ +# rules to make a distribution tarball from a git repo +# Copyright 2008 Roy Marples <roy@marples.name> + +GITREF?= HEAD +DISTPREFIX?= ${PROG}-${VERSION} +DISTFILE?= ${DISTPREFIX}.tar.bz2 + +CLEANFILES+= ${DISTFILE} + +dist: + git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE} diff --git a/workspace/customdhcpcd/src/mk/man.mk b/workspace/customdhcpcd/src/mk/man.mk new file mode 100644 index 0000000..5d9bf26 --- /dev/null +++ b/workspace/customdhcpcd/src/mk/man.mk @@ -0,0 +1,14 @@ +# rules to install manpages +# Copyright 2008 Roy Marples <roy@marples.name> + +MANPREFIX?= /usr/share +MANDIR?= ${MANPREFIX}/man/man +MANMODE?= 0444 +MINSTALL?= ${INSTALL} -m ${MANMODE} + +man: ${MAN} + +# We cheat as all our pages go into section 8 +maninstall: man + ${INSTALL} -d ${DESTDIR}${MANDIR}8 + for man in ${MAN}; do ${MINSTALL} $$man ${DESTDIR}${MANDIR}8; done diff --git a/workspace/customdhcpcd/src/mk/os.mk b/workspace/customdhcpcd/src/mk/os.mk new file mode 100644 index 0000000..af173fc --- /dev/null +++ b/workspace/customdhcpcd/src/mk/os.mk @@ -0,0 +1,77 @@ +# Setup OS specific variables +# Copyright 2008 Roy Marples <roy@marples.name> + +# Work out if we need -lresolv or not +_LIBRESOLV_SH= printf '\#include <netinet/in.h>\n\#include <resolv.h>\nint main (void) { return (res_init ()); }\n' > .res_init.c; \ + if ${CC} .res_init.c -o .res_init >/dev/null 2>&1; then \ + echo ""; \ + elif ${CC} .res_init.c -lresolv -o .res_init >/dev/null 2>&1; then \ + echo "-lresolv"; \ + else \ + echo "Cannot work out how to get res_init to link" >&2; \ + rm -f .res_init.c .res_init; \ + exit 1; \ + fi; \ + rm -f .res_init.c .res_init +_LIBRESOLV!= ${_LIBRESOLV_SH} +LIBRESOLV= ${_LIBRESOLV}$(shell ${_LIBRESOLV_SH}) + +# Work out if we need -lrt or not +_LIBRT_SH= printf '\#include <time.h>\n\#include <unistd.h>\n\nint main (void) { struct timespec ts;\n\#if defined(_POSIX_MONOTONIC_CLOCK) && defined(CLOCK_MONOTONIC)\nreturn (clock_gettime (CLOCK_MONOTONIC, &ts));\n\#else\nreturn -1;\n\#endif\n}\n' > .clock_gettime.c; \ + if ${CC} .clock_gettime.c -o .clock_gettime >/dev/null 2>&1; then \ + echo ""; \ + elif ${CC} .clock_gettime.c -lrt -o .clock_gettime >/dev/null 2>&1; then \ + echo "-lrt"; \ + else \ + echo ""; \ + fi; \ + rm -f .clock_gettime.c .clock_gettime +_LIBRT!= ${_LIBRT_SH} +LIBRT= ${_LIBRT}$(shell ${_LIBRT_SH}) + +# Work out if our fork() works or not +_HAVE_FORK_SH= if test "${HAVE_FORK}" = "yes"; then \ + echo ""; \ + elif test -n "${HAVE_FORK}"; then \ + echo "-DTHERE_IS_NO_FORK"; \ + else \ + printf '\#include <stdlib.h>\n\#include <unistd.h>\nint main (void) { pid_t pid = fork(); if (pid == -1) exit (-1); exit (0); }\n' > .fork.c; \ + ${CC} .fork.c -o .fork >/dev/null 2>&1; \ + if ./.fork; then \ + echo ""; \ + else \ + echo "-DTHERE_IS_NO_FORK"; \ + fi; \ + rm -f .fork.c .fork; \ + fi; +_HAVE_FORK!= ${_HAVE_FORK_SH} +FORK= ${_HAVE_FORK}$(shell ${_HAVE_FORK_SH}) + +# info dir defaults to /var/lib/dhcpcd on Linux and /var/db elsewhere +_INFODIR_SH= if test -n "${INFODIR}"; then \ + echo "${INFODIR}"; \ + else \ + case `uname -s` in \ + Linux) echo "/var/lib/dhcpcd";; \ + *) echo "/var/db";; \ + esac \ + fi +_INFODIR!= ${_INFODIR_SH} +INFOD?= ${_INFODIR}$(shell ${_INFODIR_SH}) + +# Work out how to restart services +_RC_SH= if test -n "${HAVE_INIT}"; then \ + test "${HAVE_INIT}" = "no" || echo "-DENABLE_${HAVE_INIT}"; \ + elif test -x /sbin/runscript; then echo "-DENABLE_OPENRC"; \ + elif test -x /sbin/service; then echo "-DENABLE_SERVICE"; \ + elif test -x /etc/rc.d/rc.S -a -x /etc/rc.d/rc.M; then echo "-DENABLE_SLACKRC"; \ + elif test -d /etc/rc.d; then echo "-DENABLE_BSDRC"; \ + elif test -d /etc/init.d; then echo "-DENABLE_SYSV"; \ + fi +_RC!= ${_RC_SH} +RC= ${_RC}$(shell ${_RC_SH}) + +# glibc requires _BSD_SOURCE and _XOPEN_SOURCE +_DEF_SH= case `uname -s` in Linux) echo "-D_BSD_SOURCE -D_XOPEN_SOURCE=600";; *) echo;; esac +_DEF!= ${_DEF_SH} +CFLAGS+= ${_DEF}$(shell ${_DEF_SH}) diff --git a/workspace/customdhcpcd/src/mk/prog.mk b/workspace/customdhcpcd/src/mk/prog.mk new file mode 100644 index 0000000..6f2560c --- /dev/null +++ b/workspace/customdhcpcd/src/mk/prog.mk @@ -0,0 +1,34 @@ +# rules to build a program +# based on FreeBSD's bsd.prog.mk + +# Copyright 2008 Roy Marples <roy@marples.name> + +BINDIR?= ${PREFIX}/usr/bin +BINMODE?= 0755 +OBJS+= ${SRCS:.c=.o} + +INSTALL?= install + +all: ${PROG} ${MAN} + +${PROG}: ${SCRIPTS} ${OBJS} + ${CC} ${LDFLAGS} -o $@ ${OBJS} ${LDADD} + +_proginstall: ${PROG} + ${INSTALL} -d ${DESTDIR}${BINDIR} + ${INSTALL} -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR} + +include ${MK}/depend.mk +include ${MK}/man.mk +include ${MK}/dist.mk + +install: _proginstall maninstall + +clean: + rm -f ${OBJS} ${PROG} ${CLEANFILES} + +LINTFLAGS?= -hx +LINTFLAGS+= -X 159,247,352 + +lint: ${SRCS:.c=.c} + ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} $^ ${.ALLSRC} |