[cleanup] change file location and mode

Change-Id: I1f74ff9259a5c02a161bb75d4dd2ea15b0c6de6f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3386c69..011c4bc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,17 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(stc-manager C CXX)
 SET(PACKAGE ${PROJECT_NAME})
-SET(INTERFACES "${CMAKE_SOURCE_DIR}/interfaces")
+SET(INTERFACES "${CMAKE_SOURCE_DIR}/dbus-interface")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(LIBDIR ${PREFIX}/${LIB_PATH})
 
-SET(DATA_DIR   ${CMAKE_SOURCE_DIR}/data)
+SET(DATA_DIR   ${CMAKE_SOURCE_DIR}/res)
 
-ADD_SUBDIRECTORY(interfaces)
-ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(dbus-interface)
+ADD_SUBDIRECTORY(manager)
 ADD_SUBDIRECTORY(plugin)
+ADD_SUBDIRECTORY(misc)
 
 IF(BUILD_GTESTS)
-       ADD_SUBDIRECTORY(unittest)
+       ADD_SUBDIRECTORY(tests)
 ENDIF(BUILD_GTESTS)

diff --git a/LICENSE b/LICENSE.APLv2
similarity index 100%
rename from LICENSE
rename to LICENSE.APLv2

diff --git a/interfaces/CMakeLists.txt b/dbus-interface/CMakeLists.txt
similarity index 100%
rename from interfaces/CMakeLists.txt
rename to dbus-interface/CMakeLists.txt

diff --git a/interfaces/stcmanager-iface-firewall.xml b/dbus-interface/stcmanager-iface-firewall.xml
similarity index 100%
rename from interfaces/stcmanager-iface-firewall.xml
rename to dbus-interface/stcmanager-iface-firewall.xml

diff --git a/interfaces/stcmanager-iface-manager.xml b/dbus-interface/stcmanager-iface-manager.xml
similarity index 100%
rename from interfaces/stcmanager-iface-manager.xml
rename to dbus-interface/stcmanager-iface-manager.xml

diff --git a/interfaces/stcmanager-iface-pcap.xml b/dbus-interface/stcmanager-iface-pcap.xml
similarity index 100%
rename from interfaces/stcmanager-iface-pcap.xml
rename to dbus-interface/stcmanager-iface-pcap.xml

diff --git a/interfaces/stcmanager-iface-restriction.xml b/dbus-interface/stcmanager-iface-restriction.xml
similarity index 100%
rename from interfaces/stcmanager-iface-restriction.xml
rename to dbus-interface/stcmanager-iface-restriction.xml

diff --git a/interfaces/stcmanager-iface-statistics.xml b/dbus-interface/stcmanager-iface-statistics.xml
similarity index 100%
rename from interfaces/stcmanager-iface-statistics.xml
rename to dbus-interface/stcmanager-iface-statistics.xml

diff --git a/src/configure/include/counter.h b/include/counter.h
similarity index 100%
rename from src/configure/include/counter.h
rename to include/counter.h

diff --git a/src/database/include/table-counters.h b/include/db/table-counters.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/include/table-counters.h
rename to include/db/table-counters.h

diff --git a/src/database/include/table-firewall.h b/include/db/table-firewall.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/include/table-firewall.h
rename to include/db/table-firewall.h

diff --git a/src/database/include/table-restrictions.h b/include/db/table-restrictions.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/include/table-restrictions.h
rename to include/db/table-restrictions.h

diff --git a/src/database/include/table-statistics.h b/include/db/table-statistics.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/include/table-statistics.h
rename to include/db/table-statistics.h

diff --git a/src/database/include/stc-db.h b/include/stc-db.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/include/stc-db.h
rename to include/stc-db.h

diff --git a/include/stc-error.h b/include/stc-error.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-firewall.h b/include/stc-firewall.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-gdbus.h b/include/stc-manager-gdbus.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-plugin-appstatus.h b/include/stc-manager-plugin-appstatus.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-plugin-exception.h b/include/stc-manager-plugin-exception.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-plugin-firewall.h b/include/stc-manager-plugin-firewall.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-plugin-monitor.h b/include/stc-manager-plugin-monitor.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-plugin-pcap.h b/include/stc-manager-plugin-pcap.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-plugin-procfs.h b/include/stc-manager-plugin-procfs.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-plugin-tether.h b/include/stc-manager-plugin-tether.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager-util.h b/include/stc-manager-util.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-manager.h b/include/stc-manager.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-pcap.h b/include/stc-pcap.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-restriction.h b/include/stc-restriction.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/stc-statistics.h b/include/stc-statistics.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/include/transmission.h b/include/transmission.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/CMakeLists.txt b/manager/CMakeLists.txt
similarity index 68%
rename from src/CMakeLists.txt
rename to manager/CMakeLists.txt
index 9883098..3c0d1b7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/manager/CMakeLists.txt
@@ -21,10 +21,9 @@ FOREACH(flag ${stc_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(SOURCE_DIR                  ${CMAKE_SOURCE_DIR}/src)
+SET(SOURCE_DIR                  ${CMAKE_SOURCE_DIR}/manager)
 SET(HELPER_SOURCE_DIR           ${SOURCE_DIR}/helper)
 SET(DATABASE_SOURCE_DIR         ${SOURCE_DIR}/database)
-SET(CONFIGURE_SOURCE_DIR        ${SOURCE_DIR}/configure)
 SET(LIMITATION_SOURCE_DIR       ${SOURCE_DIR}/limitation)
 SET(PLUGIN_DIR                  ${CMAKE_SOURCE_DIR}/plugin)
 SET(APPSTATUS_SOURCE_DIR        ${PLUGIN_DIR}/appstatus)
@@ -36,40 +35,31 @@ SET(MONITOR_SOURCE_DIR          ${PLUGIN_DIR}/monitor)
 SET(FIREWALL_SOURCE_DIR         ${PLUGIN_DIR}/firewall)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/interfaces)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/dbus-interface)
 
 INCLUDE_DIRECTORIES(${SOURCE_DIR})
 INCLUDE_DIRECTORIES(${HELPER_SOURCE_DIR})
 
 INCLUDE_DIRECTORIES(${DATABASE_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${DATABASE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/db)
 
-INCLUDE_DIRECTORIES(${CONFIGURE_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CONFIGURE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${APPSTATUS_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${EXCEPTION_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${PROCFS_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${PCAP_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${TETHER_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${MONITOR_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${FIREWALL_SOURCE_DIR})
 
-INCLUDE_DIRECTORIES(${LIMITATION_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${LIMITATION_SOURCE_DIR}/include)
-
-INCLUDE_DIRECTORIES(${APPSTATUS_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${EXCEPTION_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${PROCFS_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${PCAP_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${TETHER_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${MONITOR_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${FIREWALL_SOURCE_DIR}/include)
-
-FILE(GLOB SOURCE_SRCS        ${SOURCE_DIR}/*.c)
+FILE(GLOB SOURCE_SRCS        ${SOURCE_DIR}/*.c util/*.c)
 FILE(GLOB HELPER_SRCS        ${HELPER_SOURCE_DIR}/*.c)
-FILE(GLOB CONFIGURE_SRCS     ${CONFIGURE_SOURCE_DIR}/*.c)
-FILE(GLOB LIMITATION_SRCS    ${LIMITATION_SOURCE_DIR}/*.c)
 
-SET(SRCS ${SRCS} ${SOURCE_SRCS} ${HELPER_SRCS} ${CONFIGURE_SRCS} ${LIMITATION_SRCS})
+SET(SRCS ${SRCS} ${SOURCE_SRCS} ${HELPER_SRCS})
 
 IF("${ENABLE_DATABASE}" STREQUAL "YES")
        FILE(GLOB DATABASE_SRCS           ${DATABASE_SOURCE_DIR}/*.c)
-       FILE(GLOB DATABASE_TABLES_SRCS    ${DATABASE_SOURCE_DIR}/tables/*.c)
 
-       SET(SRCS ${SRCS} ${DATABASE_SRCS} ${DATABASE_TABLES_SRCS})
+       SET(SRCS ${SRCS} ${DATABASE_SRCS})
 
        INSTALL(FILES ${DATA_DIR}/traffic_db.sql DESTINATION /usr/share)
        INSTALL(FILES ${DATA_DIR}/firewall_db.sql DESTINATION /usr/share)
@@ -99,5 +89,3 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${stc_pkgs_LDFLAGS} -ldl)
 INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BIN_DIR})
 ADD_DEPENDENCIES(${PROJECT_NAME} GENERATED_DBUS_CODE)
-
-ADD_SUBDIRECTORY(utils)

diff --git a/src/database/db-common.c b/manager/database/db-common.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/db-common.c
rename to manager/database/db-common.c

diff --git a/src/database/db-guard.c b/manager/database/db-guard.c
similarity index 100%
rename from src/database/db-guard.c
rename to manager/database/db-guard.c

diff --git a/src/database/include/db-internal.h b/manager/database/db-internal.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/include/db-internal.h
rename to manager/database/db-internal.h

diff --git a/src/database/tables/table-counters.c b/manager/database/table-counters.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/tables/table-counters.c
rename to manager/database/table-counters.c

diff --git a/src/database/tables/table-firewall.c b/manager/database/table-firewall.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/tables/table-firewall.c
rename to manager/database/table-firewall.c

diff --git a/src/database/tables/table-restrictions.c b/manager/database/table-restrictions.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/tables/table-restrictions.c
rename to manager/database/table-restrictions.c

diff --git a/src/database/tables/table-statistics.c b/manager/database/table-statistics.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/database/tables/table-statistics.c
rename to manager/database/table-statistics.c

diff --git a/src/configure/include/configure_stub.h b/manager/helper/configure_stub.h
similarity index 100%
rename from src/configure/include/configure_stub.h
rename to manager/helper/configure_stub.h

diff --git a/src/helper/helper-cgroup.c b/manager/helper/helper-cgroup.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/helper/helper-cgroup.c
rename to manager/helper/helper-cgroup.c

diff --git a/src/helper/helper-cgroup.h b/manager/helper/helper-cgroup.h
similarity index 100%
rename from src/helper/helper-cgroup.h
rename to manager/helper/helper-cgroup.h

diff --git a/src/helper/helper-file.c b/manager/helper/helper-file.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/helper/helper-file.c
rename to manager/helper/helper-file.c

diff --git a/src/helper/helper-file.h b/manager/helper/helper-file.h
similarity index 100%
rename from src/helper/helper-file.h
rename to manager/helper/helper-file.h

diff --git a/src/helper/helper-firewall.c b/manager/helper/helper-firewall.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/helper/helper-firewall.c
rename to manager/helper/helper-firewall.c

diff --git a/src/helper/helper-firewall.h b/manager/helper/helper-firewall.h
similarity index 100%
rename from src/helper/helper-firewall.h
rename to manager/helper/helper-firewall.h

diff --git a/src/helper/helper-inotify.c b/manager/helper/helper-inotify.c
similarity index 100%
rename from src/helper/helper-inotify.c
rename to manager/helper/helper-inotify.c

diff --git a/src/helper/helper-inotify.h b/manager/helper/helper-inotify.h
similarity index 100%
rename from src/helper/helper-inotify.h
rename to manager/helper/helper-inotify.h

diff --git a/src/helper/helper-iptables.c b/manager/helper/helper-iptables.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/helper/helper-iptables.c
rename to manager/helper/helper-iptables.c

diff --git a/src/helper/helper-iptables.h b/manager/helper/helper-iptables.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/helper/helper-iptables.h
rename to manager/helper/helper-iptables.h

diff --git a/src/helper/helper-net-cls.c b/manager/helper/helper-net-cls.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/helper/helper-net-cls.c
rename to manager/helper/helper-net-cls.c

diff --git a/src/helper/helper-net-cls.h b/manager/helper/helper-net-cls.h
similarity index 100%
rename from src/helper/helper-net-cls.h
rename to manager/helper/helper-net-cls.h

diff --git a/src/helper/helper-nfacct-rule.c b/manager/helper/helper-nfacct-rule.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/helper/helper-nfacct-rule.c
rename to manager/helper/helper-nfacct-rule.c
index ff703d3..5694d14
--- a/src/helper/helper-nfacct-rule.c
+++ b/manager/helper/helper-nfacct-rule.c
@@ -959,4 +959,3 @@ void generate_counter_name(nfacct_rule_s *counter)
                 warn_symbol, counter->iotype, counter->iftype,
                 counter->classid, counter->ifname);
 }
-

diff --git a/src/helper/helper-nfacct-rule.h b/manager/helper/helper-nfacct-rule.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/helper/helper-nfacct-rule.h
rename to manager/helper/helper-nfacct-rule.h
index f313849..5e09471
--- a/src/helper/helper-nfacct-rule.h
+++ b/manager/helper/helper-nfacct-rule.h
@@ -141,4 +141,3 @@ netlink_serialization_command *
 netlink_create_command(struct netlink_serialization_params *params);
 
 #endif /* __STC_NFACCT_RULE_H__ */
-

diff --git a/src/helper/helper-nl.c b/manager/helper/helper-nl.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/helper/helper-nl.c
rename to manager/helper/helper-nl.c

diff --git a/src/helper/helper-nl.h b/manager/helper/helper-nl.h
similarity index 100%
rename from src/helper/helper-nl.h
rename to manager/helper/helper-nl.h

diff --git a/src/helper/helper-procfs.c b/manager/helper/helper-procfs.c
similarity index 100%
rename from src/helper/helper-procfs.c
rename to manager/helper/helper-procfs.c

diff --git a/src/helper/helper-procfs.h b/manager/helper/helper-procfs.h
similarity index 100%
rename from src/helper/helper-procfs.h
rename to manager/helper/helper-procfs.h

diff --git a/src/stc-firewall.c b/manager/stc-firewall.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-firewall.c
rename to manager/stc-firewall.c

diff --git a/src/stc-manager-gdbus.c b/manager/stc-manager-gdbus.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-gdbus.c
rename to manager/stc-manager-gdbus.c

diff --git a/src/stc-manager-plugin-appstatus.c b/manager/stc-manager-plugin-appstatus.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-plugin-appstatus.c
rename to manager/stc-manager-plugin-appstatus.c

diff --git a/src/stc-manager-plugin-exception.c b/manager/stc-manager-plugin-exception.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-plugin-exception.c
rename to manager/stc-manager-plugin-exception.c

diff --git a/src/stc-manager-plugin-firewall.c b/manager/stc-manager-plugin-firewall.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-plugin-firewall.c
rename to manager/stc-manager-plugin-firewall.c

diff --git a/src/stc-manager-plugin-monitor.c b/manager/stc-manager-plugin-monitor.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-plugin-monitor.c
rename to manager/stc-manager-plugin-monitor.c

diff --git a/src/stc-manager-plugin-pcap.c b/manager/stc-manager-plugin-pcap.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-plugin-pcap.c
rename to manager/stc-manager-plugin-pcap.c

diff --git a/src/stc-manager-plugin-procfs.c b/manager/stc-manager-plugin-procfs.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-plugin-procfs.c
rename to manager/stc-manager-plugin-procfs.c

diff --git a/src/stc-manager-plugin-tether.c b/manager/stc-manager-plugin-tether.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-plugin-tether.c
rename to manager/stc-manager-plugin-tether.c

diff --git a/src/stc-manager.c b/manager/stc-manager.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager.c
rename to manager/stc-manager.c

diff --git a/src/stc-pcap.c b/manager/stc-pcap.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-pcap.c
rename to manager/stc-pcap.c

diff --git a/src/stc-restriction.c b/manager/stc-restriction.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-restriction.c
rename to manager/stc-restriction.c

diff --git a/src/stc-statistics.c b/manager/stc-statistics.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-statistics.c
rename to manager/stc-statistics.c

diff --git a/src/stc-manager-util.c b/manager/util/stc-manager-util.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/stc-manager-util.c
rename to manager/util/stc-manager-util.c

diff --git a/src/utils/CMakeLists.txt b/misc/CMakeLists.txt
similarity index 100%
rename from src/utils/CMakeLists.txt
rename to misc/CMakeLists.txt

diff --git a/src/utils/net-cls-release.c b/misc/net-cls-release.c
similarity index 100%
rename from src/utils/net-cls-release.c
rename to misc/net-cls-release.c

diff --git a/stc-manager.manifest b/packaging/stc-manager.manifest
similarity index 98%
rename from stc-manager.manifest
rename to packaging/stc-manager.manifest
index 81ace0c..97e8c31 100644 (file)
--- a/stc-manager.manifest
+++ b/packaging/stc-manager.manifest
@@ -3,4 +3,3 @@
                <domain name="_"/>
        </request>
 </manifest>
-

diff --git a/packaging/stc-manager.spec b/packaging/stc-manager.spec
index 0690fde..c19c312 100644 (file)
--- a/packaging/stc-manager.spec
+++ b/packaging/stc-manager.spec
@@ -5,6 +5,7 @@ Release:    0
 Group:      Network & Connectivity/Other
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
+Source1001: %{name}.manifest
 
 %define enable_database YES
 %define enable_statistics YES
@@ -93,7 +94,7 @@ A smart traffic control manager extension for firewall plugin
 
 %prep
 %setup -q
-chmod 644 %{SOURCE0}
+cp %{SOURCE1001} ./%{name}.manifest
 
 %build
 
@@ -135,29 +136,29 @@ rm -rf %{buildroot}
 
 #Exceptions file
 mkdir -p %{buildroot}/%{_localstatedir}/lib/stc
-cp data/exceptions %{buildroot}/%{_localstatedir}/lib/stc/exceptions
+cp res/exceptions %{buildroot}/%{_localstatedir}/lib/stc/exceptions
 
 #Systemd service file
 mkdir -p %{buildroot}%{_unitdir}
-cp resources/systemd/stc-manager.service %{buildroot}%{_unitdir}/stc-manager.service
+cp res/systemd/stc-manager.service %{buildroot}%{_unitdir}/stc-manager.service
 
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants/
 ln -s ../stc-manager.service %{buildroot}%{_unitdir}/multi-user.target.wants/stc-manager.service
 
 #DBus DAC (stc-manager.manifest enables DBus SMACK)
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
-cp resources/dbus/stc-manager.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/stc-manager.conf
+cp res/dbus/stc-manager.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/stc-manager.conf
 
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
-cp resources/dbus/net.stc-manager.service %{buildroot}%{_datadir}/dbus-1/system-services/net.stc.service
+cp res/dbus/net.stc-manager.service %{buildroot}%{_datadir}/dbus-1/system-services/net.stc.service
 
 #OS Upgrade
 mkdir -p %{buildroot}%{upgrade_script_path}
-cp -f scripts/%{upgrade_script_filename} %{buildroot}%{upgrade_script_path}
+cp -f res/%{upgrade_script_filename} %{buildroot}%{upgrade_script_path}
 
 %files
 %manifest %{name}.manifest
-%license LICENSE
+%license LICENSE.APLv2
 %defattr(-,root,root,-)
 %attr(500,root,root) %{_bindir}/*
 

diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
index 98f28b7..d1777f2 100644 (file)
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@@ -1,15 +1,14 @@
-SET(SOURCE_DIR               ${CMAKE_SOURCE_DIR}/src)
+SET(SOURCE_DIR               ${CMAKE_SOURCE_DIR}/manager)
 SET(HELPER_SOURCE_DIR        ${SOURCE_DIR}/helper)
 SET(DATABASE_SOURCE_DIR      ${SOURCE_DIR}/database)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/interfaces)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/dbus-interface)
 
 INCLUDE_DIRECTORIES(${SOURCE_DIR})
 INCLUDE_DIRECTORIES(${HELPER_SOURCE_DIR})
 
-INCLUDE_DIRECTORIES(${DATABASE_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${DATABASE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/db)
 
 ADD_SUBDIRECTORY(appstatus)
 ADD_SUBDIRECTORY(exception)

diff --git a/plugin/appstatus/CMakeLists.txt b/plugin/appstatus/CMakeLists.txt
index d4d7428..0a3acf7 100644 (file)
--- a/plugin/appstatus/CMakeLists.txt
+++ b/plugin/appstatus/CMakeLists.txt
@@ -16,8 +16,6 @@ FOREACH(flag ${appstatus_plugin_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Werror -fvisibility=hidden")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")

diff --git a/plugin/appstatus/stc-plugin-appstatus.c b/plugin/appstatus/stc-plugin-appstatus.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/appstatus/include/stc-plugin-appstatus.h b/plugin/appstatus/stc-plugin-appstatus.h
similarity index 100%
rename from plugin/appstatus/include/stc-plugin-appstatus.h
rename to plugin/appstatus/stc-plugin-appstatus.h

diff --git a/plugin/exception/CMakeLists.txt b/plugin/exception/CMakeLists.txt
index 1ccf391..06b6d93 100644 (file)
--- a/plugin/exception/CMakeLists.txt
+++ b/plugin/exception/CMakeLists.txt
@@ -15,8 +15,6 @@ FOREACH(flag ${exception_plugin_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Werror -fvisibility=hidden")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")

diff --git a/plugin/exception/stc-plugin-exception.c b/plugin/exception/stc-plugin-exception.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/exception/include/stc-plugin-exception.h b/plugin/exception/stc-plugin-exception.h
similarity index 100%
rename from plugin/exception/include/stc-plugin-exception.h
rename to plugin/exception/stc-plugin-exception.h

diff --git a/plugin/firewall/CMakeLists.txt b/plugin/firewall/CMakeLists.txt
index 05c4d90..2576f2d 100644 (file)
--- a/plugin/firewall/CMakeLists.txt
+++ b/plugin/firewall/CMakeLists.txt
@@ -14,8 +14,6 @@ FOREACH(flag ${firewall_plugin_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Werror -fvisibility=hidden")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")

diff --git a/plugin/firewall/stc-plugin-firewall.c b/plugin/firewall/stc-plugin-firewall.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/firewall/include/stc-plugin-firewall.h b/plugin/firewall/stc-plugin-firewall.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/firewall/include/stc-plugin-firewall.h
rename to plugin/firewall/stc-plugin-firewall.h

diff --git a/plugin/monitor/CMakeLists.txt b/plugin/monitor/CMakeLists.txt
index e1e0048..c05a448 100644 (file)
--- a/plugin/monitor/CMakeLists.txt
+++ b/plugin/monitor/CMakeLists.txt
@@ -18,12 +18,10 @@ FOREACH(flag ${monitor_plugin_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/configure/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/tether/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/exception/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/appstatus/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/firewall/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/tether)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/exception)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/appstatus)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/firewall)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Werror -fvisibility=hidden")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")

diff --git a/plugin/monitor/stc-plugin-monitor-app.c b/plugin/monitor/stc-plugin-monitor-app.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/monitor/include/stc-plugin-monitor-app.h b/plugin/monitor/stc-plugin-monitor-app.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/monitor/include/stc-plugin-monitor-app.h
rename to plugin/monitor/stc-plugin-monitor-app.h

diff --git a/plugin/monitor/stc-plugin-monitor-connection.c b/plugin/monitor/stc-plugin-monitor-connection.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/monitor/include/stc-plugin-monitor-connection.h b/plugin/monitor/stc-plugin-monitor-connection.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/monitor/include/stc-plugin-monitor-connection.h
rename to plugin/monitor/stc-plugin-monitor-connection.h

diff --git a/plugin/monitor/include/stc-plugin-monitor-context.h b/plugin/monitor/stc-plugin-monitor-context.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/monitor/include/stc-plugin-monitor-context.h
rename to plugin/monitor/stc-plugin-monitor-context.h

diff --git a/plugin/monitor/stc-plugin-monitor-ipt.c b/plugin/monitor/stc-plugin-monitor-ipt.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/monitor/include/stc-plugin-monitor-ipt.h b/plugin/monitor/stc-plugin-monitor-ipt.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/monitor/include/stc-plugin-monitor-ipt.h
rename to plugin/monitor/stc-plugin-monitor-ipt.h

diff --git a/plugin/monitor/stc-plugin-monitor-proc.c b/plugin/monitor/stc-plugin-monitor-proc.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/monitor/include/stc-plugin-monitor-proc.h b/plugin/monitor/stc-plugin-monitor-proc.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/monitor/include/stc-plugin-monitor-proc.h
rename to plugin/monitor/stc-plugin-monitor-proc.h

diff --git a/plugin/monitor/stc-plugin-monitor-rstn.c b/plugin/monitor/stc-plugin-monitor-rstn.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/monitor/include/stc-plugin-monitor-rstn.h b/plugin/monitor/stc-plugin-monitor-rstn.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/monitor/include/stc-plugin-monitor-rstn.h
rename to plugin/monitor/stc-plugin-monitor-rstn.h

diff --git a/plugin/monitor/stc-plugin-monitor-time.c b/plugin/monitor/stc-plugin-monitor-time.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/monitor/include/stc-plugin-monitor-time.h b/plugin/monitor/stc-plugin-monitor-time.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/monitor/include/stc-plugin-monitor-time.h
rename to plugin/monitor/stc-plugin-monitor-time.h

diff --git a/plugin/monitor/stc-plugin-monitor.c b/plugin/monitor/stc-plugin-monitor.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/monitor/include/stc-plugin-monitor.h b/plugin/monitor/stc-plugin-monitor.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/monitor/include/stc-plugin-monitor.h
rename to plugin/monitor/stc-plugin-monitor.h

diff --git a/plugin/pcap/CMakeLists.txt b/plugin/pcap/CMakeLists.txt
index be4b022..48c7dae 100644 (file)
--- a/plugin/pcap/CMakeLists.txt
+++ b/plugin/pcap/CMakeLists.txt
@@ -14,8 +14,6 @@ FOREACH(flag ${pcap_plugin_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Werror -fvisibility=hidden")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")

diff --git a/plugin/pcap/include/stc-plugin-pcap-internal.h b/plugin/pcap/stc-plugin-pcap-internal.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/pcap/include/stc-plugin-pcap-internal.h
rename to plugin/pcap/stc-plugin-pcap-internal.h

diff --git a/plugin/pcap/stc-plugin-pcap.c b/plugin/pcap/stc-plugin-pcap.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/pcap/include/stc-plugin-pcap.h b/plugin/pcap/stc-plugin-pcap.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/pcap/include/stc-plugin-pcap.h
rename to plugin/pcap/stc-plugin-pcap.h

diff --git a/plugin/procfs/CMakeLists.txt b/plugin/procfs/CMakeLists.txt
index 17ab7f2..6e529c1 100644 (file)
--- a/plugin/procfs/CMakeLists.txt
+++ b/plugin/procfs/CMakeLists.txt
@@ -14,9 +14,8 @@ FOREACH(flag ${procfs_plugin_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/monitor/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/exception/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/monitor)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/exception)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Werror -fvisibility=hidden")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")

diff --git a/plugin/procfs/stc-plugin-procfs.c b/plugin/procfs/stc-plugin-procfs.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/procfs/include/stc-plugin-procfs.h b/plugin/procfs/stc-plugin-procfs.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from plugin/procfs/include/stc-plugin-procfs.h
rename to plugin/procfs/stc-plugin-procfs.h

diff --git a/plugin/tether/CMakeLists.txt b/plugin/tether/CMakeLists.txt
index b64cfbd..7918d2e 100644 (file)
--- a/plugin/tether/CMakeLists.txt
+++ b/plugin/tether/CMakeLists.txt
@@ -14,8 +14,7 @@ FOREACH(flag ${tether_plugin_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/monitor/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/plugin/monitor)
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Werror -fvisibility=hidden")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")

diff --git a/plugin/tether/stc-plugin-tether.c b/plugin/tether/stc-plugin-tether.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/plugin/tether/include/stc-plugin-tether.h b/plugin/tether/stc-plugin-tether.h
similarity index 100%
rename from plugin/tether/include/stc-plugin-tether.h
rename to plugin/tether/stc-plugin-tether.h

diff --git a/scripts/500.stc-manager_upgrade.sh b/res/500.stc-manager_upgrade.sh
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from scripts/500.stc-manager_upgrade.sh
rename to res/500.stc-manager_upgrade.sh

diff --git a/resources/dbus/net.stc-manager.service b/res/dbus/net.stc-manager.service
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from resources/dbus/net.stc-manager.service
rename to res/dbus/net.stc-manager.service

diff --git a/resources/dbus/stc-manager.conf b/res/dbus/stc-manager.conf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from resources/dbus/stc-manager.conf
rename to res/dbus/stc-manager.conf

diff --git a/data/exceptions b/res/exceptions
similarity index 100%
rename from data/exceptions
rename to res/exceptions

diff --git a/data/firewall_db.sql b/res/firewall_db.sql
similarity index 100%
rename from data/firewall_db.sql
rename to res/firewall_db.sql

diff --git a/resources/systemd/stc-manager.service b/res/systemd/stc-manager.service
similarity index 100%
rename from resources/systemd/stc-manager.service
rename to res/systemd/stc-manager.service

diff --git a/data/traffic_db.sql b/res/traffic_db.sql
similarity index 100%
rename from data/traffic_db.sql
rename to res/traffic_db.sql

diff --git a/unittest/CMakeLists.txt b/tests/CMakeLists.txt
similarity index 100%
rename from unittest/CMakeLists.txt
rename to tests/CMakeLists.txt

diff --git a/unittest/common.cpp b/tests/common.cpp
similarity index 99%
rename from unittest/common.cpp
rename to tests/common.cpp
index 3fbaf8d..0f2b8d4 100644 (file)
--- a/unittest/common.cpp
+++ b/tests/common.cpp
@@ -63,4 +63,3 @@ void MainLoop::quit(void)
 {
        timeoutCb(NULL);
 }
-

diff --git a/unittest/common.h b/tests/common.h
similarity index 100%
rename from unittest/common.h
rename to tests/common.h

diff --git a/unittest/firewall.cpp b/tests/firewall.cpp
similarity index 99%
rename from unittest/firewall.cpp
rename to tests/firewall.cpp
index 0cf9521..43f32e2 100644 (file)
--- a/unittest/firewall.cpp
+++ b/tests/firewall.cpp
@@ -536,4 +536,3 @@ error_e Firewall::Lock()
 
        return ERROR_NONE;
 }
-

diff --git a/unittest/firewall.h b/tests/firewall.h
similarity index 100%
rename from unittest/firewall.h
rename to tests/firewall.h

diff --git a/unittest/gdbus.cpp b/tests/gdbus.cpp
similarity index 100%
rename from unittest/gdbus.cpp
rename to tests/gdbus.cpp

diff --git a/unittest/gdbus.h b/tests/gdbus.h
similarity index 100%
rename from unittest/gdbus.h
rename to tests/gdbus.h

diff --git a/unittest/manager.cpp b/tests/manager.cpp
similarity index 100%
rename from unittest/manager.cpp
rename to tests/manager.cpp

diff --git a/unittest/manager.h b/tests/manager.h
similarity index 100%
rename from unittest/manager.h
rename to tests/manager.h

diff --git a/unittest/restriction.cpp b/tests/restriction.cpp
similarity index 100%
rename from unittest/restriction.cpp
rename to tests/restriction.cpp

diff --git a/unittest/restriction.h b/tests/restriction.h
similarity index 100%
rename from unittest/restriction.h
rename to tests/restriction.h

diff --git a/unittest/statistics.cpp b/tests/statistics.cpp
similarity index 99%
rename from unittest/statistics.cpp
rename to tests/statistics.cpp
index 6c80db1..de870c4 100644 (file)
--- a/unittest/statistics.cpp
+++ b/tests/statistics.cpp
@@ -153,7 +153,7 @@ void Statistics::MakeRuleParams(GVariant **params, int mode)
                break;
        case 3: /* get all */
        default:
-               *params = g_variant_new("(@a{sv})", g_variant_builder_end(builder));            
+               *params = g_variant_new("(@a{sv})", g_variant_builder_end(builder));
                break;
        }
 

diff --git a/unittest/statistics.h b/tests/statistics.h
similarity index 100%
rename from unittest/statistics.h
rename to tests/statistics.h

diff --git a/unittest/stcmgr.cpp b/tests/stcmgr.cpp
similarity index 100%
rename from unittest/stcmgr.cpp
rename to tests/stcmgr.cpp

diff --git a/unittest/stcmgr.h b/tests/stcmgr.h
similarity index 100%
rename from unittest/stcmgr.h
rename to tests/stcmgr.h

diff --git a/unittest/unittest.cpp b/tests/unittest.cpp
similarity index 100%
rename from unittest/unittest.cpp
rename to tests/unittest.cpp

diff --git a/unittest/unittest.h b/tests/unittest.h
similarity index 100%
rename from unittest/unittest.h
rename to tests/unittest.h