Renamed packages to more appropriate names

- ping to host, because it contains classes to deal with host
- notify to link, contains classes that deal with many hosts, on link basis

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 13ee4d3..079cfa7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,6 +24,9 @@ set(SOURCES
     config/host.cpp
     dns/dnsresolver.cpp
     dns/hostaddress.cpp
+    host/boostpinger.cpp
+    host/hoststatusanalyzer.cpp
+    host/pingscheduler.cpp
     icmp/icmpdestinationunreachablemessage.cpp
     icmp/icmpechoreplymessage.cpp
     icmp/icmpechorequestmessage.cpp
@@ -33,11 +36,8 @@ set(SOURCES
     icmp/icmpheader.cpp
     icmp/icmppacket.cpp
     icmp/ipv4header.cpp
-    notify/linkstatusanalyzer.cpp
-    notify/statusnotifiercommand.cpp
-    ping/boostpinger.cpp
-    ping/hoststatusanalyzer.cpp
-    ping/pingscheduler.cpp
+    link/linkstatusanalyzer.cpp
+    link/statusnotifiercommand.cpp
     main.cpp
 )
 

diff --git a/src/ping/boostpinger.cpp b/src/host/boostpinger.cpp
similarity index 99%
rename from src/ping/boostpinger.cpp
rename to src/host/boostpinger.cpp
index e013019..2d35a98 100644 (file)
--- a/src/ping/boostpinger.cpp
+++ b/src/host/boostpinger.cpp
@@ -1,4 +1,4 @@
-#include "ping/boostpinger.h"
+#include "host/boostpinger.h"
 
 #include <iostream>
 #include <istream>

diff --git a/src/ping/boostpinger.h b/src/host/boostpinger.h
similarity index 100%
rename from src/ping/boostpinger.h
rename to src/host/boostpinger.h

diff --git a/src/ping/hoststatusanalyzer.cpp b/src/host/hoststatusanalyzer.cpp
similarity index 99%
rename from src/ping/hoststatusanalyzer.cpp
rename to src/host/hoststatusanalyzer.cpp
index ca9f683..860df20 100644 (file)
--- a/src/ping/hoststatusanalyzer.cpp
+++ b/src/host/hoststatusanalyzer.cpp
@@ -1,4 +1,4 @@
-#include "ping/hoststatusanalyzer.h"
+#include "host/hoststatusanalyzer.h"
 
 #include <iostream>
 

diff --git a/src/ping/hoststatusanalyzer.h b/src/host/hoststatusanalyzer.h
similarity index 97%
rename from src/ping/hoststatusanalyzer.h
rename to src/host/hoststatusanalyzer.h
index b215319..0283cb5 100644 (file)
--- a/src/ping/hoststatusanalyzer.h
+++ b/src/host/hoststatusanalyzer.h
@@ -5,7 +5,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "notify/linkstatusanalyzer.h"
+#include "link/linkstatusanalyzer.h"
 
 //-----------------------------------------------------------------------------
 // HostStatusAnalyzer

diff --git a/src/ping/pinginterval.h b/src/host/pinginterval.h
similarity index 100%
rename from src/ping/pinginterval.h
rename to src/host/pinginterval.h

diff --git a/src/ping/pingscheduler.cpp b/src/host/pingscheduler.cpp
similarity index 97%
rename from src/ping/pingscheduler.cpp
rename to src/host/pingscheduler.cpp
index ce3bed1..2b972d4 100644 (file)
--- a/src/ping/pingscheduler.cpp
+++ b/src/host/pingscheduler.cpp
@@ -1,12 +1,12 @@
-#include "ping/pingscheduler.h"
+#include "host/pingscheduler.h"
 
 #include <iostream>
 
 #include <boost/bind.hpp>
 
 #include "dns/dnsresolver.h"
-#include "notify/linkstatusanalyzer.h"
-#include "ping/boostpinger.h"
+#include "link/linkstatusanalyzer.h"
+#include "host/boostpinger.h"
 
 using namespace std;
 using namespace boost;

diff --git a/src/ping/pingscheduler.h b/src/host/pingscheduler.h
similarity index 94%
rename from src/ping/pingscheduler.h
rename to src/host/pingscheduler.h
index 701bb9e..776a3c9 100644 (file)
--- a/src/ping/pingscheduler.h
+++ b/src/host/pingscheduler.h
@@ -7,9 +7,9 @@
 #include <boost/shared_ptr.hpp>
 
 #include "dns/dnsresolver.h"
-#include "notify/linkstatusanalyzer.h"
-#include "ping/hoststatusanalyzer.h"
-#include "ping/pinginterval.h"
+#include "link/linkstatusanalyzer.h"
+#include "host/hoststatusanalyzer.h"
+#include "host/pinginterval.h"
 
 //-----------------------------------------------------------------------------
 // PingScheduler

diff --git a/src/notify/linkstatusanalyzer.cpp b/src/link/linkstatusanalyzer.cpp
similarity index 99%
rename from src/notify/linkstatusanalyzer.cpp
rename to src/link/linkstatusanalyzer.cpp
index 561f5d4..0dcb3a7 100644 (file)
--- a/src/notify/linkstatusanalyzer.cpp
+++ b/src/link/linkstatusanalyzer.cpp
@@ -1,4 +1,4 @@
-#include "notify/linkstatusanalyzer.h"
+#include "link/linkstatusanalyzer.h"
 
 #include <iostream>
 

diff --git a/src/notify/linkstatusanalyzer.h b/src/link/linkstatusanalyzer.h
similarity index 98%
rename from src/notify/linkstatusanalyzer.h
rename to src/link/linkstatusanalyzer.h
index 5dedceb..a80f774 100644 (file)
--- a/src/notify/linkstatusanalyzer.h
+++ b/src/link/linkstatusanalyzer.h
@@ -6,7 +6,7 @@
 
 #include <boost/asio.hpp>
 
-#include "notify/statusnotifiercommand.h"
+#include "link/statusnotifiercommand.h"
 
 //-----------------------------------------------------------------------------
 // LinkStatusAnalyzer

diff --git a/src/notify/statusnotifiercommand.cpp b/src/link/statusnotifiercommand.cpp
similarity index 98%
rename from src/notify/statusnotifiercommand.cpp
rename to src/link/statusnotifiercommand.cpp
index dfd5898..e1c2bfd 100644 (file)
--- a/src/notify/statusnotifiercommand.cpp
+++ b/src/link/statusnotifiercommand.cpp
@@ -1,4 +1,4 @@
-#include "notify/statusnotifiercommand.h"
+#include "link/statusnotifiercommand.h"
 
 #include <cstdlib>
 

diff --git a/src/notify/statusnotifiercommand.h b/src/link/statusnotifiercommand.h
similarity index 100%
rename from src/notify/statusnotifiercommand.h
rename to src/link/statusnotifiercommand.h

diff --git a/src/main.cpp b/src/main.cpp
index 6833ad2..37b0299 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,8 +7,8 @@
 
 #include "config/configurationreader.h"
 #include "config/host.h"
-#include "notify/linkstatusanalyzer.h"
-#include "ping/pingscheduler.h"
+#include "link/linkstatusanalyzer.h"
+#include "host/pingscheduler.h"
 
 using namespace std;
 using namespace boost;