commit 19fb0c4e5ec6a10473666a2d45267fbc8305ba85
author Wink Saville <wink@google.com> Sun Jan 09 12:21:40 2011 -0800
committer Wink Saville <wink@google.com> Sun Jan 09 12:21:40 2011 -0800
tree 3b58bdc878852c2765241c5b844f9e40a794d39b
parent f6a7ad814dca2f67907eaed2cc0609c684850969

Revert "Add NETLINK_ROUTE socket creation and event propagation"

This reverts commit f6a7ad814dca2f67907eaed2cc0609c684850969.

NetlinkHandler.cpp

diff --git a/NetlinkHandler.cpp b/NetlinkHandler.cpp
index 0632293..800c86c 100644
--- a/NetlinkHandler.cpp
+++ b/NetlinkHandler.cpp
@@ -28,9 +28,8 @@
 #include "NetlinkManager.h"
 #include "ResponseCode.h"
 
-NetlinkHandler::NetlinkHandler(NetlinkManager *nm, int listenerSocket,
-                               int format) :
-                        NetlinkListener(listenerSocket, format) {
+NetlinkHandler::NetlinkHandler(NetlinkManager *nm, int listenerSocket) :
+                NetlinkListener(listenerSocket) {
     mNm = nm;
 }
 
@@ -51,22 +50,18 @@
         LOGW("No subsystem found in netlink event");
         return;
     }
-
     if (!strcmp(subsys, "net")) {
         int action = evt->getAction();
-        const char *iface = evt->findParam("INTERFACE");
-
         if (action == evt->NlActionAdd) {
+            const char *iface = evt->findParam("INTERFACE");
             notifyInterfaceAdded(iface);
         } else if (action == evt->NlActionRemove) {
+            const char *iface = evt->findParam("INTERFACE");
             notifyInterfaceRemoved(iface);
         } else if (action == evt->NlActionChange) {
             evt->dump();
+            const char *iface = evt->findParam("INTERFACE");
             notifyInterfaceChanged("nana", true);
-        } else if (action == evt->NlActionLinkUp) {
-            notifyInterfaceLinkChanged(iface, true);
-        } else if (action == evt->NlActionLinkDown) {
-            notifyInterfaceLinkChanged(iface, false);
         }
     }
 }
@@ -89,17 +84,7 @@
 
 void NetlinkHandler::notifyInterfaceChanged(const char *name, bool isUp) {
     char msg[255];
-    snprintf(msg, sizeof(msg), "Iface changed %s %s", name,
-             (isUp ? "up" : "down"));
-
-    mNm->getBroadcaster()->sendBroadcast(ResponseCode::InterfaceChange,
-            msg, false);
-}
-
-void NetlinkHandler::notifyInterfaceLinkChanged(const char *name, bool isUp) {
-    char msg[255];
-    snprintf(msg, sizeof(msg), "Iface linkstatus %s %s", name,
-             (isUp ? "up" : "down"));
+    snprintf(msg, sizeof(msg), "Iface is %s %s", (isUp ? "up" : "down"), name);
 
     mNm->getBroadcaster()->sendBroadcast(ResponseCode::InterfaceChange,
             msg, false);