Changeset 10767

Timestamp:

Oct 15, 2012, 7:17:04 PM (12 years ago)

Author:

Michael Tänzer

Message:

Clean up NetworkChangeDetection

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (2 diffs)
• networkinfo/NetworkChangeDetection.cpp (modified) (4 diffs)
• networkinfo/NetworkChangeDetection.h (modified) (2 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -41 +41 @@
 #include "networkinfo/AddressDiscovery.h"
 #include "ariba/utility/types/PeerID.h"
+#include "ariba/utility/system/SystemQueue.h"
 #include <boost/function.hpp>
 
@@ -57 +58 @@
 
 using ariba::utility::PeerID;
+using ariba::utility::SystemQueue;
 
 use_logging_cpp(BaseCommunication);

source/ariba/communication/networkinfo/NetworkChangeDetection.cpp

@@ -38 +38 @@
 
 #include "NetworkChangeDetection.h"
+
+#include <string>
+#include <algorithm>
+#include <cerrno>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <boost/bind.hpp>
+#include <sys/socket.h>
+
+extern "C" {
+        #include <linux/netlink.h>
+        #include <linux/rtnetlink.h>
+}
+
+#include "ariba/utility/system/SystemQueue.h"
+
+using std::find;
+using ariba::utility::SystemQueue;
+using ariba::utility::SystemEventType;
 
 namespace ariba {
@@ -123 +143 @@
         if( obj->routingSocket < 0 ){
                 logging_error("could not connect to routing socket: " +
-                                        string(strerror(errno)));
+                                        std::string(strerror(errno)));
                 return;
         }
@@ -155 +175 @@
         if( ret < 0 ){
                 close( obj->routingSocket );
-                logging_error( "could not bind routing socket: " + string(strerror(errno)) );
+                logging_error( "could not bind routing socket: " + std::string(strerror(errno)) );
                 return;
         }
@@ -185 +205 @@
                         // all others are some kind of error
                         logging_error( "could not read from routing socket: " +
-                                                        string(strerror(errno)) );
+                                                        std::string(strerror(errno)) );
                         break;
                 }

source/ariba/communication/networkinfo/NetworkChangeDetection.h

@@ -40 +40 @@
 #define __NETWORK_CHANGE_DETECTION_H
 
-#include <cerrno>
-#include <csignal>
+// Forward declarations
+struct nlmsghdr;
+
 #include <vector>
-#include <algorithm>
-#include <string>
-#include <net/if.h>
-#include <arpa/inet.h>
-#include <linux/types.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/utility.hpp>
-#include <boost/bind.hpp>
-#include "ariba/communication/networkinfo/NetworkChangeInterface.h"
-#include "ariba/communication/networkinfo/NetworkInformation.h"
-#include "ariba/utility/system/SystemQueue.h"
+
+#include "NetworkInformation.h"
+#include "NetworkChangeInterface.h"
 #include "ariba/utility/logging/Logging.h"
-
-using std::string;
-using std::vector;
-using std::find;
-using ariba::utility::SystemQueue;
-using ariba::utility::SystemEvent;
-using ariba::utility::SystemEventType;
-using ariba::utility::SystemEventListener;
-using ariba::communication::NetworkInformation;
+#include "ariba/utility/system/SystemEventListener.h"
 
 namespace ariba {
 namespace communication {
+
+using ariba::utility::SystemEvent;
+using ariba::utility::SystemEventListener;
 
 class NetworkChangeDetection : public SystemEventListener {
@@ -87 +70 @@
 
 private:
-        typedef vector<NetworkChangeInterface*> RegistrationList;
+        typedef std::vector<NetworkChangeInterface*> RegistrationList;
         RegistrationList registrations;