From 46490158a55f9127360409278fa543f4586426e5 Mon Sep 17 00:00:00 2001
From: Niklas Goby
Date: Wed, 23 Nov 2011 11:31:31 +0100
Subject: deleted the NetworkDiscovery and UnixDomainSocketServer folder
---
NetworkDiscovery/.gitignore | 2 -
.../org.eclipse.ltk.core.refactoring.prefs | 3 -
NetworkDiscovery/CMakeLists.txt | 62 --
NetworkDiscovery/Makefile.Debug | 264 -------
NetworkDiscovery/Makefile.Release | 264 -------
NetworkDiscovery/NetworkDiscovery.pro | 20 -
NetworkDiscovery/html/background.png | Bin 364392 -> 0 bytes
NetworkDiscovery/html/continueBoot.html | 24 -
.../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 260 -> 0 bytes
.../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 251 -> 0 bytes
.../css/images/ui-bg_flat_10_000000_40x100.png | Bin 178 -> 0 bytes
.../css/images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 104 -> 0 bytes
.../css/images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 125 -> 0 bytes
.../css/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 0 bytes
.../images/ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 3762 -> 0 bytes
.../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 90 -> 0 bytes
.../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 129 -> 0 bytes
.../html/css/images/ui-icons_222222_256x240.png | Bin 4369 -> 0 bytes
.../html/css/images/ui-icons_228ef1_256x240.png | Bin 4369 -> 0 bytes
.../html/css/images/ui-icons_ef8c08_256x240.png | Bin 4369 -> 0 bytes
.../html/css/images/ui-icons_ffd27a_256x240.png | Bin 4369 -> 0 bytes
.../html/css/images/ui-icons_ffffff_256x240.png | Bin 4369 -> 0 bytes
NetworkDiscovery/html/css/jquery-ui-1.8.16.css | 568 --------------
NetworkDiscovery/html/js/jquery-1.6.4.min.js | 4 -
NetworkDiscovery/html/js/jquery-ui-1.8.16.min.js | 791 -------------------
NetworkDiscovery/html/js/networkDiscovery.js | 202 -----
NetworkDiscovery/html/loadsystem.css | 90 ---
NetworkDiscovery/html/loadsystem.html | 35 -
NetworkDiscovery/html/networkdiscovery.css | 80 --
NetworkDiscovery/html/networkdiscovery.html | 277 -------
.../html/networkdiscovery_userchoice.html | 22 -
NetworkDiscovery/html/old.png | Bin 316905 -> 0 bytes
NetworkDiscovery/html/old.txt | 19 -
NetworkDiscovery/html/preload-debug.html | 34 -
NetworkDiscovery/html/preload.css | 105 ---
NetworkDiscovery/html/preload.html | 42 -
NetworkDiscovery/html/test.css | 19 -
NetworkDiscovery/html/test.html | 39 -
NetworkDiscovery/interfaceconfiguration.cpp | 134 ----
NetworkDiscovery/interfaceconfiguration.h | 58 --
NetworkDiscovery/main.cpp | 12 -
NetworkDiscovery/nd.qrc | 28 -
NetworkDiscovery/ndgui.cpp | 385 ---------
NetworkDiscovery/ndgui.h | 72 --
NetworkDiscovery/ndgui.ui | 19 -
NetworkDiscovery/networkdiscovery.cpp | 861 ---------------------
NetworkDiscovery/networkdiscovery.h | 110 ---
NetworkDiscovery/networkmanager.cpp | 676 ----------------
NetworkDiscovery/networkmanager.h | 65 --
.../Debug/UnixDomainSocketServer | Bin 54333 -> 0 bytes
UnixDomainSocketServer/Debug/makefile | 43 -
UnixDomainSocketServer/Debug/objects.mk | 7 -
UnixDomainSocketServer/Debug/server.d | 3 -
UnixDomainSocketServer/Debug/sources.mk | 17 -
UnixDomainSocketServer/Debug/subdir.mk | 24 -
UnixDomainSocketServer/Makefile | 5 -
UnixDomainSocketServer/server | Bin 10209 -> 0 bytes
UnixDomainSocketServer/server.c | 78 --
58 files changed, 5563 deletions(-)
delete mode 100644 NetworkDiscovery/.gitignore
delete mode 100644 NetworkDiscovery/.settings/org.eclipse.ltk.core.refactoring.prefs
delete mode 100644 NetworkDiscovery/CMakeLists.txt
delete mode 100644 NetworkDiscovery/Makefile.Debug
delete mode 100644 NetworkDiscovery/Makefile.Release
delete mode 100644 NetworkDiscovery/NetworkDiscovery.pro
delete mode 100644 NetworkDiscovery/html/background.png
delete mode 100644 NetworkDiscovery/html/continueBoot.html
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_flat_10_000000_40x100.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_glass_100_f6f6f6_1x400.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_glass_100_fdf5ce_1x400.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_glass_65_ffffff_1x400.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-icons_222222_256x240.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-icons_228ef1_256x240.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-icons_ef8c08_256x240.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-icons_ffd27a_256x240.png
delete mode 100644 NetworkDiscovery/html/css/images/ui-icons_ffffff_256x240.png
delete mode 100644 NetworkDiscovery/html/css/jquery-ui-1.8.16.css
delete mode 100644 NetworkDiscovery/html/js/jquery-1.6.4.min.js
delete mode 100644 NetworkDiscovery/html/js/jquery-ui-1.8.16.min.js
delete mode 100644 NetworkDiscovery/html/js/networkDiscovery.js
delete mode 100644 NetworkDiscovery/html/loadsystem.css
delete mode 100644 NetworkDiscovery/html/loadsystem.html
delete mode 100644 NetworkDiscovery/html/networkdiscovery.css
delete mode 100644 NetworkDiscovery/html/networkdiscovery.html
delete mode 100644 NetworkDiscovery/html/networkdiscovery_userchoice.html
delete mode 100644 NetworkDiscovery/html/old.png
delete mode 100644 NetworkDiscovery/html/old.txt
delete mode 100644 NetworkDiscovery/html/preload-debug.html
delete mode 100644 NetworkDiscovery/html/preload.css
delete mode 100644 NetworkDiscovery/html/preload.html
delete mode 100644 NetworkDiscovery/html/test.css
delete mode 100644 NetworkDiscovery/html/test.html
delete mode 100644 NetworkDiscovery/interfaceconfiguration.cpp
delete mode 100644 NetworkDiscovery/interfaceconfiguration.h
delete mode 100644 NetworkDiscovery/main.cpp
delete mode 100644 NetworkDiscovery/nd.qrc
delete mode 100644 NetworkDiscovery/ndgui.cpp
delete mode 100644 NetworkDiscovery/ndgui.h
delete mode 100644 NetworkDiscovery/ndgui.ui
delete mode 100644 NetworkDiscovery/networkdiscovery.cpp
delete mode 100644 NetworkDiscovery/networkdiscovery.h
delete mode 100644 NetworkDiscovery/networkmanager.cpp
delete mode 100644 NetworkDiscovery/networkmanager.h
delete mode 100755 UnixDomainSocketServer/Debug/UnixDomainSocketServer
delete mode 100644 UnixDomainSocketServer/Debug/makefile
delete mode 100644 UnixDomainSocketServer/Debug/objects.mk
delete mode 100644 UnixDomainSocketServer/Debug/server.d
delete mode 100644 UnixDomainSocketServer/Debug/sources.mk
delete mode 100644 UnixDomainSocketServer/Debug/subdir.mk
delete mode 100644 UnixDomainSocketServer/Makefile
delete mode 100755 UnixDomainSocketServer/server
delete mode 100644 UnixDomainSocketServer/server.c
diff --git a/NetworkDiscovery/.gitignore b/NetworkDiscovery/.gitignore
deleted file mode 100644
index dd5959f..0000000
--- a/NetworkDiscovery/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build
-Makefile
diff --git a/NetworkDiscovery/.settings/org.eclipse.ltk.core.refactoring.prefs b/NetworkDiscovery/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index e58f4e1..0000000
--- a/NetworkDiscovery/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Sep 05 16:49:17 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/NetworkDiscovery/CMakeLists.txt b/NetworkDiscovery/CMakeLists.txt
deleted file mode 100644
index 78af80b..0000000
--- a/NetworkDiscovery/CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(NetworkDiscovery)
-
-set(QT_MIN_VERSION "4.7.0")
-#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-
-find_package(Qt4 REQUIRED)
-if (QT4_FOUND)
- message(STATUS "QT4 found.")
-else(QT4_FOUND)
- message(FATAL_ERROR "QT4 not found!")
-endif(QT4_FOUND)
-
-#find_package(Qxt REQUIRED)
-
-set(QT_USE_QTCORE TRUE)
-set(QT_USE_QTGUI TRUE)
-set(QT_USE_QTNETWORK TRUE)
-set(QT_USE_QTWEBKIT TRUE)
-
-file(GLOB LOGRECEIVER_SOURCES ./*.cpp)
-file(GLOB LOGRECEIVER_MOC_HEADERS ./*.h)
-file(GLOB LOGRECEIVER_UIS ./*.ui)
-file(GLOB LOGRECEIVER_RCS ./*.qrc)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR}
- /usr/include/
- /usr/include/netlink/
- /usr/include/netlink/route/
- ./../customdhcpcd/src/
- ./build
- ${QT_INCLUDES}
- )
-
-include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-
-link_directories(/usr/lib
- /home/niklas/fbgui/customdhcpcd/src/build)
-
-#add_library(
-# /usr/local/Qxt/lib/libQxtCore.so
-# /usr/lib/libqjson.so
-# /usr/lib/libusb-1.0.a
-# )
-
-QT4_ADD_RESOURCES(LOGRECEIVER_RC_SOURCES ${LOGRECEIVER_RCS})
-QT4_WRAP_CPP(LOGRECEIVER_MOC_SOURCES ${LOGRECEIVER_MOC_HEADERS})
-QT4_WRAP_UI(LOGRECEIVER_UI_HEADERS ${LOGRECEIVER_UIS})
-
-
-add_executable(NetworkDiscovery
- ${QT_INCLUDES}
- ${LOGRECEIVER_SOURCES}
- ${LOGRECEIVER_MOC_SOURCES}
- ${LOGRECEIVER_UI_HEADERS}
- ${LOGRECEIVER_RC_SOURCES})
-
-target_link_libraries(NetworkDiscovery
- ${QT_LIBRARIES}
- sysfs customdhcpcd nl)
diff --git a/NetworkDiscovery/Makefile.Debug b/NetworkDiscovery/Makefile.Debug
deleted file mode 100644
index f838703..0000000
--- a/NetworkDiscovery/Makefile.Debug
+++ /dev/null
@@ -1,264 +0,0 @@
-#############################################################################
-# Makefile for building: LogReceiver
-# Generated by qmake (2.01a) (Qt 4.7.2) on: Fri Oct 7 13:36:07 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 -I../customdhcpcd/src -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 -lsysfs -L/home/niklas/fbgui/customdhcpcd/src/build -llibcustomdhcpcd -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 = networkmanager.cpp \
- networkdiscovery.cpp \
- interfaceconfiguration.cpp \
- ndgui.cpp \
- main.cpp debug/moc_networkmanager.cpp \
- debug/moc_networkdiscovery.cpp \
- debug/moc_interfaceconfiguration.cpp \
- debug/moc_ndgui.cpp \
- debug/qrc_nd.cpp
-OBJECTS = debug/networkmanager.o \
- debug/networkdiscovery.o \
- debug/interfaceconfiguration.o \
- debug/ndgui.o \
- debug/main.o \
- debug/moc_networkmanager.o \
- debug/moc_networkdiscovery.o \
- debug/moc_interfaceconfiguration.o \
- debug/moc_ndgui.o \
- debug/qrc_nd.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_ndgui.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 networkmanager.h networkdiscovery.h interfaceconfiguration.h ndgui.h debug/LogReceiver1.0.0/ && $(COPY_FILE) --parents nd.qrc debug/LogReceiver1.0.0/ && $(COPY_FILE) --parents networkmanager.cpp networkdiscovery.cpp interfaceconfiguration.cpp ndgui.cpp main.cpp debug/LogReceiver1.0.0/ && $(COPY_FILE) --parents ndgui.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_networkmanager.cpp debug/moc_networkdiscovery.cpp debug/moc_interfaceconfiguration.cpp debug/moc_ndgui.cpp
-compiler_moc_header_clean:
- -$(DEL_FILE) debug/moc_networkmanager.cpp debug/moc_networkdiscovery.cpp debug/moc_interfaceconfiguration.cpp debug/moc_ndgui.cpp
-debug/moc_networkmanager.cpp: networkmanager.h
- /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) networkmanager.h -o debug/moc_networkmanager.cpp
-
-debug/moc_networkdiscovery.cpp: interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h \
- networkdiscovery.h
- /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) networkdiscovery.h -o debug/moc_networkdiscovery.cpp
-
-debug/moc_interfaceconfiguration.cpp: interfaceconfiguration.h
- /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) interfaceconfiguration.h -o debug/moc_interfaceconfiguration.cpp
-
-debug/moc_ndgui.cpp: networkdiscovery.h \
- interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h \
- ndgui.h
- /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) ndgui.h -o debug/moc_ndgui.cpp
-
-compiler_rcc_make_all: debug/qrc_nd.cpp
-compiler_rcc_clean:
- -$(DEL_FILE) debug/qrc_nd.cpp
-debug/qrc_nd.cpp: nd.qrc \
- html/networkdiscovery_userchoice.html \
- html/networkdiscovery.css \
- html/continueBoot.html \
- html/preload-debug.html \
- html/networkdiscovery.html \
- html/background.png \
- html/css/jquery-ui-1.8.16.css \
- html/css/images/ui-icons_228ef1_256x240.png \
- html/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
- html/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
- html/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
- html/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
- html/css/images/ui-icons_222222_256x240.png \
- html/css/images/ui-icons_ffd27a_256x240.png \
- html/css/images/ui-bg_glass_65_ffffff_1x400.png \
- html/css/images/ui-icons_ef8c08_256x240.png \
- html/css/images/ui-bg_glass_100_f6f6f6_1x400.png \
- html/css/images/ui-bg_glass_100_fdf5ce_1x400.png \
- html/css/images/ui-bg_flat_10_000000_40x100.png \
- html/css/images/ui-bg_diagonals-thick_20_666666_40x40.png \
- html/css/images/ui-icons_ffffff_256x240.png \
- html/js/jquery-ui-1.8.16.min.js \
- html/js/jquery-1.6.4.min.js
- /usr/local/Trolltech/Qt-4.7.2/bin/rcc -name nd nd.qrc -o debug/qrc_nd.cpp
-
-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
-compiler_uic_clean:
- -$(DEL_FILE) ui_ndgui.h
-ui_ndgui.h: ndgui.ui
- /usr/local/Trolltech/Qt-4.7.2/bin/uic ndgui.ui -o ui_ndgui.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_rcc_clean compiler_uic_clean
-
-####### Compile
-
-debug/networkmanager.o: networkmanager.cpp networkmanager.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/networkmanager.o networkmanager.cpp
-
-debug/networkdiscovery.o: networkdiscovery.cpp networkdiscovery.h \
- interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/networkdiscovery.o networkdiscovery.cpp
-
-debug/interfaceconfiguration.o: interfaceconfiguration.cpp interfaceconfiguration.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/interfaceconfiguration.o interfaceconfiguration.cpp
-
-debug/ndgui.o: ndgui.cpp ndgui.h \
- networkdiscovery.h \
- interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ndgui.o ndgui.cpp
-
-debug/main.o: main.cpp ndgui.h \
- networkdiscovery.h \
- interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o main.cpp
-
-debug/moc_networkmanager.o: debug/moc_networkmanager.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_networkmanager.o debug/moc_networkmanager.cpp
-
-debug/moc_networkdiscovery.o: debug/moc_networkdiscovery.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_networkdiscovery.o debug/moc_networkdiscovery.cpp
-
-debug/moc_interfaceconfiguration.o: debug/moc_interfaceconfiguration.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_interfaceconfiguration.o debug/moc_interfaceconfiguration.cpp
-
-debug/moc_ndgui.o: debug/moc_ndgui.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ndgui.o debug/moc_ndgui.cpp
-
-debug/qrc_nd.o: debug/qrc_nd.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/qrc_nd.o debug/qrc_nd.cpp
-
-####### Install
-
-install: FORCE
-
-uninstall: FORCE
-
-FORCE:
-
diff --git a/NetworkDiscovery/Makefile.Release b/NetworkDiscovery/Makefile.Release
deleted file mode 100644
index d6c9cee..0000000
--- a/NetworkDiscovery/Makefile.Release
+++ /dev/null
@@ -1,264 +0,0 @@
-#############################################################################
-# Makefile for building: LogReceiver
-# Generated by qmake (2.01a) (Qt 4.7.2) on: Fri Oct 7 13:36:07 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 -I../customdhcpcd/src -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 -lsysfs -L/home/niklas/fbgui/customdhcpcd/src/build -llibcustomdhcpcd -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 = networkmanager.cpp \
- networkdiscovery.cpp \
- interfaceconfiguration.cpp \
- ndgui.cpp \
- main.cpp release/moc_networkmanager.cpp \
- release/moc_networkdiscovery.cpp \
- release/moc_interfaceconfiguration.cpp \
- release/moc_ndgui.cpp \
- release/qrc_nd.cpp
-OBJECTS = release/networkmanager.o \
- release/networkdiscovery.o \
- release/interfaceconfiguration.o \
- release/ndgui.o \
- release/main.o \
- release/moc_networkmanager.o \
- release/moc_networkdiscovery.o \
- release/moc_interfaceconfiguration.o \
- release/moc_ndgui.o \
- release/qrc_nd.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_ndgui.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 networkmanager.h networkdiscovery.h interfaceconfiguration.h ndgui.h release/LogReceiver1.0.0/ && $(COPY_FILE) --parents nd.qrc release/LogReceiver1.0.0/ && $(COPY_FILE) --parents networkmanager.cpp networkdiscovery.cpp interfaceconfiguration.cpp ndgui.cpp main.cpp release/LogReceiver1.0.0/ && $(COPY_FILE) --parents ndgui.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_networkmanager.cpp release/moc_networkdiscovery.cpp release/moc_interfaceconfiguration.cpp release/moc_ndgui.cpp
-compiler_moc_header_clean:
- -$(DEL_FILE) release/moc_networkmanager.cpp release/moc_networkdiscovery.cpp release/moc_interfaceconfiguration.cpp release/moc_ndgui.cpp
-release/moc_networkmanager.cpp: networkmanager.h
- /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) networkmanager.h -o release/moc_networkmanager.cpp
-
-release/moc_networkdiscovery.cpp: interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h \
- networkdiscovery.h
- /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) networkdiscovery.h -o release/moc_networkdiscovery.cpp
-
-release/moc_interfaceconfiguration.cpp: interfaceconfiguration.h
- /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) interfaceconfiguration.h -o release/moc_interfaceconfiguration.cpp
-
-release/moc_ndgui.cpp: networkdiscovery.h \
- interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h \
- ndgui.h
- /usr/local/Trolltech/Qt-4.7.2/bin/moc $(DEFINES) $(INCPATH) ndgui.h -o release/moc_ndgui.cpp
-
-compiler_rcc_make_all: release/qrc_nd.cpp
-compiler_rcc_clean:
- -$(DEL_FILE) release/qrc_nd.cpp
-release/qrc_nd.cpp: nd.qrc \
- html/networkdiscovery_userchoice.html \
- html/networkdiscovery.css \
- html/continueBoot.html \
- html/preload-debug.html \
- html/networkdiscovery.html \
- html/background.png \
- html/css/jquery-ui-1.8.16.css \
- html/css/images/ui-icons_228ef1_256x240.png \
- html/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png \
- html/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png \
- html/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png \
- html/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png \
- html/css/images/ui-icons_222222_256x240.png \
- html/css/images/ui-icons_ffd27a_256x240.png \
- html/css/images/ui-bg_glass_65_ffffff_1x400.png \
- html/css/images/ui-icons_ef8c08_256x240.png \
- html/css/images/ui-bg_glass_100_f6f6f6_1x400.png \
- html/css/images/ui-bg_glass_100_fdf5ce_1x400.png \
- html/css/images/ui-bg_flat_10_000000_40x100.png \
- html/css/images/ui-bg_diagonals-thick_20_666666_40x40.png \
- html/css/images/ui-icons_ffffff_256x240.png \
- html/js/jquery-ui-1.8.16.min.js \
- html/js/jquery-1.6.4.min.js
- /usr/local/Trolltech/Qt-4.7.2/bin/rcc -name nd nd.qrc -o release/qrc_nd.cpp
-
-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
-compiler_uic_clean:
- -$(DEL_FILE) ui_ndgui.h
-ui_ndgui.h: ndgui.ui
- /usr/local/Trolltech/Qt-4.7.2/bin/uic ndgui.ui -o ui_ndgui.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_rcc_clean compiler_uic_clean
-
-####### Compile
-
-release/networkmanager.o: networkmanager.cpp networkmanager.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/networkmanager.o networkmanager.cpp
-
-release/networkdiscovery.o: networkdiscovery.cpp networkdiscovery.h \
- interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/networkdiscovery.o networkdiscovery.cpp
-
-release/interfaceconfiguration.o: interfaceconfiguration.cpp interfaceconfiguration.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/interfaceconfiguration.o interfaceconfiguration.cpp
-
-release/ndgui.o: ndgui.cpp ndgui.h \
- networkdiscovery.h \
- interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ndgui.o ndgui.cpp
-
-release/main.o: main.cpp ndgui.h \
- networkdiscovery.h \
- interfaceconfiguration.h \
- networkmanager.h \
- ../common/fbgui.h
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o main.cpp
-
-release/moc_networkmanager.o: release/moc_networkmanager.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_networkmanager.o release/moc_networkmanager.cpp
-
-release/moc_networkdiscovery.o: release/moc_networkdiscovery.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_networkdiscovery.o release/moc_networkdiscovery.cpp
-
-release/moc_interfaceconfiguration.o: release/moc_interfaceconfiguration.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_interfaceconfiguration.o release/moc_interfaceconfiguration.cpp
-
-release/moc_ndgui.o: release/moc_ndgui.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ndgui.o release/moc_ndgui.cpp
-
-release/qrc_nd.o: release/qrc_nd.cpp
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/qrc_nd.o release/qrc_nd.cpp
-
-####### Install
-
-install: FORCE
-
-uninstall: FORCE
-
-FORCE:
-
diff --git a/NetworkDiscovery/NetworkDiscovery.pro b/NetworkDiscovery/NetworkDiscovery.pro
deleted file mode 100644
index 802bfeb..0000000
--- a/NetworkDiscovery/NetworkDiscovery.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = app
-TARGET = LogReceiver
-QT += core \
- gui \
- network
-LIBS += -lsysfs \
- -L/home/niklas/fbgui/customdhcpcd/src/build \
- -llibcustomdhcpcd
-INCLUDEPATH += /home/niklas/fbgui/customdhcpcd/src
-HEADERS += networkmanager.h \
- networkdiscovery.h \
- interfaceconfiguration.h \
- ndgui.h
-SOURCES += interfaceconfiguration.cpp \
- main.cpp \
- ndgui.cpp \
- networkdiscovery.cpp \
- networkmanager.cpp
-FORMS += ndgui.ui
-RESOURCES += nd.qrc
diff --git a/NetworkDiscovery/html/background.png b/NetworkDiscovery/html/background.png
deleted file mode 100644
index 7e374f9..0000000
Binary files a/NetworkDiscovery/html/background.png and /dev/null differ
diff --git a/NetworkDiscovery/html/continueBoot.html b/NetworkDiscovery/html/continueBoot.html
deleted file mode 100644
index 89020b7..0000000
--- a/NetworkDiscovery/html/continueBoot.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Continue Boot
-
-
-
-
-
-
-
diff --git a/NetworkDiscovery/html/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/NetworkDiscovery/html/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
deleted file mode 100644
index 954e22d..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/NetworkDiscovery/html/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
deleted file mode 100644
index 64ece57..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_diagonals-thick_20_666666_40x40.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-bg_flat_10_000000_40x100.png b/NetworkDiscovery/html/css/images/ui-bg_flat_10_000000_40x100.png
deleted file mode 100644
index abdc010..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_flat_10_000000_40x100.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-bg_glass_100_f6f6f6_1x400.png b/NetworkDiscovery/html/css/images/ui-bg_glass_100_f6f6f6_1x400.png
deleted file mode 100644
index 9b383f4..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_glass_100_f6f6f6_1x400.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-bg_glass_100_fdf5ce_1x400.png b/NetworkDiscovery/html/css/images/ui-bg_glass_100_fdf5ce_1x400.png
deleted file mode 100644
index a23baad..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_glass_100_fdf5ce_1x400.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-bg_glass_65_ffffff_1x400.png b/NetworkDiscovery/html/css/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100644
index 42ccba2..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/NetworkDiscovery/html/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
deleted file mode 100644
index 39d5824..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/NetworkDiscovery/html/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
deleted file mode 100644
index f127367..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/NetworkDiscovery/html/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
deleted file mode 100644
index 359397a..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-icons_222222_256x240.png b/NetworkDiscovery/html/css/images/ui-icons_222222_256x240.png
deleted file mode 100644
index b273ff1..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-icons_228ef1_256x240.png b/NetworkDiscovery/html/css/images/ui-icons_228ef1_256x240.png
deleted file mode 100644
index a641a37..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-icons_228ef1_256x240.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-icons_ef8c08_256x240.png b/NetworkDiscovery/html/css/images/ui-icons_ef8c08_256x240.png
deleted file mode 100644
index 85e63e9..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-icons_ef8c08_256x240.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-icons_ffd27a_256x240.png b/NetworkDiscovery/html/css/images/ui-icons_ffd27a_256x240.png
deleted file mode 100644
index e117eff..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-icons_ffd27a_256x240.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/images/ui-icons_ffffff_256x240.png b/NetworkDiscovery/html/css/images/ui-icons_ffffff_256x240.png
deleted file mode 100644
index 42f8f99..0000000
Binary files a/NetworkDiscovery/html/css/images/ui-icons_ffffff_256x240.png and /dev/null differ
diff --git a/NetworkDiscovery/html/css/jquery-ui-1.8.16.css b/NetworkDiscovery/html/css/jquery-ui-1.8.16.css
deleted file mode 100644
index 5547c7b..0000000
--- a/NetworkDiscovery/html/css/jquery-ui-1.8.16.css
+++ /dev/null
@@ -1,568 +0,0 @@
-/*
- * jQuery UI CSS Framework 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
- * jQuery UI CSS Framework 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
-.ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
- * jQuery UI Resizable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
- * jQuery UI Selectable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*
- * jQuery UI Accordion 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*
- * jQuery UI Autocomplete 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.16
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
- list-style:none;
- padding: 2px;
- margin: 0;
- display:block;
- float: left;
-}
-.ui-menu .ui-menu {
- margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
- margin:0;
- padding: 0;
- zoom: 1;
- float: left;
- clear: left;
- width: 100%;
-}
-.ui-menu .ui-menu-item a {
- text-decoration:none;
- display:block;
- padding:.2em .4em;
- line-height:1.5;
- zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
- font-weight: normal;
- margin: -1px;
-}
-/*
- * jQuery UI Button 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; }
-button.ui-button-icons-only { width: 3.7em; }
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4; }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*
- * jQuery UI Dialog 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative; }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*
- * jQuery UI Slider 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
- * jQuery UI Tabs 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*
- * jQuery UI Datepicker 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month,
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
- display: none; /*sorry for IE5*/
- display/**/: block; /*sorry for IE5*/
- position: absolute; /*must have*/
- z-index: -1; /*must have*/
- filter: mask(); /*must have*/
- top: -4px; /*must have*/
- left: -4px; /*must have*/
- width: 200px; /*must have*/
- height: 200px; /*must have*/
-}/*
- * jQuery UI Progressbar 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/NetworkDiscovery/html/js/jquery-1.6.4.min.js b/NetworkDiscovery/html/js/jquery-1.6.4.min.js
deleted file mode 100644
index 628ed9b..0000000
--- a/NetworkDiscovery/html/js/jquery-1.6.4.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.6.4 http://jquery.com/ | http://jquery.org/license */
-(function(a,b){function cu(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cr(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"":"")+""),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cq(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cp(){cn=b}function co(){setTimeout(cp,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bv(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bl(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bd,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bk(a){f.nodeName(a,"input")?bj(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bj)}function bj(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bi(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bh(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bg(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i=0===c})}function U(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function M(a,b){return(a&&a!=="*"?a+".":"")+b.replace(y,"`").replace(z,"&")}function L(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function J(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function D(){return!0}function C(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.4",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;B.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;ca ",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i=f.expando,j=typeof c=="string",k=a.nodeType,l=k?f.cache:a,m=k?a[f.expando]:a[f.expando]&&f.expando;if((!m||e&&m&&l[m]&&!l[m][i])&&j&&d===b)return;m||(k?a[f.expando]=m=++f.uuid:m=f.expando),l[m]||(l[m]={},k||(l[m].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?l[m][i]=f.extend(l[m][i],c):l[m]=f.extend(l[m],c);g=l[m],e&&(g[i]||(g[i]={}),g=g[i]),d!==b&&(g[f.camelCase(c)]=d);if(c==="events"&&!g[c])return g[i]&&g[i].events;j?(h=g[c],h==null&&(h=g[f.camelCase(c)])):h=g;return h}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e=f.expando,g=a.nodeType,h=g?f.cache:a,i=g?a[f.expando]:f.expando;if(!h[i])return;if(b){d=c?h[i][e]:h[i];if(d){d[b]||(b=f.camelCase(b)),delete d[b];if(!l(d))return}}if(c){delete h[i][e];if(!l(h[i]))return}var j=h[i][e];f.support.deleteExpando||!h.setInterval?delete h[i]:h[i]=null,j?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=j):g&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=v:u&&(i=u)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.attr(a,b,""),a.removeAttribute(b),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(u&&f.nodeName(a,"button"))return u.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(u&&f.nodeName(a,"button"))return u.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==null?g:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabIndex=f.propHooks.tabIndex,v={get:function(a,c){var d;return f.prop(a,c)===!0||(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(u=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var w=/\.(.*)$/,x=/^(?:textarea|input|select)$/i,y=/\./g,z=/ /g,A=/[^\w\s.|`]/g,B=function(a){return a.replace(A,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=C;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=C);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),B).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j =0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},I=function(c){var d=c.target,e,g;if(!!x.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=H(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:I,beforedeactivate:I,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&I.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&I.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",H(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in G)f.event.add(this,c+".specialChange",G[c]);return x.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return x.test(this.nodeName)}},G=f.event.special.change.filters,G.focus=G.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c ",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML=" ",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="
";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=S.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(U(c[0])||U(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=R.call(arguments);N.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!T[a]?f.unique(e):e,(this.length>1||P.test(d))&&O.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,""," "],thead:[1,""],tr:[2,""],td:[3,""],col:[2,""],area:[1,""," "],_default:[0,"",""]};be.optgroup=be.option,be.tbody=be.tfoot=be.colgroup=be.caption=be.thead,be.th=be.td,f.support.htmlSerialize||(be._default=[1,"div","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!be[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>$2>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bh(a,d),e=bi(a),g=bi(d);for(h=0;e[h];++h)g[h]&&bh(e[h],g[h])}if(b){bg(a,d);if(c){e=bi(a),g=bi(d);for(h=0;e[h];++h)bg(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=be[l]||be._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bn.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bm,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bm.test(g)?g.replace(bm,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bv(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bw=function(a,c){var d,e,g;c=c.replace(bo,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bx=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bp.test(d)&&bq.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bv=bw||bx,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bz=/%20/g,bA=/\[\]$/,bB=/\r?\n/g,bC=/#.*$/,bD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bE=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bF=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bG=/^(?:GET|HEAD)$/,bH=/^\/\//,bI=/\?/,bJ=/
-
-
-
-
-
Loading system, please wait...
-
-
-
-
diff --git a/NetworkDiscovery/html/networkdiscovery.css b/NetworkDiscovery/html/networkdiscovery.css
deleted file mode 100644
index 669ad58..0000000
--- a/NetworkDiscovery/html/networkdiscovery.css
+++ /dev/null
@@ -1,80 +0,0 @@
-html,body{
- height:100%;
-}
-
-label, input {
- display:block
-}
-
-input.text {
- margin-bottom:12px;
- width:95%;
- padding: .4em;
-}
-
-fieldset {
- padding:0;
- border:0;
- margin-top:25px;
-}
-
-.validateTips {
- border:1px solid transparent;
- padding: 0.3;
-}
-
-body{
- margin:0;
- padding:0;
- /*background-color:blue;
- /*
- background-image:url('background.png');
- background-repeat:no-repeat;
- */
- background-size:100%;
-}
-
-/* Tell the browser to render HTML 5 elements as block */
-header, footer, aside {
- display: block;
-}
-
-#intro {
- margin: 20px;
-}
-
-#content {
- display: table;
- width: 100%;
-}
-
-#mainContent {
- display: table-cell;
- width: 620px;
- padding-right: 22px;
- padding-left: 22px;
-}
-
-aside {
- display: table-cell;
- width: 300px;
-}
-
-#nd_manual_configuration_dialog, #nd_show_log_dialog {
- display:none;
-}
-
-textarea {
- width: 400px;
- resize: none;
-}
-
-h1 {
- margin-top: 20px;
-}
-
-h1, p{
- color:#333;
- text-align:center;
-}
-
diff --git a/NetworkDiscovery/html/networkdiscovery.html b/NetworkDiscovery/html/networkdiscovery.html
deleted file mode 100644
index 6c516f9..0000000
--- a/NetworkDiscovery/html/networkdiscovery.html
+++ /dev/null
@@ -1,277 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Welcome to the Network Discovery. We are now looking for usable interfaces and will go on as soon as we found one. This may take a few seconds.
-
-
-
-
-
-
- test
-
-
-
-
-
-
-
-
-
-
All form fields are required.
-
-
-
-
-
-
-
-
-
- RZ Uni Freiburg, 2011
-
-
-
diff --git a/NetworkDiscovery/html/networkdiscovery_userchoice.html b/NetworkDiscovery/html/networkdiscovery_userchoice.html
deleted file mode 100644
index 9cf165f..0000000
--- a/NetworkDiscovery/html/networkdiscovery_userchoice.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Please press F5 if you want to choose which interface to use.
-
-
- RZ Uni Freiburg, 2011
-
-
-
diff --git a/NetworkDiscovery/html/old.png b/NetworkDiscovery/html/old.png
deleted file mode 100644
index 84dd7b3..0000000
Binary files a/NetworkDiscovery/html/old.png and /dev/null differ
diff --git a/NetworkDiscovery/html/old.txt b/NetworkDiscovery/html/old.txt
deleted file mode 100644
index 5679b55..0000000
--- a/NetworkDiscovery/html/old.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Tell the browser to render HTML 5 elements as block */
-header, footer, aside {
- display: block;
-}
-
-#content {
- display: table;
-}
-
-#mainContent {
- display: table-cell;
- width: 620px;
- padding-right: 22px;
-}
-
-aside {
- display: table-cell;
- width: 300px;
-}
diff --git a/NetworkDiscovery/html/preload-debug.html b/NetworkDiscovery/html/preload-debug.html
deleted file mode 100644
index 29d7391..0000000
--- a/NetworkDiscovery/html/preload-debug.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/NetworkDiscovery/html/preload.css b/NetworkDiscovery/html/preload.css
deleted file mode 100644
index e1eff68..0000000
--- a/NetworkDiscovery/html/preload.css
+++ /dev/null
@@ -1,105 +0,0 @@
-html,body{
- height:100%;
-}
-body{
- margin:0;
- padding:0;
- background-color:black;
- /*
- background-image:url('background.png');
- background-repeat:no-repeat;
- */
- background-size:100%;
-}
-#top{
- position:absolute;
-}
-#message{
- position:absolute;
- top:37%;
- width:100%;
- font-size:90%;
-}
-h1, p{
- color:white;
- text-align:center;
-}
-#container{
- min-height:100%;
- margin-bottom:-50px;
-}
-* html #container{
- height:100%;
-}
-#footer-spacer{
- height:0px;
-}
-#footer{
- height:30px;
-}
-/* animation */
-/* position the bars and balls correctly (rotate them and translate them outward)*/
-.bar1 {
- -moz-transform:rotate(0deg) translate(0, -40px);
- -webkit-transform:rotate(0deg) translate(0, -40px);opacity:0.12;
-}
-.bar2 {
- -moz-transform:rotate(45deg) translate(0, -40px);
- -webkit-transform:rotate(45deg) translate(0, -40px);opacity:0.25;
-}
-.bar3 {
- -moz-transform:rotate(90deg) translate(0, -40px);
- -webkit-transform:rotate(90deg) translate(0, -40px);opacity:0.37;
-}
-.bar4 {
- -moz-transform:rotate(135deg) translate(0, -40px);
- -webkit-transform:rotate(135deg) translate(0, -40px);opacity:0.50;
-}
-.bar5 {
- -moz-transform:rotate(180deg) translate(0, -40px);
- -webkit-transform:rotate(180deg) translate(0, -40px);opacity:0.62;
-}
-.bar6 {
- -moz-transform:rotate(225deg) translate(0, -40px);
- -webkit-transform:rotate(225deg) translate(0, -40px);opacity:0.75;
-}
-.bar7 {
- -moz-transform:rotate(270deg) translate(0, -40px);
- -webkit-transform:rotate(270deg) translate(0, -40px);opacity:0.87;
-}
-.bar8 {
- -moz-transform:rotate(315deg) translate(0, -40px);
- -webkit-transform:rotate(315deg) translate(0, -40px);opacity:1;
-}
-#div4 {
- position:absolute;
- left:50%;
- top:50%;
- margin-left:-50px;
- margin-top:-50px;
- width:100px;
- height:100px;
- -moz-border-radius:100px;
- -webkit-border-radius:100px;
- -moz-transform:scale(0.5);
- -webkit-transform:scale(0.5);
- -webkit-animation-name: rotateThis;
- -webkit-animation-duration:2s;
- -webkit-animation-iteration-count:infinite;
- -webkit-animation-timing-function:linear;
-}
-#div4 div {
- width:20px;
- height:20px;
- background:#fff;
- -moz-border-radius:40px;
- -webkit-border-radius:40px;
- position:absolute;
- left:40px;
- top:40px;
-}
-/* add a shadow to the first */
-#div4 div {
- -moz-box-shadow:black 0 0 4px;
- -webkit-box-shadow:black 0 0 4px;
-}
diff --git a/NetworkDiscovery/html/preload.html b/NetworkDiscovery/html/preload.html
deleted file mode 100644
index bc0abd9..0000000
--- a/NetworkDiscovery/html/preload.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Waiting for internet...
-
-
-
-
-
-
-
-
diff --git a/NetworkDiscovery/html/test.css b/NetworkDiscovery/html/test.css
deleted file mode 100644
index 5679b55..0000000
--- a/NetworkDiscovery/html/test.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Tell the browser to render HTML 5 elements as block */
-header, footer, aside {
- display: block;
-}
-
-#content {
- display: table;
-}
-
-#mainContent {
- display: table-cell;
- width: 620px;
- padding-right: 22px;
-}
-
-aside {
- display: table-cell;
- width: 300px;
-}
diff --git a/NetworkDiscovery/html/test.html b/NetworkDiscovery/html/test.html
deleted file mode 100644
index c5132b1..0000000
--- a/NetworkDiscovery/html/test.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- Network Discovery
-
-
-
-
-
- Welcome to the Network Discovery. We are now looking for usable interfaces and will go on as soon as we found one. This may take a few seconds.
-
-
-
-
- RZ Uni Freiburg, 2011
-
-
-
-
-
diff --git a/NetworkDiscovery/interfaceconfiguration.cpp b/NetworkDiscovery/interfaceconfiguration.cpp
deleted file mode 100644
index e1eb1d8..0000000
--- a/NetworkDiscovery/interfaceconfiguration.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * interfaceconfiguration.cpp
- *
- * Created on: Sep 2, 2011
- * Author: niklas
- */
-#include "interfaceconfiguration.h"
-
-interfaceconfiguration::interfaceconfiguration() {
- _tag = "[nd:InterfaceConfiguration]";
-}
-
-interfaceconfiguration::~interfaceconfiguration() {
- // TODO Auto-generated destructor stub
-}
-
-/**
- * This method reads the configuration values out of a file.
- *
- * This method reads the configuration values out of a file.
- * The file has to be created before by the customdhcpcd QProcess.
- * (Overwrites the old values if they are already present.)
- *
- * @param pathToConfig
- * contains the path to the configuration file.
- */
-bool interfaceconfiguration::readConfigOutOfFile(QString pathToConfig) {
- QFile file(pathToConfig);
- if (file.exists()) {
- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
- qDebug() << _tag << "couldn't open file:" << pathToConfig;
- return false;
- }
- qDebug() << _tag << "read config file";
- while (!file.atEnd()) {
- QString line(file.readLine());
- QStringList splitedLine = line.split("=");
- QString name = splitedLine.first().trimmed();
- splitedLine.removeFirst();
- QString values = splitedLine.first().trimmed();
- values.remove(QChar('\''));
-
- if (name.compare("IPADDR") == 0) {
- this->ipAddress = values;
- } else if (name.compare("NETMASK") == 0) {
- this->netmask = values;
- } else if (name.compare("NETWORK") == 0) {
- this->network = values;
- } else if (name.compare("BROADCAST") == 0) {
- this->broadcast = values;
- } else if (name.compare("ROUTES") == 0) {
- this->routes = values;
- } else if (name.compare("GATEWAYS") == 0) {
- this->gateways = values;
- this->gateway = this->gateways.split(" ").first().trimmed();
- } else if (name.compare("HOSTNAME") == 0) {
- this->hostname = values;
- } else if (name.compare("DNSSEARCH") == 0) {
- this->dnssearch = values;
- } else if (name.compare("DNSSERVERS") == 0) {
- this->dnsservers = values;
- } else if (name.compare("DHCPSID") == 0) {
- this->dhcpsid = values;
- } else if (name.compare("INTERFACE") == 0) {
- this->interface = values;
- } else if (name.compare("CLIENTID") == 0) {
- this->clientid = values;
- } else if (name.compare("DHCPCHADDR") == 0) {
- this->dhcpchaddr = values;
- } else {
- qDebug() << _tag << "read unknown name" << name << values;
- }
- }
- } else {
- qDebug() << _tag << "file doesn't exist:" << pathToConfig;
- return false;
- }
- return true;
-}
-
-QString interfaceconfiguration::getBroadcast() {
- return broadcast;
-}
-
-QString interfaceconfiguration::getClientid() {
- return clientid;
-}
-
-QString interfaceconfiguration::getDhcpchaddr() {
- return dhcpchaddr;
-}
-
-QString interfaceconfiguration::getDhcpsid() {
- return dhcpsid;
-}
-QString interfaceconfiguration::getDnssearch() {
- return dnssearch;
-}
-
-QString interfaceconfiguration::getDnsservers() {
- return dnsservers;
-}
-
-QString interfaceconfiguration::getGateways() {
- return gateways;
-}
-
-QString interfaceconfiguration::getGateway() {
- return gateway;
-}
-
-QString interfaceconfiguration::getHostname() {
- return hostname;
-}
-
-QString interfaceconfiguration::getInterface() {
- return interface;
-}
-
-QString interfaceconfiguration::getIpAddress() {
- return ipAddress;
-}
-
-QString interfaceconfiguration::getNetmask() {
- return netmask;
-}
-
-QString interfaceconfiguration::getNetwork() {
- return network;
-}
-
-QString interfaceconfiguration::getRoutes() {
- return routes;
-}
diff --git a/NetworkDiscovery/interfaceconfiguration.h b/NetworkDiscovery/interfaceconfiguration.h
deleted file mode 100644
index 2656b3f..0000000
--- a/NetworkDiscovery/interfaceconfiguration.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * interfaceconfiguration.h
- *
- * Created on: Sep 2, 2011
- * Author: niklas
- */
-
-#ifndef INTERFACECONFIGURATION_H_
-#define INTERFACECONFIGURATION_H_
-
-#include
-
-class interfaceconfiguration: public QObject {
-Q_OBJECT
-
-public:
- interfaceconfiguration();
- interfaceconfiguration(const interfaceconfiguration &other);
-
- interfaceconfiguration &operator=(const interfaceconfiguration &other);
- virtual ~interfaceconfiguration();
-
- bool readConfigOutOfFile(QString pathToConfig);
- QString getBroadcast();
- QString getClientid();
- QString getDhcpchaddr();
- QString getDhcpsid();
- QString getDnssearch();
- QString getDnsservers();
- QString getGateways();
- QString getGateway();
- QString getHostname();
- QString getInterface();
- QString getIpAddress();
- QString getNetmask();
- QString getNetwork();
- QString getRoutes();
-
-private:
- QString _tag;
-
- QString ipAddress;
- QString netmask;
- QString network;
- QString broadcast;
- QString routes;
- QString gateway;
- QString gateways;
- QString hostname;
- QString dnssearch;
- QString dnsservers;
- QString dhcpsid;
- QString interface;
- QString clientid;
- QString dhcpchaddr;
-};
-
-#endif /* INTERFACECONFIGURATION_H_ */
diff --git a/NetworkDiscovery/main.cpp b/NetworkDiscovery/main.cpp
deleted file mode 100644
index a8cd960..0000000
--- a/NetworkDiscovery/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "ndgui.h"
-
-#include
-#include
-
-int main(int argc, char *argv[])
-{
- QApplication a(argc, argv);
- ndgui w;
- w.show();
- return a.exec();
-}
diff --git a/NetworkDiscovery/nd.qrc b/NetworkDiscovery/nd.qrc
deleted file mode 100644
index bf3aa8d..0000000
--- a/NetworkDiscovery/nd.qrc
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
- html/css/jquery-ui-1.8.16.css
- html/js/jquery-1.6.4.min.js
- html/js/jquery-ui-1.8.16.min.js
- html/background.png
- html/networkdiscovery.css
- html/networkdiscovery.html
- html/preload-debug.html
- html/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
- html/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
- html/css/images/ui-bg_flat_10_000000_40x100.png
- html/css/images/ui-bg_glass_65_ffffff_1x400.png
- html/css/images/ui-bg_glass_100_f6f6f6_1x400.png
- html/css/images/ui-bg_glass_100_fdf5ce_1x400.png
- html/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
- html/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
- html/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
- html/css/images/ui-icons_228ef1_256x240.png
- html/css/images/ui-icons_222222_256x240.png
- html/css/images/ui-icons_ef8c08_256x240.png
- html/css/images/ui-icons_ffd27a_256x240.png
- html/css/images/ui-icons_ffffff_256x240.png
- html/continueBoot.html
- html/networkdiscovery_userchoice.html
- html/js/networkDiscovery.js
-
-
diff --git a/NetworkDiscovery/ndgui.cpp b/NetworkDiscovery/ndgui.cpp
deleted file mode 100644
index a1ccecb..0000000
--- a/NetworkDiscovery/ndgui.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-#include "ndgui.h"
-
-ndgui::ndgui(QMainWindow *parent) :
- QMainWindow(parent) {
-
- _tag = "[nd:ndgui]";
-
- _started = false;
- _userChoice = false;
- _tryAgain = false;
-
- createAction();
-
- connect(&networkDiscovery, SIGNAL(addInterface(const QString &)), this, SLOT(addInterface( const QString &)));
- connect(&networkDiscovery, SIGNAL(changeProgressBarValue(const QString & , const int& )), this, SLOT(updateIfProgressBar(const QString & , const int&)));
- connect(&networkDiscovery, SIGNAL(connectionEstablished(QString)), this, SLOT(handleConnectionEstablished(QString)));
- connect(&networkDiscovery, SIGNAL(abortBoot(QString)), this, SLOT(abortBoot(const QString)));
- connect(&networkDiscovery, SIGNAL(updateIfStatus(QString,QString)), this, SLOT(updateIfStatus(const QString &, const QString &)));
- connect(&networkDiscovery, SIGNAL(allProcessesFinished()), this, SLOT(handleAllProcessesFinished()));
- connect(&networkDiscovery, SIGNAL(continueBoot(QString, int)), this, SLOT(continueBoot(QString, int)));
-
- _webView = new QWebView(this);
- connect(_webView->page()->mainFrame(), SIGNAL(
- javaScriptWindowObjectCleared()), this, SLOT(attachToDOM()));
- setCentralWidget(_webView);
- setWindowTitle(tr("NetD"));
- setAttribute(Qt::WA_QuitOnClose, true);
- setWindowFlags(Qt::FramelessWindowHint);
-
- _webView->load(QUrl("qrc:html/networkdiscovery_userchoice.html"));
- _webView->show();
-
- qDebug() << _tag << "start singel shot";
- QTimer::singleShot(2000, this, SLOT(prepareNetworkDiscover()));
-
-}
-
-
-
-ndgui::~ndgui() {
-
-}
-
-
-
-/**
- * creates an action which you can trigger with the F5 Button during the first
- * seconds.
- */
-void ndgui::createAction() {
- _allowUserChoice = new QAction(tr("&quit"), this);
- _allowUserChoice->setShortcut(QKeySequence(Qt::Key_F5));
- connect(_allowUserChoice, SIGNAL(triggered()), this, SLOT(setUserChoiceTrue()));
- this->addAction(_allowUserChoice);
-}
-
-
-
-/**
- * is the connected to the triggered action pressing the F5 button.
- * set the _userChoice member true
- */
-void ndgui::setUserChoiceTrue() {
- _userChoice = true;
-}
-
-
-
-/**
- * is connected to the singleShot event. Triggering this method means
- * that we go on with the main NetworkDiscovery screen.
- * connects the loadFinished signal of the _webView with the
- * startNetworkDiscovery slot and removes the
- * action.
- */
-void ndgui::prepareNetworkDiscover() {
- connect(_webView, SIGNAL(loadFinished(bool)), this,
- SLOT(startNetworkDiscovery()));
- this->removeAction(_allowUserChoice);
-
- _webView->load(QUrl("qrc:html/networkdiscovery.html"));
- _webView->show();
-}
-
-
-
-/**
- * main starting point of the whole procedure.
- * disconnect the loadFinished signal with the startNetworkDiscovery
- * and starts the networkDiscovery.
- */
-void ndgui::startNetworkDiscovery(){
-
- disconnect(_webView,SIGNAL(loadFinished(bool)), this, SLOT(startNetworkDiscovery()));
- if(!_started) {
- if (!_tryAgain) {
- _started = true;
- QStringList l;
- l << "-d";
- networkDiscovery.initAndRun("209.85.148.105", _userChoice, true, "/var/tmp/logfile","/var/tmp/qt_c_socket_custom", DEFAULT_PATHTODHCPCDEXE, &l);
- } else {
- _tryAgain = false;
- networkDiscovery.tryAgain();
- }
- }
- else {
- qDebug() << _tag << "NetworkDiscovery already started";
- }
-}
-
-
-
-/**
- * if we have a user choice (_userChoice = true) than networkDiscovery will
- * emit connectionEstablished signals.
- * Add the interface name to a _ifNameList. This list holds all interfaces
- * the user can choose out of.
- */
-void ndgui::handleConnectionEstablished(QString ifName) {
- _ifNameList.append(ifName);
-}
-
-
-
-/**
- * if we have a user choice (_userChoice = true) than networkDiscovery will
- * emit a allProcessesFinished signal if all processes are done.
- * This method determines if user will see an abort boot dialog (no interface names in
- * the ifNameList list) or an
- * choose interface dialog (one or more interface names in the list (add with
- * handleConnectionEstablished)).
- */
-void ndgui::handleAllProcessesFinished() {
- qDebug() << _tag << "all Processes finished";
- if(_ifNameList.size() > 0) {
- QString jsonArr = "[";
- for(int i = 0; i < _ifNameList.size()-1; i++) {
- jsonArr += "\"" + _ifNameList.value(i) + "\",";
- }
- jsonArr += "\"" + _ifNameList.last() + "\"]";
- chooseInterfaceDialog(jsonArr);
- } else {
- abortBoot("No usable interfaces found!");
- }
-}
-
-
-
-/**
- * this method will restart the system.
- * triggered through a button click in the gui.
- */
-void ndgui::restartSystem() {
-
-}
-
-
-
-/**
- * this method will restart the system.
- * triggered through a button click in the gui.
- */
-void ndgui::shutDownSystem() {
-
-}
-
-
-
-/**
- * represents the end of the NetworkDiscovery life time.
- * will start the fbgui screen. All networkDiscovery signals
- * will be ignored after this point.
- */
-void ndgui::continueBoot(QString ifName, int userChoice) {
- if (!userChoice) {
- QString text = "continue with interface: " + ifName;
- qDebug() << _tag << text << "no user choice";
- } else {
- QString text = "continue with interface: " + ifName;
- qDebug() << _tag << text << "with user choice";
- QString gateway = networkDiscovery.getGatewayForInterface(ifName);
- networkDiscovery.ip4_replaceDefaultRoute(ifName,gateway,0);
- }
- if (networkDiscovery.checkConnectivityViaTcp()) {
- _webView->load(QUrl("qrc:html/continueBoot.html"));
- } else {
- abortBoot("Interface was suddenly made unusable ");
- }
-}
-
-
-
-/**
- * read the log file. Log File will be presented inside of a dialog.
- */
-QString ndgui::readLogFile() {
- qDebug() << _tag << " show log ";
- return networkDiscovery.readLogFile();
-}
-
-
-
-/**/
-void ndgui::tryAgain() {
- qDebug() << _tag << " try again ";
- _tryAgain = true;
- _started = false;
- _ifNameList.clear();
- _manConfList.clear();
- createAction();
- _webView->load(QUrl("qrc:html/networkdiscovery_userchoice.html"));
- _webView->show();
-
- QTimer::singleShot(2000, this, SLOT(prepareNetworkDiscover()));
-}
-
-
-
-/*test html gui version*/
-
-/**
- * fills the drop down box of the manual interface configuration
- * dialog.
- */
-QVariantList ndgui::getManualConfInterfaces() {
- qDebug() << _tag << "call getManualConfInterfaces";
- QVariantList jsonArr;
- foreach (QString s, _manConfList) {
- QVariant e(s);
- jsonArr << e;
- }
- qDebug() << _tag << "value of jsonArr:" << jsonArr;
- return jsonArr;
-}
-
-
-
-/**
- * takes the entered manual configuration dates and delivers it
- * to the networkDiscovery for further actions.
- */
-int ndgui::ip4_setManualConfiguration(QVariantMap jsonArr) {
- return networkDiscovery.ip4_setManualConfiguration(jsonArr);
-
-}
-
-
-
-/* slots */
-/************************************************/
-//////////////////////////////////////////////////
-/************************************************/
-
-/**
- * stellt ein ndgui/fbgui Objekt zur verwendung durch die html bereit.
- */
-void ndgui::attachToDOM(){
- _webView->page()->mainFrame()->addToJavaScriptWindowObject(QString("fbgui"), this);
- loadJQuery();
-}
-
-
-
-void ndgui::loadJQuery() {
- QString js;
- QString pathToJsDir(":/html");
- pathToJsDir.append("/js");
-
- QDir qrcJSDir(pathToJsDir);
- QFileInfoList fiList = qrcJSDir.entryInfoList();
- QFileInfo fi;
- foreach(fi, fiList)
- {
- if (fi.suffix() == "js") {
- //qDebug()<< fi.fileName();
- //qxtLog->debug() << fi.fileName();
- //if (fi.fileName() != "test.js" && fi.fileName() != "nd-functions.js") {
- QFile file;
- file.setFileName(pathToJsDir + "/" + fi.fileName());
- file.open(QIODevice::ReadOnly);
- js = file.readAll();
- file.close();
-
- _webView->page()->mainFrame()->evaluateJavaScript(js);
- //qxtLog->debug() << "evaluated " + fi.fileName();
- //}
- }
- }
-}
-
-
-
-//diese methoden müssen später in die javascriptInterface Klasse eingefügt werden.
-
-// dieser code muss später in die javascriptInterface klasse der fbgui eingefügt werden
-// tausche dazu ndgui zu javascriptinterface
-// und _webView->page()->mainFrame() zu _parent
-
-void ndgui::abortBoot(const QString msg) {
- QString code = QString("abortBootDialog('\%1')").arg(msg);
- _webView->page()->mainFrame()->evaluateJavaScript(code);
-}
-
-
-
-/**
- * opens ths chooseInterfaceDialog
- */
-void ndgui::chooseInterfaceDialog(const QString msg) {
- QString code = QString("chooseInterfaceDialog(\%1)").arg(msg);
- _webView->page()->mainFrame()->evaluateJavaScript(code);
-}
-
-
-
-/**
- * updates the over all status
- */
-void ndgui::updateStatus(const QString &status) {
- if (status == "")
- return;
- QString code = QString("updateStatus('\%1')").arg(status);
- _webView->page()->mainFrame()->evaluateJavaScript(code);
-}
-
-
-
-/**
- * updates the progress bar for each interface.
- *
- * @param ifname
- * the name ot the interface to update
- *
- * @param percent
- * the progress in percent
- */
-void ndgui::updateIfProgressBar(const QString &ifName, const int& percent) {
- if (percent == 0)
- return;
- QString code = QString("updateIfProgressBar('\%1',\%2)").arg(ifName).arg(percent);
- _webView->page()->mainFrame()->evaluateJavaScript(code);
-}
-
-
-
-/**
- * update the status for each interface
- *
- * @param ifName
- * the name ot the interface to update
- *
- * @param status
- * the new status of the interface.
- */
-void ndgui::updateIfStatus(const QString &ifName, const QString &status) {
- if (ifName == "")
- return;
- QString code = QString("updateIfStatus('\%1','\%2')").arg(ifName).arg(status);
- _webView->page()->mainFrame()->evaluateJavaScript(code);
-}
-
-
-
-/**
- * adds an interface to the DOM tree. Creates its progress bar and it's status label.
- *
- * @param ifName
- * name of the new interface.
- */
-void ndgui::addInterface(const QString &ifName) {
- if (ifName == "")
- return;
- _manConfList.append(ifName);
- QString code = QString("addInterface('\%1')").arg(ifName);
- _webView->page()->mainFrame()->evaluateJavaScript(code);
-}
-
-
-
-/**
- * just for debugging.
- */
-void ndgui::notifyCall(QString msg){
- qDebug() << _tag << "------ called:" << msg;
-}
diff --git a/NetworkDiscovery/ndgui.h b/NetworkDiscovery/ndgui.h
deleted file mode 100644
index 6235e84..0000000
--- a/NetworkDiscovery/ndgui.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef NDGUI_H
-#define NDGUI_H
-
-#include
-#include
-#include
-
-#include "networkdiscovery.h"
-
-class ndgui: public QMainWindow {
-Q_OBJECT
-
-public:
- ndgui(QMainWindow *parent = 0);
- ~ndgui();
- Q_INVOKABLE QVariantList getManualConfInterfaces();
- Q_INVOKABLE int ip4_setManualConfiguration(QVariantMap result);
- Q_INVOKABLE QString readLogFile();
-
-public slots:
- void handleConnectionEstablished(QString ifName);
- void abortBoot(QString msg);
- void chooseInterfaceDialog(QString msg);
- void handleAllProcessesFinished();
-
- void restartSystem();
- void shutDownSystem();
- void continueBoot(QString ifName, int userChoice);
- void tryAgain();
-
-
- void prepareNetworkDiscover();
- void startNetworkDiscovery();
-
- /*test for html gui version*/
- void attachToDOM();
- void loadJQuery();
- void addInterface(const QString &ifName);
- void updateIfStatus(const QString &ifName, const QString &status);
- void updateStatus(const QString &status);
- void updateIfProgressBar(const QString &ifName, const int& percent);
- void notifyCall(QString msg);
-
-
-private slots:
- void setUserChoiceTrue();
-private:
-
- QString _tag;
-
- void createAction();
-
- bool _userChoice;
-
- bool _started;
-
- bool _tryAgain;
-
- QWebView * _webView;
-
- QAction * _allowUserChoice;
-
- NetworkDiscovery networkDiscovery;
-
- QList _ifNameList; // maps interfaceName to its gateway
-
- QList _manConfList;
-
-
-};
-
-#endif // NDGUI_H
diff --git a/NetworkDiscovery/ndgui.ui b/NetworkDiscovery/ndgui.ui
deleted file mode 100644
index 4a4c466..0000000
--- a/NetworkDiscovery/ndgui.ui
+++ /dev/null
@@ -1,19 +0,0 @@
-
- ndguiClass
-
-
-
- 0
- 0
- 400
- 300
-
-
-
- ndgui
-
-
-
-
-
-
diff --git a/NetworkDiscovery/networkdiscovery.cpp b/NetworkDiscovery/networkdiscovery.cpp
deleted file mode 100644
index 9ca0ec5..0000000
--- a/NetworkDiscovery/networkdiscovery.cpp
+++ /dev/null
@@ -1,861 +0,0 @@
-#include
-#include
-
-#include "networkdiscovery.h"
-
-#include "../common/fbgui.h"
-
-
-/**
- * constructor
- */
-NetworkDiscovery::NetworkDiscovery(QObject *parent) {
- _tag = "[nd:NetworkDiscovery]";
- _server = new QLocalServer(this);
-}
-
-
-
-/**
- * destructor
- */
-NetworkDiscovery::~NetworkDiscovery() {
-
-}
-
-
-
-/**
- * initialize all important class members and start the main work.
- *
- * @param serverIp
- * the ip of the server with which we are testing the connectivity.
- *
- * @param userChoice
- * true if the user wishes to have a user choice. true: the chooseInterfaceDialog will be showed.
- *
- * @param autoUp
- * true if we want to "auto Up" all down interfaces.
- *
- * @param pathToLogFile
- * the path to the log file.
- *
- * @param serverPath
- * the path to the server socket (default value: DEFAULT_QTSOCKETADDRESS "/var/tmp/qt_c_socket_default")
- *
- * @param pathToExe
- * the path to the customdhcpcd exe. (default value: #define DEFAULT_QTSOCKETADDRESS "/var/tmp/qt_c_socket_default")
- *
- * @param args
- * additional arguments for the customdhcpcd client. (default value: NULL)
- */
-void NetworkDiscovery::initAndRun(QString serverIp, bool userChoice, bool autoUp, QString pathToLogFile, QString serverPath, QString pathToExe,
- QStringList* args) {
-
- _serverIp = serverIp;
- _userChoice = userChoice;
- _autoUp = autoUp;
- _pathToLogFile = pathToLogFile;
-
- _pathToDhcpcdExe = pathToExe;
- _blocked = false;
- _numberOfProcesses = 0;
- _ifUpCountdown = 10;
-
- if (serverPath != DEFAULT_QTSOCKETADDRESS) {
- _dhcpcdArguments.append("-q");
- _dhcpcdArguments.append(serverPath);
- }
- /* delete the file at serverPath. this is necessary since in case the application crashes, the file still
- * exists which leads to an error.
- */
-
- if(QFile::exists(serverPath)) {
- QFile::remove(serverPath);
- }
-
- if (!_server->listen(serverPath)) {
- // emit signal to the gui that a critial error occoured
- qDebug() << _tag << "Unable to start server: "
- << _server->errorString();
- emit
- abortBoot("Unable to start server: " + _server->errorString());
- return;
- }
-
- // check if the path to the customdhcpcd file is correct
- QFileInfo fInfo(_pathToDhcpcdExe);
- if (!fInfo.exists()) {
- qDebug() << _tag
- << " could not find customdhcpcd exe. Please check the path to this file.";
- emit abortBoot(
- "could not find customdhcpcd exe. Please check the path to this file.");
- return;
- }
-
- connect(_server, SIGNAL(newConnection()), this, SLOT(handleNewConnection()));
- connect(this, SIGNAL(readyForRun()), this, SLOT(slotReadyForRun()));
-
- if (args != NULL && !args->isEmpty()) {
- qDebug() << _tag << "added additional args";
- _dhcpcdArguments.append(*args);
- }
- mainWork();
-}
-
-
-
-/**
- * emits the addInterface signal for each interface name in _ifUpList
- * and calls the runDHCPCD method.
- * if the _ifUpList is empty, this method emits an abortBoot signal.
- * connected to the readyForRun signal.
- */
-void NetworkDiscovery::slotReadyForRun() {
- if (_ifUpList.size() > 0) {
- foreach(QString i, _ifUpList) {
- emit addInterface(i);
- }
- _numberOfProcesses = _ifUpList.size();
- qDebug() << _tag << "number of processes:" << _numberOfProcesses ;
- runDHCPCD( _ifUpList);
- } else {
- qDebug() << _tag << "list is empty. Have not found usable interface.";
- emit
- abortBoot("Have not found usable interface");
- return;
- }
-}
-
-
-
-/**
- * only called if autoUp == true.
- * check the IsRunning flag of each interface in the _ifDownList.
- * connected to the timeout signal of the timer.
- */
-void NetworkDiscovery::checkForIsRunning() {
- bool isRunning = false;
- QList copyOfIfDownList(_ifDownList);
- foreach(QString i, _ifDownList) {
- QNetworkInterface networkInterface = QNetworkInterface::interfaceFromName(i);
- isRunning = (networkInterface.flags() & QNetworkInterface::IsRunning);
- if (isRunning) {
- _ifUpList.append(i);
- _ifDownList.removeAt(_ifDownList.indexOf(i));
- }
- }
- _ifUpCountdown--;
- if ((_ifUpCountdown <= 0 ) || _ifDownList.isEmpty()) {
- // shut down timer
- _timer->stop();
- emit readyForRun();
- }
-}
-
-
-
-/**
- * replace the default route. sets af automatically to AF_INET
- *
- * @param ifName
- * interface name
- *
- * @param gateway
- * gateway address
- *
- * @param mss
- * mss value (i think this is the metric. in most cases this value is 0)
- */
-int NetworkDiscovery::ip4_replaceDefaultRoute(QString ifName, QString gateway, int mss) {
- return _networkManager.replaceDefaultRoute(ifName, gateway, mss, AF_INET);
-}
-
-
-
-/**
- * replace the dhcp configuration with the manual config, entered by the user.
- * if we can not establish a connection with the entered values, reset to the old
- * dhcp values.
- *
- * @param result
- * a json object formated string.
- *
- * @return
- * 0 if everything ok
- */
-int NetworkDiscovery::ip4_setManualConfiguration(QVariantMap result) {
- QList dns;
- dns.append(result["dns"].toString());
- _networkManager.ip4_setManualConfiguration(result["ifname"].toString(),
- result["ipaddr"].toString(),
- result["netmask"].toString(),
- result["broadcast"].toString(),
- result["gateway"].toString(),
- 0,
- AF_INET,
- "/etc/",
- dns);
-
- qDebug() << _tag << "set man conf. and check connectivity";
-
- if (!checkConnectivityViaTcp(_serverIp)) {
- qDebug() << _tag << "no connectivity. reset conf.";
- interfaceconfiguration * ifc = _ifcMap.value(result["ifname"].toString(), NULL);
- if(ifc != NULL) {
- dns.clear();
- dns = ifc->getDnsservers().trimmed().split(" ");
- _networkManager.ip4_setManualConfiguration(result["ifname"].toString(),
- ifc->getIpAddress(),
- ifc->getNetmask(),
- ifc->getBroadcast(),
- ifc->getGateway(),
- 0,
- AF_INET,
- "/etc/",
- dns);
- }
-
- return 0;
- }
- emit continueBoot(result["ifname"].toString(), 0);
- return 0;
-}
-
-
-
-/**
- * returns the gateway address, written into the dhcp config file.
- *
- * @param ifName
- * name of the interface.
- *
- * @return
- * gateway address as string.
- */
-QString NetworkDiscovery::getGatewayForInterface(QString ifName) {
- interfaceconfiguration * ifConf = _ifcMap.value(ifName);
- return ifConf->getGateway();
-}
-
-
-
-/**
- * reads the log file.
- *
- * @return the log file as one string.
- */
-QString NetworkDiscovery::readLogFile() {
- // path to log file is in _pathToLogFile. initialized in initAndRun().
- QString retval("the log file");
- QFile logFile(_pathToLogFile);
- if (logFile.exists()) {
- if (logFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- while (!logFile.atEnd()) {
- retval.append(logFile.readLine());
- }
- return retval;
- }
- }
-
-}
-
-
-
-/*
- *TODO: to be bug fixed
- *TODO: do it with kill and not QProcess("killall cdhcpcd")
- *TODO: still some bugs. if you press tryAgain it can happen that the app stops with the mainscreen.
- *TODO: reproducible: start normal with user choice. plug out the cable. press continue. abort screen should appear.
- *TODO: press tryAgain.
- */
-void NetworkDiscovery::tryAgain() {
- // kill all cdhcpcd processes
- qDebug() << " kill cdhcpcd processes";
- QProcess * p = new QProcess(this);
- p->start("killall cdhcpcd");
- p->waitForFinished();
- qDebug() << _tag << "[tryAgain]" << p->errorString();
- /*
- foreach(Q_PID pid , _pidsList) {
- if (kill(pid,SIGKILL) <= -1)
- qDebug() << _tag << " error: trying to kill process: " << pid << " error: " << strerror(errno);
- }
- */
- // reset everything
- _clients.clear();
- _clientProcessToIfNameMap.clear();
- _ifNameToClient.clear();
- _numberOfProcesses = 0;
- _blocked = false;
- _ifUpCountdown = 10;
- _ifUpList.clear();
- _ifDownList.clear();
- _pidsList.clear();
- _ifcMap.clear();
-
- // start again
- mainWork();
-
- //SIGK
- //kill();
-}
-
-
-/**/
-QVariantMap NetworkDiscovery::getInterfaceConfig(QString ifName) {
- QList dns;
- interfaceconfiguration * ifc = _ifcMap.value(ifName, NULL);
- if (ifc != NULL) {
- dns.clear();
- dns = ifc->getDnsservers().trimmed().split(" ");
-
- //ifc->getIpAddress(), ifc->getNetmask(), ifc->getBroadcast(),
- //ifc->getGateway(), 0, AF_INET, "/etc/", dns);
- }
-}
-
-
-
-/**
- * ================================================================================
- ********************************* Private Methods ********************************
- * ================================================================================
- **/
-
-
-/**/
-void NetworkDiscovery::mainWork()
-{
- if (_autoUp) {
- getListOfNetworkInterfacesWithAutoUp();
- _timer = new QTimer(this);
- connect(_timer, SIGNAL(timeout()), this, SLOT(checkForIsRunning()));
- _timer->start(1000);
-
- } else {
- getListOfNetworkInterfaces();
- emit readyForRun();
- }
-}
-
-
-
-/**
- * searches for usable interfaces and puts them into a list.
- * if the interface is down, put it in the _ifDownList, try to bring it up.
- * else put it in the _ifUpList.
- * usable interfaces are: can Broadcast, no loopback, no point to point, name is not in the BlackList,
- */
-void NetworkDiscovery::getListOfNetworkInterfacesWithAutoUp() {
- QList nIList = QNetworkInterface::allInterfaces();
-
- if (nIList.size() > 0) {
- foreach(QNetworkInterface nI, nIList)
- {
- if (((!(nI.flags() & QNetworkInterface::CanBroadcast)
- || nI.flags() & QNetworkInterface::IsLoopBack)
- || nI.flags() & QNetworkInterface::IsPointToPoint)
- || checkBlackList(nI.humanReadableName())) {
- continue;
- }
- if ((nI.flags() & QNetworkInterface::IsRunning)) {
- _ifUpList.append(nI.humanReadableName());
- }
- else if (!(nI.flags() & QNetworkInterface::IsUp)) {
- _networkManager.bringInterfaceUP(nI.humanReadableName());
- qDebug() << _tag << " bring up ..";
- _ifDownList.append(nI.humanReadableName());
- }
- else if (!(nI.flags() & QNetworkInterface::IsRunning)) {
- _ifDownList.append(nI.humanReadableName());
- }
- }
- } else {
- qDebug() << _tag << "no interfaces found!";
- }
-}
-
-
-
-/**
- * searches for usable interfaces which are up and running and put them into a list.
- * usable interfaces are: can Broadcast, no loopback, no point to point, name is not in the BlackList,
- */
-void NetworkDiscovery::getListOfNetworkInterfaces() {
- QList nIList = QNetworkInterface::allInterfaces();
-
- if (nIList.size() > 0) {
- foreach(QNetworkInterface nI, nIList)
- {
- if (((!(nI.flags() & QNetworkInterface::CanBroadcast)
- || nI.flags() & QNetworkInterface::IsLoopBack)
- || nI.flags() & QNetworkInterface::IsPointToPoint)
- || !(nI.flags() & QNetworkInterface::IsUp)
- || checkBlackList(nI.humanReadableName())) {
- continue;
- }
- if (!(nI.flags() & QNetworkInterface::IsRunning)) {
- _ifDownList.append(nI.humanReadableName());
- } else {
- _ifUpList.append(nI.humanReadableName());
- }
- }
- } else {
- qDebug() << _tag << "no interfaces found!";
- }
-}
-
-
-
-/**
- * not used so far. checks the carrier state using the sysfs library.
- * if carrier = 1 ==> the interface is running.
- * interfaces have to be up in order to get right results.
- *
- * @param interface
- * name of the interface
- */
-bool NetworkDiscovery::checkCarrierState(QString interface) {
-
- qDebug() << _tag << "check carrier state for interface " << interface;
- QByteArray ba = interface.toAscii();
- const char * iface = ba.data();
-
- struct sysfs_class_device *class_device = sysfs_open_class_device("net",
- iface);
- struct dlist *attrlist = sysfs_get_classdev_attributes(class_device);
- if (attrlist != NULL) {
- struct sysfs_attribute *attr = NULL;
- dlist_for_each_data(attrlist, attr, struct sysfs_attribute) {
- if (strcmp("carrier", attr->name) == 0) {
- QString value(attr->value);
- bool ok = false;
- bool * pok = &ok;
- int v = value.toInt(pok);
- if (*pok) {
- if (v == 1) {
- qDebug()
- << "carrier is 1. Cable is plugged. return true";
- return true;
- } else {
- qDebug()
- << "carrier is 0. Cable is unplugged. return false";
- return false;
- }
- } else {
- qDebug() << _tag << "conversion error";
- }
- }
- }
- } else {
- qDebug() << _tag << "attrlist is Null";
- }
- sysfs_close_class_device(class_device);
-
- return true;
-}
-
-
-
-/**
- * call for every interface in the list the runDHCPCD method.
- *
- * @param interfaces
- * list of interface names.
- */
-void NetworkDiscovery::runDHCPCD(QList &interfaces) {
- foreach(QString nI, interfaces)
- {
- runDHCPCD(nI);
- }
-}
-
-
-
-/**
- * start a cdhcpcd process with the interface name as last argument.
- *
- * @param interface
- * name of an interface.
- */
-void NetworkDiscovery::runDHCPCD(QString interface) {
- emit updateStatusLabel(interface, "start DHCP");
- _dhcpcdArguments.append(interface);
- QProcess * p = new QProcess(this);
-
- qDebug() << _tag << _dhcpcdArguments;
-
- _clientProcessToIfNameMap.insert(p, interface);
- p->start(_pathToDhcpcdExe, _dhcpcdArguments);
- connect(p, SIGNAL(started()), this, SLOT(handleProcessStarted()));
- connect(p, SIGNAL(finished(int, QProcess::ExitStatus)), this,
- SLOT(handleProcessFinished(int, QProcess::ExitStatus)));
- _dhcpcdArguments.removeLast();
-}
-
-
-
-/**
- * checks the connectivity. tries to open a TCP connection to the
- * server (see _serverIp). For this it adjusts the routing table.
- * (sets the gateway of the interface as default gateway)
- * Gateway is written into the dhcpcd config file of this interface.
- * (see DEFAULT_INTERFACE_CONF_LOCATION "/var/tmp/conf_")
- *
- * @param ifName
- * name of a interface.
- *
- * @return
- * true: connection is possible
- * false: connection not possible
- */
-bool NetworkDiscovery::checkConnectivity(QString ifName) {
- int mss = 0;
-
- // get gateway address
- QString pathToGatewayFile(DEFAULT_INTERFACE_CONF_LOCATION);
- pathToGatewayFile += ifName;
- interfaceconfiguration *ifConf = new interfaceconfiguration();
- ifConf->readConfigOutOfFile(pathToGatewayFile);
- _ifcMap.insert(ifName, ifConf);
-
- // replace default route
- qDebug() << _tag << "replace default route";
- _networkManager.replaceDefaultRoute(ifName,
- ifConf->getGateway(), mss, AF_INET);
-
- if (checkConnectivityViaTcp(_serverIp)) {
- qDebug() << _tag << "internet: check passed! for interface" << ifName;
- emit
- updateStatusLabel(ifName, "connection possible");
- if (!_userChoice) {
- // blockiere jeden weiteren check
- // emite continueBoot
- _blocked = true;
- emit continueBoot(ifName, 0);
- } else {
- emit connectionEstablished(ifName);
- }
- return true;
- } else {
- qDebug() << _tag << "no internet connection with interface" << ifName;
- emit
- updateStatusLabel(ifName, "connection not possible");
- return false;
- }
-}
-
-
-
-/**/
-bool NetworkDiscovery::checkConnectivityViaTcp() {
- return checkConnectivityViaTcp(_serverIp);
-}
-
-
-
-/**
- * try to open a tcp connection to the server
- *
- * @param server
- * a ip address.
- *
- * @return
- * true: connection is possible
- * false: connection not possible
- */
-bool NetworkDiscovery::checkConnectivityViaTcp(QString server) {
- // check connectivity via tcp connection
- QTcpSocket *tcpSocket = new QTcpSocket(this);
- tcpSocket->connectToHost(server, 80);
- if (!tcpSocket->waitForConnected(500)) {
- qDebug() << _tag << tcpSocket->errorString();
- return false;
- } else {
- return true;
- }
-}
-
-
-
-/**
- * connected to the new client arrived signal.
- * connects the client readyRead signal with the handleNewInput slot.
- */
-void NetworkDiscovery::handleNewConnection() {
- qDebug() << _tag << "New Connection arrived";
-
- /*QLocalSocket **/
- _client = _server ->nextPendingConnection();
- _clients.insert(_client, _client);
- connect(_client, SIGNAL(disconnected()), this,
- SLOT(handleClientDisconnect()));
- connect(_client, SIGNAL(readyRead()), this, SLOT(handleNewInput()));
-}
-
-
-
-/**
- * called when a client disconnects.
- */
-void NetworkDiscovery::handleClientDisconnect() {
- QLocalSocket* socket = qobject_cast (QObject::sender());
-
- QLocalSocket * client = _clients.value(socket);
-
- qDebug() << _tag << "disconnect client";
- handleNewInput(client);
- client->deleteLater();
-}
-
-
-
-/**
- * same function as handleNewInput() but with a client as parameter.
- *
- * @param cleint
- * a client
- */
-void NetworkDiscovery::handleNewInput(QLocalSocket * client) {
- qDebug() << _tag << "last read before exit";
- while (client->canReadLine()) {
- QString data(client->readLine());
-
- data = data.trimmed();
- qDebug() << _tag << data;
- QStringList lines = data.split("\n");
-
- for (int i = 0; i < lines.length(); i++) {
- handleNewInputLine(client, lines.at(i));
- }
- }
-}
-
-
-
-/**
- * This method is connected to the readyRead Signal of the QLocalSocket
- * client.
- * send an ACK to the client with every received message.
- */
-void NetworkDiscovery::handleNewInput() {
- QLocalSocket* socket = qobject_cast (QObject::sender());
-
- QLocalSocket * client = _clients.value(socket);
- QString data(client->read(DHCP_MESSAGE_SIZE));
- //client->write("ACK", ACK_SIZE);
- //client->waitForBytesWritten();
- data = data.trimmed();
- //qDebug() << _tag << data;
- QStringList lines = data.split("\n");
-
- for (int i = 0; i < lines.length(); i++) {
- handleNewInputLine(client, lines.at(i));
- }
-}
-
-
-
-/**
- * This Method processes the send messages.
- *
- * This Method processes the send messages. It splits the line
- * into several components. Those components are:
- * interface: interface name ==> indicates the process who send the message
- * s_state: is the number representation of syslog.h LOG levels
- * s_subState: is the number representation of the dhcp.c DHCP states (1 - 8) plus
- * the status. h states (9 - ..)
- * msg: is a message which can contain additional informations
- *
- * According to the s_state and s_subState we emit the changeProgressBarValue() signal
- * with different values.
- *
- * @param client
- * the client who send the message
- *
- * @param data
- * the message. (format ;;; )
- */
-void NetworkDiscovery::handleNewInputLine(QLocalSocket * client, QString data) {
-
- QString logMsg(data);
- QString interface = logMsg.section(";", 0, 0);
- QString s_state = logMsg.section(";", 1, 1);
- QString s_subState = logMsg.section(";", 2, 2);
- QString msg = logMsg.section(";", 3, 3);
- int st = s_state.trimmed().toInt();
- int sst = s_subState.trimmed().toInt();
- //qDebug() << _tag << logMsg;
-
- if (_ifNameToClient.size() < _numberOfProcesses && !_ifNameToClient.contains(
- interface)) {
- _ifNameToClient.insert(interface, client);
- }
-
- switch (st) {
- case LOG_INFO:
- switch (sst) {
- case DHCP_DISCOVER:
- emit changeProgressBarValue(interface, 10);
- break;
- case DHCP_OFFER:
- emit changeProgressBarValue(interface, 20);
- break;
- case DHCP_REQUEST:
- emit changeProgressBarValue(interface, 30);
- break;
- case DHCP_ACK:
- emit changeProgressBarValue(interface, 40);
- break;
- case DHCP_NAK:
- emit changeProgressBarValue(interface, 40);
- break;
- case DHCPCD_ARP_TEST:
- emit changeProgressBarValue(interface, 50);
- break;
- case DHCP_DECLINE:
- emit changeProgressBarValue(interface, 60);
- break;
- case DHCP_RELEASE:
-
- break;
- case DHCP_INFORM:
- break;
- case DHCPCD_CONFIGURE:
- emit changeProgressBarValue(interface, 70);
- break;
- case DHCPCD_WRITE:
- emit changeProgressBarValue(interface, 80);
- break;
- case DHCPCD_EXIT:
- emit changeProgressBarValue(interface, 100);
- break;
- case DHCPCD_LOG:
-
- default:
- qDebug() << _tag << "default" << msg;
- break;
- }
- break;
- case LOG_ERR:
- qDebug() << _tag << "received error:" << msg;
- break;
- default:
- //qDebug() << _tag << logMsg;
- break;
- }
-}
-
-
-
-/**
- * This Method is called when a process is finished.
- *
- * This Method is called when a process is finished. This slot is connected
- * with the signal finished() of the QProcess class.
- * If the process finishes, it will be checked if the process exited normal
- * or if an unexpected error occurred. For this, we determine the sender (which is a
- * QProcess), get the corresponding interface (which is stored in a map), and check
- * the exitCode. Further actions are taken according to the exitCode check.
- * Normal exit:
- * emit changeProgressBar() to 100%
- * emit updateIfStatus() to check connection
- * checkConnectivity() @see NetworkDiscovery::checkConnectivity()
- * Unexpected exit:
- * emit updateIfStatus() to process exited unexpected
- * TODO:: the reason for the unexpected exit should be presented in the logfile.
- *
- * @param exitCode
- *
- * @param exitStatus
- *
- * @return bool
- * returns true: if the interface name i starts with a letter in the blacklist.
- *
- * returns false: else
- *
- * @see NetworkDiscovery::getListOfNetworkInterfaces()
- */
-void NetworkDiscovery::handleProcessFinished(int exitCode,
- QProcess::ExitStatus exitStatus) {
-
- QProcess* p = qobject_cast (QObject::sender());
- QString ifName = _clientProcessToIfNameMap.value(p, "ifName");
- _numberOfProcesses = _numberOfProcesses - 1;
- if (!_blocked) { //_blocked becomes true, if _userChoice is false and we already found a usable interface
- if (ifName.compare("ifName") == 0) {
- qDebug() << _tag << "--- \t [NetworkDiscovery::handleProcessFinished] haven't found process!";
- } else {
- qDebug() << _tag << "process for interface" << ifName << "finished"
- << exitCode << exitStatus;
- if (exitCode > 0) {
- qDebug() << _tag << "process exited unexpected";
- emit updateStatusLabel(ifName, "process exited unexpected");
- } else {
- qDebug() << _tag << "process normal exit";
- emit changeProgressBarValue(ifName, 100);
- emit updateStatusLabel(ifName, "check connectivity");
- checkConnectivity(ifName);
- }
- }
- if (!_blocked) { //_blocked becomes true, if _userChoice is false and we found a usable interface
- QLocalSocket *client = _ifNameToClient.value(ifName, 0);
- if (client != 0) {
- handleNewInput(client);
- }
- //_numberOfProcesses = _numberOfProcesses - 1; && _userChoice
- if (_numberOfProcesses <= 0 ) {
- emit allProcessesFinished();
- }
- }
- } else {
- qDebug() << _tag << "already blocked";
- emit updateStatusLabel(ifName, "finished DHCP");
- }
-}
-
-
-
-/**
- * This Method is called when a process is started.
- *
- * This Method is called when a process is started.
- * It prints the message: "process started for interface: ".
- */
-void NetworkDiscovery::handleProcessStarted() {
- QProcess* p = qobject_cast (QObject::sender());
- QString ifName = _clientProcessToIfNameMap.value(p, "ifName");
- qDebug() << _tag << "process started for interface:" << ifName << "with pid:" << p->pid();
- _pidsList.append(p->pid());
-}
-
-
-
-/**
- * This Method implements a blacklist.
- *
- * This Method implements a blacklist. We check the fist character
- * of the interface name. if this letter is in the list, we return true.
- * True means, that this interface won't be put into the result list of
- * getListOfNetworkInterfaces().
- *
- * @param i
- * is a interface name.
- *
- * @return bool
- * returns true: if the interface name i starts with a letter in the blacklist.
- *
- * returns false: else
- *
- * @see NetworkDiscovery::getListOfNetworkInterfaces()
- */
-bool NetworkDiscovery::checkBlackList(QString i) {
- if (i.startsWith("v", Qt::CaseInsensitive)) {
- return true;
- } else if (i.startsWith("d", Qt::CaseInsensitive)) {
- return true;
- } else {
- return false;
- }
-}
diff --git a/NetworkDiscovery/networkdiscovery.h b/NetworkDiscovery/networkdiscovery.h
deleted file mode 100644
index 9269610..0000000
--- a/NetworkDiscovery/networkdiscovery.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef NetworkDiscovery_H
-#define NetworkDiscovery_H
-
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "interfaceconfiguration.h"
-#include "networkmanager.h"
-
-#include "../common/fbgui.h"
-
-#include "dhcp.h"
-
-
-
-#define DEFAULT_PATHTODHCPCDEXE "/home/niklas/fbgui/customdhcpcd/src/build/cdhcpcd"
-
-class NetworkDiscovery: public QObject {
-Q_OBJECT
-
-public:
- NetworkDiscovery(QObject *parent=0);
- ~NetworkDiscovery();
-
- void initAndRun(QString serverIp, bool userChoice,
- bool autoUp,
- QString pathToLogFile,
- QString serverPath = DEFAULT_QTSOCKETADDRESS,
- QString pathToExe = DEFAULT_PATHTODHCPCDEXE,
- QStringList* args = NULL);
- int ip4_replaceDefaultRoute(QString ifName, QString gateway, int mss);
- QString getGatewayForInterface(QString ifName);
-
- int ip4_setManualConfiguration(QVariantMap result);
- QString readLogFile();
- void tryAgain();
- bool checkConnectivityViaTcp();
- QVariantMap getInterfaceConfig(QString ifName);
-
-private slots:
-
- void handleNewConnection();
- void handleNewInput();
- void handleNewInputLine(QLocalSocket *client, QString data);
- void handleProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
- void handleProcessStarted();
- void handleClientDisconnect();
- void slotReadyForRun();
- void checkForIsRunning();
-
-signals:
- void addInterface(const QString & ifName);
- void changeProgressBarValue(const QString & ifName, const int $newValue);
- void connectionEstablished(QString ifName);
- void abortBoot(QString msg);
- void updateIfStatus(QString ifName, QString status);
- void allProcessesFinished();
- void continueBoot(QString ifName, int userChoice);
- void setManualConfInterfaces(QString jsonArr);
- void readyForRun();
-
-private:
- QString _tag;
- QLocalServer *_server;
- QMap _clients;
- QLocalSocket *_client;
- QMap _ifNameToClient;
- QMap _clientProcessToIfNameMap;
- QString _pathToDhcpcdExe;
- QStringList _dhcpcdArguments;
- int _numberOfProcesses;
- NetworkManager _networkManager;
- bool _userChoice;
- bool _blocked;
- bool _autoUp;
- QString _serverIp;
- QString _pathToLogFile;
- QList _ifUpList;
- QList _ifDownList;
- int _ifUpCountdown;
- QTimer *_timer;
- QList _pidsList;
- QMap _ifcMap;
- void mainWork();
-
- void handleNewInput(QLocalSocket * client);
-
- void runDHCPCD(QList &interfaces);
- void runDHCPCD(QString interface);
-
- bool checkCarrierState(QString interface);
- bool checkConnectivity(QString ifName);
- bool checkConnectivityViaTcp(QString server);
- bool checkBlackList(QString i);
-
- void getListOfNetworkInterfaces();
- void getListOfNetworkInterfacesWithAutoUp();
-
-
-};
-
-#endif // NetworkDiscovery_H
diff --git a/NetworkDiscovery/networkmanager.cpp b/NetworkDiscovery/networkmanager.cpp
deleted file mode 100644
index 6f8ae7e..0000000
--- a/NetworkDiscovery/networkmanager.cpp
+++ /dev/null
@@ -1,676 +0,0 @@
-/*
- * networkmanager.cpp
- *
- * Created on: Sep 5, 2011
- * Author: niklas
- */
-
-#include "networkmanager.h"
-
-NetworkManager::NetworkManager() {
- // TODO Auto-generated constructor stub
- _tag = "[nd:NetworkManager]";
-}
-
-
-
-NetworkManager::~NetworkManager() {
- // TODO Auto-generated destructor stub
-}
-
-
-
-/**
- * This method adds /replaces the default route.
- * This method adds /replaces the default route.
- * To keep it modular, it is possible
- * to specify an ip address family.
- *
- * @param ifName
- * the interface name
- *
- * @param gateway
- * the gateway address (e.g: 192.168.0.254)
- * @param mss
- * the mss.
- * @param af
- * specify the family type of the ip address.
- * possible values are: AF_INET for an IPv4 address
- * AF_INET6 for an IPv6 address
- *
-
- * @return
- * return -1 if an error happened.
- * return 0 if everything was ok.
- */
-int NetworkManager::replaceDefaultRoute(QString ifname, QString gateway,
- int mss, int af) {
- struct nl_cache *cache;
- struct nl_handle* rtsock;
- struct nl_addr * gw;
- struct rtnl_route * route;
- int retval, iface_idx;
-
- QByteArray ba_ifn = ifname.toAscii();
- char * ifn = ba_ifn.data();
-
- QByteArray ba_gw = gateway.toAscii();
- char * gwaddr = ba_gw.data();
-
- qDebug() << _tag << "---doRoute() gwaddr" << gwaddr;
-
- if (!(gw = nl_addr_parse(gwaddr, af))) {
- qDebug() << _tag << "Invalid gateway address given:" << gwaddr;
- return -1;
- }
-
- rtsock = nl_handle_alloc();
- nl_connect(rtsock, NETLINK_ROUTE);
-
- if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL) {
- qDebug() << _tag << "error with link cache alloc \n";
- }
-
- iface_idx = rtnl_link_name2i(cache, ifn);
-
- route = rtnl_route_alloc();
- rtnl_route_set_scope(route, RT_SCOPE_UNIVERSE);
- rtnl_route_set_gateway(route, gw);
- rtnl_route_set_oif(route, iface_idx);
-
- if (mss > 0) {
- rtnl_route_set_metric(route, RTAX_ADVMSS, mss);
- }
-
- retval = rtnl_route_add(rtsock, route, NLM_F_REPLACE);
- qDebug() << _tag << "return value:" << retval << ":" << strerror(-retval);
-
- rtnl_route_put(route);
- nl_addr_put(gw);
- nl_handle_destroy(rtsock);
-
- return retval;
-}
-
-
-
-/**/
-int NetworkManager::ip6_addRoute(const char *iface,
- const struct in6_addr *ip6_dest, int ip6_prefix,
- const struct in6_addr *ip6_gateway, int metric, int mss) {
- struct nl_cache *cache;
- struct nl_handle *nlh;
- struct rtnl_route *route;
- struct nl_addr *dest_addr;
- struct nl_addr *gw_addr = NULL;
- int err, iface_idx;
-
- nlh = nl_handle_alloc();
- nl_connect(nlh, NETLINK_ROUTE);
-
- if ((cache = rtnl_link_alloc_cache(nlh)) == NULL) {
- //qDebug() << _tag << "error with link cache alloc \n";
- printf("error with link cache alloc \n");
- }
-
- iface_idx = rtnl_link_name2i(cache, iface);
-
- route = rtnl_route_alloc();
-
- /* Destination */
- dest_addr = nl_addr_build(AF_INET6, (struct in6_addr *) ip6_dest,
- sizeof(*ip6_dest));
- nl_addr_set_prefixlen(dest_addr, (int) ip6_prefix);
-
- rtnl_route_set_dst(route, dest_addr);
- nl_addr_put(dest_addr);
-
- /* Gateway */
- if (ip6_gateway && !IN6_IS_ADDR_UNSPECIFIED (ip6_gateway)) {
- gw_addr = nl_addr_build(AF_INET6, (struct in6_addr *) ip6_gateway,
- sizeof(*ip6_gateway));
- if (gw_addr) {
- rtnl_route_set_gateway(route, gw_addr);
- rtnl_route_set_scope(route, RT_SCOPE_UNIVERSE);
- } else {
- rtnl_route_put(route);
- return -1;
- }
- }
-
- /* Metric */
- if (metric)
- rtnl_route_set_prio(route, metric);
-
- /* Add the route */
- err = rtnl_route_add(nlh, route, 0);
- if (err == -ESRCH && ip6_gateway) {
- /* Gateway might be over a bridge; try adding a route to gateway first */
- struct rtnl_route *route2;
-
- route2 = create_route(iface_idx, mss);
- if (route2) {
- /* Add route to gateway over bridge */
- rtnl_route_set_dst(route2, gw_addr);
- err = rtnl_route_add(nlh, route2, 0);
- if (!err) {
- /* Try adding the route again */
- err = rtnl_route_add(nlh, route, 0);
- if (err)
- rtnl_route_del(nlh, route2, 0);
- }
- rtnl_route_put(route2);
- }
- }
-
- if (gw_addr)
- nl_addr_put(gw_addr);
-
- if (err) {
- //nm_warning ("Failed to set IPv6 route on '%s': %s", iface, nl_geterror ());
- rtnl_route_put(route);
- route = NULL;
- }
-
- return 0;
-}
-
-
-
-struct rtnl_route * NetworkManager::create_route (int iface_idx, int mss)
-{
- struct rtnl_route *route;
-
- route = rtnl_route_alloc ();
- if (route) {
- rtnl_route_set_oif (route, iface_idx);
-
- if (mss && rtnl_route_set_metric (route, RTAX_ADVMSS, mss) < 0) {
- //nm_warning ("Could not set mss");
- }
- } else
- //nm_warning ("Could not allocate route");
-
- return route;
-}
-
-
-
-/**
- * The method brings an interface up.
- *
- * @param ifname
- * the name of the interface
- *
- * @return
- * 0 -> success
- * -1 -> error
- */
-int NetworkManager::bringInterfaceUP(QString ifname) {
- return bringInterfaceUpDown(ifname, true);
-}
-
-
-
-/**
- * The method brings an interface down.
- *
- * @param ifname
- * the name of the interface
- *
- * @return
- * 0 -> success
- * -1 -> error
- */
-int NetworkManager::bringInterfaceDown(QString ifname) {
- return bringInterfaceUpDown(ifname, false);
-}
-
-
-
-/**
- * This method brings an interface up or down.
- *
- * @param ifname
- * is a string which contains the interface name which is going down or up.
- *
- * @param up
- * is a bool. true means. we bring the interface up.
- * false meand. we bring the interface down.
- * @return
- * 0 if everything is ok
- * else an error
- */
-int NetworkManager::bringInterfaceUpDown(QString ifname, bool up) {
- struct nl_cache *cache;
- struct nl_handle* rtsock;
- struct rtnl_link* request = NULL;
- struct rtnl_link* old = NULL;
- int retval;
-
- QByteArray ba_ifn = ifname.toAscii();
- char * ifn = ba_ifn.data();
-
- if (!(request = rtnl_link_alloc())) {
- qDebug() << _tag << "error. couldn't allocate a rtnl link";
- return -1;
- }
-
- rtsock = nl_handle_alloc();
- nl_connect(rtsock, NETLINK_ROUTE);
-
- if (up) {
- rtnl_link_set_flags(request, IFF_UP);
- } else {
- rtnl_link_unset_flags(request, IFF_UP);
- }
-
- if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL) {
- qDebug() << _tag << "error with link cache alloc ";
- }
-
- old = rtnl_link_get_by_name(cache, ifn);
- if (old) {
- qDebug() << _tag << "change link";
- retval = rtnl_link_change(rtsock, old, request, 0);
- } else {
- qDebug() << _tag << "change failed";
- retval = -1;
- qDebug() << _tag << "return value:" << retval << ":" << strerror(-retval);
- }
-
- rtnl_link_put(old);
- rtnl_link_put(request);
- nl_handle_destroy(rtsock);
-
- return retval;
-}
-
-
-
-/**
- * This method is used when the manual configuration is needed.
- *
- * This method is used when the manual configuration is needed.
- * First we bring up the interface. Than we configure the interface with
- * our manual entered configuration dates.
- * After that we replace the old default route with the new and
- * write a resolv.conf.
- *
- * @param ifname
- * name of the interface which we are about to configure.
- *
- * @param ipAddress
- * the new IP-Address.
- *
- * @param netmask
- * the netmask of the IP-Address.
- *
- * @param broadcast
- * the broadcast address.
- * @param gateway
- * the gateway address.
- * @param metric
- * do not exactly know why we need this. in most cases this should be 0.
- * @param af
- * the address type. Either AF_INET for IPv4 or AF_INET6 for IPv6.
- * @param pathToResolvConf
- * the path to the resolf.conf file. in most cases "/etc/".
- * @param nameServer
- * the name server addresses.
- */
-int NetworkManager::ip4_setManualConfiguration(QString ifname, QString ipAddress, QString netmask,
- QString broadcast, QString gateway, int metric, int af, QString pathToResolvConf, QList nameServer) {
-
- //bring the interface up
- bringInterfaceUP(ifname);
- //set configuration
- ip4_configureInterface(ifname, ipAddress, broadcast, netmask,af);
- //set default route
- replaceDefaultRoute(ifname, gateway, metric, af);
- //write resolv.conf
- writeResolvConf(pathToResolvConf, ifname, nameServer);
- return 0;
-}
-
-
-
-int NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress,
- QString broadcast, QString netmask, int af) {
-
- struct nl_cache *cache;
- struct nl_handle* rtsock;
- struct nl_addr * local;
- struct rtnl_addr * addr = NULL;
- int retval = 0;
- int iface_idx, err, prefixLength;
-
- QByteArray ba_ifn = ifname.trimmed().toAscii();
- char * ifn = ba_ifn.data();
-
- QByteArray ba_ip = ipAddress.trimmed().toAscii();
- char * ipaddr = ba_ip.data();
-
- QByteArray ba_bc = broadcast.trimmed().toAscii();
- char * bcaddr = ba_bc.data();
-
- rtsock = nl_handle_alloc();
- nl_connect(rtsock, NETLINK_ROUTE);
-
- if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL) {
- qDebug() << _tag << "error with link cache alloc";
- return -1;
- }
-
- iface_idx = rtnl_link_name2i(cache, ifn);
-
- if (!(addr = rtnl_addr_alloc())) {
- qDebug() << _tag << "error with addr alloc";
- return -1;
- }
-
- local = nl_addr_parse(ipaddr, af);
- err = rtnl_addr_set_local(addr, local);
- nl_addr_put(local);
- if (err != 0) {
- qDebug() << _tag << "error with set local addr";
- }
-
- prefixLength = ip4_netmaskToPrefix(ipAddress,netmask);
- qDebug() << _tag << "prefix length:" << prefixLength;
- rtnl_addr_set_prefixlen(addr, prefixLength);
-
- local = nl_addr_parse(bcaddr, af);
- err = rtnl_addr_set_broadcast(addr, local);
- nl_addr_put(local);
- if (err != 0) {
- qDebug() << _tag << "error with set broadcast addr";
- }
-
- rtnl_addr_set_ifindex(addr, iface_idx);
-
-
- retval = sync_address(ifn, iface_idx, af, addr);
- if(retval < 0) {
- qDebug() << _tag << "error in sync_address";
- }
- rtnl_addr_put(addr);
-
- return retval;
-}
-
-
-
-/**
- * This Method returns the length of the IP-Address netmask prefix.
- *
- * @param ipAddr
- * the IP-address
- *
- * @param netmask
- * the netmask of the IP-address.
- * @return
- * the length of the IP-Address netmask prefix
- */
-int NetworkManager::ip4_netmaskToPrefix(QString ipAddr, QString netmask) {
- int retval = -1;
- QNetworkAddressEntry nae;
-
- if (netmask == "") {
- qDebug() << _tag << "error: netmask is empty";
- return retval;
- }
- nae.setIp(QHostAddress(ipAddr));
- nae.setNetmask(QHostAddress(netmask.trimmed()));
- retval = nae.prefixLength();
-
- return retval;
-}
-
-
-
-int NetworkManager::ip6_addAddress(struct ip6_addr* ip6Addr, const char *iface) {
- int num_addrs, i, iface_idx;
- struct rtnl_addr* addr = NULL;
- struct nl_cache *cache;
- struct nl_handle* rtsock;
-
- rtsock = nl_handle_alloc();
- nl_connect(rtsock, NETLINK_ROUTE);
-
- if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL) {
- qDebug() << _tag << "error with link cache alloc";
- return -1;
- }
-
- iface_idx = rtnl_link_name2i(cache, iface);
-
- addr = ip6AddrToRtnlAddr(ip6Addr);
- if (!addr) {
- //nm_warning("couldn't create rtnl address!\n");
- return -1;
- }
- rtnl_addr_set_ifindex(addr, iface_idx);
-
- return sync_address(iface, iface_idx, AF_INET6, addr);
-}
-
-
-
-/**/
-struct rtnl_addr* NetworkManager::ip6AddrToRtnlAddr(struct ip6_addr* ip6Addr) {
- struct rtnl_addr *addr;
- bool success = true;
-
- if (!(addr = rtnl_addr_alloc()))
- return NULL;
-
- success = (nlAddrToRtnlAddr(ip6Addr, addr) >= 0);
-
- if (!success) {
- rtnl_addr_put(addr);
- addr = NULL;
- }
-
- return addr;
-}
-
-
-
-/**/
-struct nl_addr* NetworkManager::ip6AddrToNlAddr(const struct ip6_addr *ip6Addr) {
- struct nl_addr * nla = NULL;
-
- if (!(nla = nl_addr_alloc(sizeof(struct in6_addr))))
- return NULL;
- nl_addr_set_family(nla, AF_INET6);
- nl_addr_set_binary_addr(nla, (struct in6_addr *) ip6Addr, sizeof(struct in6_addr));
-
- return nla;
-}
-
-
-
-/**/
-int NetworkManager::nlAddrToRtnlAddr(
- const struct ip6_addr* ip6Addr, struct rtnl_addr* addr) {
- struct nl_addr * local = NULL;
- int err = 0;
-
- local = ip6AddrToNlAddr(ip6Addr);
- err = rtnl_addr_set_local(addr, local);
- nl_addr_put(local);
-
- return -err;
-}
-
-
-
-/**
- * delete all addresses of this interface but not the one we just set
- *
- * @return
- * -1 if something went wrong. else 0
- */
-int NetworkManager::sync_address(const char *iface, int ifindex, int family,
- struct rtnl_addr *addr) {
-
- struct nl_handle *nlh;
- struct nl_cache *addr_cache;
- struct rtnl_addr *filter_addr, *match_addr;
- struct nl_object *match;
- struct nl_addr *nladdr;
- int err;
- char buf[INET6_ADDRSTRLEN + 1];
-
- nlh = nl_handle_alloc();
- nl_connect(nlh, NETLINK_ROUTE);
-
- if (!nlh)
- return -1;
-
- addr_cache = rtnl_addr_alloc_cache(nlh);
-
- if (!addr_cache)
- return -1;
-
- filter_addr = rtnl_addr_alloc();
- if (!filter_addr) {
- nl_cache_free(addr_cache);
- return -1;
- }
- rtnl_addr_set_ifindex(filter_addr, ifindex);
- if (family)
- rtnl_addr_set_family(filter_addr, family);
-
- //nm_log_dbg (log_domain, "(%s): syncing addresses (family %d)", iface, family);
-
- /* Walk through the cache, comparing the addresses already on
- * the interface to the addresses in addrs.
- */
- for (match = nl_cache_get_first(addr_cache); match; match
- = nl_cache_get_next(match)) {
- int buf_valid = -1;
- match_addr = (struct rtnl_addr *) match;
-
- /* Skip addresses not on our interface */
- if (!nl_object_match_filter(match, (struct nl_object *) filter_addr))
- continue;
-
- if (addr) {
- if (addr && nl_object_identical(match, (struct nl_object *) addr)) {
- continue;
- }
- }
-
- nladdr = rtnl_addr_get_local(match_addr);
-
- /* Don't delete IPv6 link-local addresses; they don't belong to NM */
- if (rtnl_addr_get_family(match_addr) == AF_INET6) {
- struct in6_addr *tmp;
-
- if (rtnl_addr_get_scope(match_addr) == RT_SCOPE_LINK) {
- //nm_log_dbg (log_domain, "(%s): ignoring IPv6 link-local address", iface);
- continue;
- }
-
- tmp = (in6_addr*) nl_addr_get_binary_addr(nladdr);
- if (inet_ntop(AF_INET6, tmp, buf, sizeof(buf)))
- buf_valid = 0;
- } else if (rtnl_addr_get_family(match_addr) == AF_INET) {
- struct in_addr *tmp;
-
- tmp = (in_addr *) nl_addr_get_binary_addr(nladdr);
- if (inet_ntop(AF_INET, tmp, buf, sizeof(buf)))
- buf_valid = 0;
- }
-
- if (buf_valid == 0) {
- //nm_log_dbg (log_domain, "(%s): removing address '%s/%d'",
- // iface, buf, nl_addr_get_prefixlen (nladdr));
- }
-
- /* Otherwise, match_addr should be removed from the interface. */
- err = rtnl_addr_delete(nlh, match_addr, 0);
- if (err < 0) {
- //nm_log_err (log_domain, "(%s): error %d returned from rtnl_addr_delete(): %s",
- // iface, err, nl_geterror ());
- qDebug() << _tag << "error with delete addr";
- }
- }
-
- rtnl_addr_put(filter_addr);
- nl_cache_free(addr_cache);
-
- /* Now add the remaining new addresses */
- if (!addr)
- return -1;
-
- struct in6_addr *in6tmp;
- struct in_addr *in4tmp;
- int buf_valid = -1;
-
- nladdr = rtnl_addr_get_local(addr);
- if (rtnl_addr_get_family(addr) == AF_INET6) {
- in6tmp = (in6_addr*) nl_addr_get_binary_addr(nladdr);
- if (inet_ntop(AF_INET6, in6tmp, buf, sizeof(buf)))
- buf_valid = 0;
- } else if (rtnl_addr_get_family(addr) == AF_INET) {
- in4tmp = (in_addr*) nl_addr_get_binary_addr(nladdr);
- if (inet_ntop(AF_INET, in4tmp, buf, sizeof(buf)))
- buf_valid = 0;
- }
-
- if (buf_valid == 0) {
- //nm_log_dbg (log_domain, "(%s): adding address '%s/%d'",
- //iface, buf, nl_addr_get_prefixlen (nladdr));
- qDebug() << _tag << "buf valid adding addr";
- }
-
- err = rtnl_addr_add(nlh, addr, 0);
- if (err < 0) {
- //nm_log_err (log_domain,
- // "(%s): error %d returned from rtnl_addr_add():\n%s",
- // iface, err, nl_geterror ());
- qDebug() << _tag << "error with add addr"<< strerror(-err);
- }
-
- rtnl_addr_put(addr);
-
- return err;
-}
-
-
-
-/**
- * This method writes a resolv.conf file.
- *
- * @param path
- * path to the resolv.conf file. (in most cases: /etc/)
- * @param ifname
- * name of the interface
- * @param
- * addresses of the nameserver
- *
- * @return
- * return 0 if success
- * else -1
- */
-int NetworkManager::writeResolvConf(QString path, QString ifname, QList nameServer){
-
- QFile file(path + "resolv.conf");
- if(!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
- qDebug() << _tag << "error couldn't open file:" << path;
- return -1;
- }
- QTextStream out(&file);
- out << "# Generated by networkdiscovery manual configuration for interface " + ifname +"\n";
- foreach(QString ns, nameServer ) {
- out << "nameserver " + ns +"\n";
- }
-
- file.close();
-
- return 0;
-}
-
diff --git a/NetworkDiscovery/networkmanager.h b/NetworkDiscovery/networkmanager.h
deleted file mode 100644
index f332f9e..0000000
--- a/NetworkDiscovery/networkmanager.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * networkmanager.h
- *
- * Created on: Sep 5, 2011
- * Author: niklas
- */
-
-#ifndef NETWORKMANAGER_H_
-#define NETWORKMANAGER_H_
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-class NetworkManager: public QObject {
-Q_OBJECT
-
-public:
- NetworkManager();
- virtual ~NetworkManager();
-
- int replaceDefaultRoute(QString ifname, QString gateway, int metric,
- int af);
-
- int bringInterfaceUP(QString ifname);
- int bringInterfaceDown(QString ifname);
-
- int ip4_setManualConfiguration(QString ifname, QString ipAddress, QString netmask,
- QString broadcast, QString gateway, int metric, int af, QString pathToResolvConf, QList nameServer);
- int ip4_configureInterface(QString ifname, QString ipAddress,
- QString broadcast, QString netmask, int af);
-
- int ip6_addRoute(const char *iface,
- const struct in6_addr *ip6_dest, int ip6_prefix,
- const struct in6_addr *ip6_gateway, int metric, int mss);
- int ip6_addAddress(struct ip6_addr* ip6Addr, const char *iface);
-
- int writeResolvConf(QString path, QString ifname, QList nameServer);
-
-private:
- QString _tag;
- int bringInterfaceUpDown(QString ifname, bool up);
- int ip4_netmaskToPrefix(QString ipAddr, QString netmask);
-
- int sync_address(const char *iface, int ifindex, int family,
- struct rtnl_addr *addr);
-
- struct rtnl_route* create_route (int iface_idx, int mss);
- struct nl_addr* ip6AddrToNlAddr (const struct ip6_addr* ip6Addr);
- int nlAddrToRtnlAddr (const struct ip6_addr* ip6Addr, struct rtnl_addr* addr);
- struct rtnl_addr* ip6AddrToRtnlAddr(struct ip6_addr* ip6Addr);
-
-
-};
-
-#endif /* NETWORKMANAGER_H_ */
diff --git a/UnixDomainSocketServer/Debug/UnixDomainSocketServer b/UnixDomainSocketServer/Debug/UnixDomainSocketServer
deleted file mode 100755
index a7fbc06..0000000
Binary files a/UnixDomainSocketServer/Debug/UnixDomainSocketServer and /dev/null differ
diff --git a/UnixDomainSocketServer/Debug/makefile b/UnixDomainSocketServer/Debug/makefile
deleted file mode 100644
index 63e11e5..0000000
--- a/UnixDomainSocketServer/Debug/makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables
-
-# All Target
-all: UnixDomainSocketServer
-
-# Tool invocations
-UnixDomainSocketServer: $(OBJS) $(USER_OBJS)
- @echo 'Building target: $@'
- @echo 'Invoking: GCC C Linker'
- gcc -o"UnixDomainSocketServer" $(OBJS) $(USER_OBJS) $(LIBS)
- @echo 'Finished building target: $@'
- @echo ' '
-
-# Other Targets
-clean:
- -$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES) UnixDomainSocketServer
- -@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/UnixDomainSocketServer/Debug/objects.mk b/UnixDomainSocketServer/Debug/objects.mk
deleted file mode 100644
index 224ef68..0000000
--- a/UnixDomainSocketServer/Debug/objects.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS :=
diff --git a/UnixDomainSocketServer/Debug/server.d b/UnixDomainSocketServer/Debug/server.d
deleted file mode 100644
index c22def6..0000000
--- a/UnixDomainSocketServer/Debug/server.d
+++ /dev/null
@@ -1,3 +0,0 @@
-server.d server.o: ../server.c ../../common/fbgui.h
-
-../../common/fbgui.h:
diff --git a/UnixDomainSocketServer/Debug/sources.mk b/UnixDomainSocketServer/Debug/sources.mk
deleted file mode 100644
index df1db10..0000000
--- a/UnixDomainSocketServer/Debug/sources.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS :=
-C_SRCS :=
-S_UPPER_SRCS :=
-OBJ_SRCS :=
-ASM_SRCS :=
-OBJS :=
-C_DEPS :=
-EXECUTABLES :=
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-. \
-
diff --git a/UnixDomainSocketServer/Debug/subdir.mk b/UnixDomainSocketServer/Debug/subdir.mk
deleted file mode 100644
index eb4a214..0000000
--- a/UnixDomainSocketServer/Debug/subdir.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables
-C_SRCS += \
-../server.c
-
-OBJS += \
-./server.o
-
-C_DEPS += \
-./server.d
-
-
-# Each subdirectory must supply rules for building sources it contributes
-%.o: ../%.c
- @echo 'Building file: $<'
- @echo 'Invoking: GCC C Compiler'
- gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
- @echo 'Finished building: $<'
- @echo ' '
-
-
diff --git a/UnixDomainSocketServer/Makefile b/UnixDomainSocketServer/Makefile
deleted file mode 100644
index 373b23f..0000000
--- a/UnixDomainSocketServer/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
- gcc -g -Wall server.c -o server
-
-clean:
- rm -f server
diff --git a/UnixDomainSocketServer/server b/UnixDomainSocketServer/server
deleted file mode 100755
index 1811a94..0000000
Binary files a/UnixDomainSocketServer/server and /dev/null differ
diff --git a/UnixDomainSocketServer/server.c b/UnixDomainSocketServer/server.c
deleted file mode 100644
index ce776b1..0000000
--- a/UnixDomainSocketServer/server.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "../common/fbgui.h"
-
-void error(const char *msg) {
- perror(msg);
- exit(1);
-}
-
-int main(int argc, char *argv[]) {
- int sockfd, newsockfd;
- socklen_t clilen;
- char buffer[DHCP_MESSAGE_SIZE];
- const char ack[ACK_SIZE] = "ACK";
- struct sockaddr_un serv_addr, cli_addr;
- int n;
-
- sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
- if (sockfd < 0)
- error("ERROR opening socket");
-
- bzero((char *) &serv_addr, sizeof(serv_addr));
-
- serv_addr.sun_family = AF_UNIX;
- strcpy(serv_addr.sun_path, "/var/tmp/qt_c_socket_default");
- unlink("/var/tmp/qt_c_socket_default");
- if (bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
- error("ERROR on binding");
-
- if (listen(sockfd, 5) == -1) {
- error("ERROR on listen");
- }
-
-
- for (;;) {
- int done;
- printf("Waiting for a connection...\n");
- clilen = sizeof(cli_addr);
-
- newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, &clilen);
- if (newsockfd < 0)
- error("ERROR on accept");
-
- printf("Connected.\n");
- done = 0;
-
- do {
- bzero(buffer, DHCP_MESSAGE_SIZE);
- n = read(newsockfd, buffer, DHCP_MESSAGE_SIZE);
- if (n <= 0) {
- if (n<0) error("ERROR reading from socket");
- done = 1;
- }
- // search for last newline and replace it with a null
- char * pch;
- pch=strrchr(buffer,'\n');
- buffer[pch-buffer] = '\0';
- printf("Here is the message: \"%s\"\n", buffer);
- if(!done) {
- printf("send ACK\n");
- if (send(newsockfd, ack, ACK_SIZE, 0) < 0) {
- error("ERROR on send");
- done = 1;
- }
- }
- } while (!done);
- close(newsockfd);
- }
-
- close(sockfd);
- return 0;
-}
--
cgit v1.2.3-55-g7522