From 5ee7124e531788b0ea95f7b28675dc431063a2a9 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 28 Mar 2010 20:43:15 +0000
Subject: [PATCH] luci-0.9: merge r5978

---
 libs/nixio/src/address.c | 74 +++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 32 deletions(-)

diff --git a/libs/nixio/src/address.c b/libs/nixio/src/address.c
index 41c6b8ae8..eff05e3a0 100644
--- a/libs/nixio/src/address.c
+++ b/libs/nixio/src/address.c
@@ -391,9 +391,11 @@ static int nixio_getifaddrs(lua_State *L) {
 			lua_setfield(L, -2, "multicast");
 		lua_setfield(L, -2, "flags");
 
-		if (c->ifa_addr && !nixio__addr_parse(&addr, c->ifa_addr)) {
-			lua_pushstring(L, addr.host);
-			lua_setfield(L, -2, "addr");
+		if (c->ifa_addr) {
+			if (!nixio__addr_parse(&addr, c->ifa_addr)) {
+				lua_pushstring(L, addr.host);
+				lua_setfield(L, -2, "addr");
+			}
 
 			if (c->ifa_addr->sa_family == AF_INET) {
 				lua_pushliteral(L, "inet");
@@ -415,47 +417,55 @@ static int nixio_getifaddrs(lua_State *L) {
 
 				lua_pushinteger(L, addr.prefix);
 				lua_setfield(L, -2, "hatype");
+			}
+#endif
+		}
 
-				if (c->ifa_data) {
-					lua_createtable(L, 0, 10);
-					struct nixio__nds *stats = c->ifa_data;
+#ifdef __linux__
+		if (c->ifa_data && (!c->ifa_addr
+							|| c->ifa_addr->sa_family == AF_PACKET)) {
+			if (!c->ifa_addr) {
+				lua_pushliteral(L, "packet");
+				lua_setfield(L, -2, "family");
+			}
 
-					lua_pushnumber(L, stats->rx_packets);
-					lua_setfield(L, -2, "rx_packets");
+			lua_createtable(L, 0, 10);
+			struct nixio__nds *stats = c->ifa_data;
 
-					lua_pushnumber(L, stats->tx_packets);
-					lua_setfield(L, -2, "tx_packets");
+			lua_pushnumber(L, stats->rx_packets);
+			lua_setfield(L, -2, "rx_packets");
 
-					lua_pushnumber(L, stats->rx_bytes);
-					lua_setfield(L, -2, "rx_bytes");
+			lua_pushnumber(L, stats->tx_packets);
+			lua_setfield(L, -2, "tx_packets");
 
-					lua_pushnumber(L, stats->tx_bytes);
-					lua_setfield(L, -2, "tx_bytes");
+			lua_pushnumber(L, stats->rx_bytes);
+			lua_setfield(L, -2, "rx_bytes");
 
-					lua_pushnumber(L, stats->rx_errors);
-					lua_setfield(L, -2, "rx_errors");
+			lua_pushnumber(L, stats->tx_bytes);
+			lua_setfield(L, -2, "tx_bytes");
 
-					lua_pushnumber(L, stats->tx_errors);
-					lua_setfield(L, -2, "tx_errors");
+			lua_pushnumber(L, stats->rx_errors);
+			lua_setfield(L, -2, "rx_errors");
 
-					lua_pushnumber(L, stats->rx_dropped);
-					lua_setfield(L, -2, "rx_dropped");
+			lua_pushnumber(L, stats->tx_errors);
+			lua_setfield(L, -2, "tx_errors");
 
-					lua_pushnumber(L, stats->tx_dropped);
-					lua_setfield(L, -2, "tx_dropped");
+			lua_pushnumber(L, stats->rx_dropped);
+			lua_setfield(L, -2, "rx_dropped");
 
-					lua_pushnumber(L, stats->multicast);
-					lua_setfield(L, -2, "multicast");
+			lua_pushnumber(L, stats->tx_dropped);
+			lua_setfield(L, -2, "tx_dropped");
 
-					lua_pushnumber(L, stats->collisions);
-					lua_setfield(L, -2, "collisions");
-				} else {
-					lua_newtable(L);
-				}
-				lua_setfield(L, -2, "data");
-			}
-#endif
+			lua_pushnumber(L, stats->multicast);
+			lua_setfield(L, -2, "multicast");
+
+			lua_pushnumber(L, stats->collisions);
+			lua_setfield(L, -2, "collisions");
+		} else {
+			lua_newtable(L);
 		}
+		lua_setfield(L, -2, "data");
+#endif
 
 		if (c->ifa_netmask && !nixio__addr_parse(&addr, c->ifa_netmask)) {
 			lua_pushstring(L, addr.host);
-- 
2.25.1