#include "NetlinkHandler.h"
#include "NetlinkManager.h"
#include "ResponseCode.h"
+#include "SockDiag.h"
static const char *kUpdated = "updated";
static const char *kRemoved = "removed";
const char *flags = evt->findParam("FLAGS");
const char *scope = evt->findParam("SCOPE");
if (action == NetlinkEvent::Action::kAddressRemoved && iface && address) {
- int resetMask = strchr(address, ':') ? RESET_IPV6_ADDRESSES : RESET_IPV4_ADDRESSES;
- resetMask |= RESET_IGNORE_INTERFACE_ADDRESS;
- if (int ret = ifc_reset_connections(iface, resetMask)) {
- ALOGE("ifc_reset_connections failed on iface %s for address %s (%s)", iface,
- address, strerror(ret));
+ // Note: if this interface was deleted, iface is "" and we don't notify.
+ SockDiag sd;
+ if (sd.open()) {
+ char addrstr[INET6_ADDRSTRLEN];
+ strncpy(addrstr, address, sizeof(addrstr));
+ char *slash = strchr(addrstr, '/');
+ if (slash) {
+ *slash = '\0';
+ }
+
+ int ret = sd.destroySockets(addrstr);
+ if (ret < 0) {
+ ALOGE("Error destroying sockets: %s", strerror(ret));
+ }
+ } else {
+ ALOGE("Error opening NETLINK_SOCK_DIAG socket: %s", strerror(errno));
}
}
- if (iface && flags && scope) {
+ if (iface && iface[0] && address && flags && scope) {
notifyAddressChanged(action, address, iface, flags, scope);
}
} else if (action == NetlinkEvent::Action::kRdnss) {
const char *label = evt->findParam("INTERFACE");
const char *state = evt->findParam("STATE");
const char *timestamp = evt->findParam("TIME_NS");
+ const char *uid = evt->findParam("UID");
if (state)
- notifyInterfaceClassActivity(label, !strcmp("active", state), timestamp);
+ notifyInterfaceClassActivity(label, !strcmp("active", state),
+ timestamp, uid);
#if !LOG_NDEBUG
} else if (strcmp(subsys, "platform") && strcmp(subsys, "backlight")) {
}
void NetlinkHandler::notifyInterfaceClassActivity(const char *name,
- bool isActive, const char *timestamp) {
+ bool isActive,
+ const char *timestamp,
+ const char *uid) {
if (timestamp == NULL)
notify(ResponseCode::InterfaceClassActivity,
"IfaceClass %s %s", isActive ? "active" : "idle", name);
+ else if (uid != NULL && isActive)
+ notify(ResponseCode::InterfaceClassActivity,
+ "IfaceClass active %s %s %s", name, timestamp, uid);
else
notify(ResponseCode::InterfaceClassActivity,
"IfaceClass %s %s %s", isActive ? "active" : "idle", name, timestamp);