Changeset 8569

Timestamp:

Sep 21, 2010, 3:57:26 PM (14 years ago)

Author:

Christoph Mayer

Message:

 

Files:

• configure.ac (modified) (1 diff)
• docu/doxygen/Doxyfile (modified) (1 diff)
• source/ariba/communication/networkinfo/NetworkChangeDetection.cpp (modified) (4 diffs)
• source/ariba/communication/networkinfo/NetworkChangeDetection.h (modified) (1 diff)
• source/ariba/communication/networkinfo/NetworkChangeInterface.h (modified) (1 diff)

configure.ac

@@ -1 @@
-AC_INIT([ariba], [0.4.0], [http://www.ariba-underlay.org])
+AC_INIT([ariba], [0.5.0], [http://www.ariba-underlay.org])
 AM_INIT_AUTOMAKE([-Wall foreign])
 AC_CONFIG_SRCDIR([source/ariba/ariba.h])

docu/doxygen/Doxyfile

@@ -6 +6 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = Ariba
-PROJECT_NUMBER         = 0.4.0
+PROJECT_NUMBER         = 0.5.0
 OUTPUT_DIRECTORY       = ./
 CREATE_SUBDIRS         = NO

source/ariba/communication/networkinfo/NetworkChangeDetection.cpp

@@ -196 +196 @@
                         }
 
+                        // somehow all notifications with pid=0 are
+                        // invalid and occur much too often
+                        if(header->nlmsg_pid == 0) continue;
+
                         //
                         // here we evaluate the routing netlink message. for, the following
                         // messages are of interest:
-                        //      RTM_NEWLINK, RTM_DELLINK -> interface up/down
                         //      RTM_NEWADDR, RTM_DELADDR -> new address on iface, address deleted from iface
-                        // not interesting are:
-                        //      RTM_GETLINK, RTM_GETADDR
-                        //      RTM_NEWROUTE, RTM_DELROUTE, RTM_GETROUTE
                         //
 
@@ -209 +209 @@
 
                         switch( header->nlmsg_type ){
-
-                                //
-                                // handle network interface up/down notifications
-                                // --> link layer notifications
-                                //
-
-                                case RTM_NEWLINK:
-                                case RTM_DELLINK:
-
-                                        changeInfo = obj->extractInterfaceEvent( header );
-                                        break;
 
                                 //
@@ -257 +246 @@
 }
 
-NetworkChangeInterface::NetworkChangeInfo NetworkChangeDetection::extractInterfaceEvent(struct nlmsghdr* header){
-        NetworkChangeInterface::NetworkChangeInfo changeInfo;
-
-        //
-        // handle network interface up/down notifications
-        // the differentiation between up/down is _not_
-        // made using new/del-link in the message!
-        //
-
-        if( header->nlmsg_type == RTM_NEWLINK ){
-                logging_debug("network change message RTM_NEWLINK");
-        }else if( header->nlmsg_type == RTM_DELLINK ){
-                logging_debug("network change message RTM_DELLINK");
-        }
-
-        if( header->nlmsg_len < NLMSG_LENGTH(sizeof(struct ifinfomsg)) ){
-                logging_error( "netlink packet soo small for ifinfomsg" );
-                return changeInfo;
-        }
-
-        //
-        // get the interface index and through this
-        // further information about the interface
-        //
-
-        struct ifinfomsg* detailIface = (struct ifinfomsg*)NLMSG_DATA(header);
-        changeInfo.interface = networkInformation.getInterface( detailIface->ifi_index );
-
-        //
-        // check whether device is now up or down
-        //
-
-        if( changeInfo.interface.isUp && changeInfo.interface.isRunning )
-                changeInfo.type = NetworkChangeInterface::EventTypeInterfaceUp;
-        else
-                changeInfo.type = NetworkChangeInterface::EventTypeInterfaceDown;
-
-
-        return changeInfo;
-}
-
 NetworkChangeInterface::NetworkChangeInfo NetworkChangeDetection::extractAddressEvent(struct nlmsghdr* header){
         NetworkChangeInterface::NetworkChangeInfo changeInfo;
@@ -308 +256 @@
         if( header->nlmsg_type == RTM_NEWADDR ){
                 logging_debug("network change message RTM_NEWADDR");
-                changeInfo.type = NetworkChangeInterface::EventTypeAddressNew;
+                changeInfo.type = NetworkChangeInterface::EventTypeInterfaceUp;
         }else if( header->nlmsg_type == RTM_DELADDR ){
                 logging_debug("network change message RTM_DELADDR");
-                changeInfo.type = NetworkChangeInterface::EventTypeAddressDelete;
+                changeInfo.type = NetworkChangeInterface::EventTypeInterfaceDown;
         }
 

source/ariba/communication/networkinfo/NetworkChangeDetection.h

@@ -100 +100 @@
         NetworkInformation networkInformation;
 
-        NetworkChangeInterface::NetworkChangeInfo extractInterfaceEvent( struct nlmsghdr* header );
         NetworkChangeInterface::NetworkChangeInfo extractAddressEvent( struct nlmsghdr* header );
 };

source/ariba/communication/networkinfo/NetworkChangeInterface.h

@@ -55 +55 @@
 
         typedef enum _EventType {
-                EventTypeInvalid,               // INVALID
+                EventTypeInvalid,                       // INVALID
                 EventTypeInterfaceUp,           // network interface came up
                 EventTypeInterfaceDown,         // network interface went down
-                EventTypeAddressNew,            // new network address configured
-                EventTypeAddressDelete,         // network address deleted
         } EventType;
 
         static string eventString(EventType ev){
                 switch( ev ){
-                        case EventTypeInvalid:          return "invalid type";
-                        case EventTypeInterfaceUp:      return "interface up";
+                        case EventTypeInvalid:                  return "invalid type";
+                        case EventTypeInterfaceUp:              return "interface up";
                         case EventTypeInterfaceDown:    return "interface down";
-                        case EventTypeAddressNew:       return "new address";
-                        case EventTypeAddressDelete:    return "deleted address";
-                        default:                        return "unknown event";
+                        default:                                                return "unknown event";
                 }
         }