Merge branch 'freebsd' into freebsd-merge

Author: jackburton79

NetworkInterface.cpp

@@ -16,10 +16,6 @@
 #include <unistd.h>
 
 #include <arpa/inet.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <linux/ethtool.h>
-#include <linux/sockios.h>
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <netinet/in.h>
@@ -31,6 +27,7 @@
 #include <sstream>
 
 
+
 static std::string
 SpeedToString(struct ethtool_cmd* edata)
 {
@@ -109,20 +106,7 @@ NetworkInterface::Name() const
 std::string
 NetworkInterface::HardwareAddress() const
 {
-	struct ifreq ifr;
-	if (_DoRequest(SIOCGIFHWADDR, ifr) != 0)
-		return "";
-
-	struct sockaddr* addr = (struct sockaddr*)&ifr.ifr_hwaddr;
-	std::ostringstream stream;
-	for (size_t i = 0; i < ETHER_ADDR_LEN; i++) {
-		int byte = addr->sa_data[i] & 0xFF;
-		if (i != 0)
-			stream << ":";
-		stream << std::hex << std::setw(2) << std::setfill('0') << byte;
-	}
-
-	return stream.str();
+	return "";
 }
 
 
@@ -151,46 +135,21 @@ NetworkInterface::IPAddress() const
 std::string
 NetworkInterface::NetMask() const
 {
-	struct ifreq ifr;
-	if (_DoRequest(SIOCGIFNETMASK, ifr) != 0)
-		return "";
-
-	struct sockaddr_in* ipaddr = (struct sockaddr_in*)&ifr.ifr_netmask;
-	return inet_ntoa(ipaddr->sin_addr);
+	return "";
 }
 
 
 std::string
 NetworkInterface::Network() const
 {
-	struct ifreq ifrNetMask;
-	if (_DoRequest(SIOCGIFNETMASK, ifrNetMask) != 0)
-		return "";
-
-	struct ifreq ifrIpAddress;
-	if (_DoRequest(SIOCGIFADDR, ifrIpAddress) != 0)
-		return "";
-
-	struct sockaddr_in* ipAddr = (struct sockaddr_in*)&ifrIpAddress.ifr_addr;
-	struct sockaddr_in* netMask = (struct sockaddr_in*)&ifrNetMask.ifr_netmask;
-
-	struct in_addr networkAddress;
-	::memset(&networkAddress, 0, sizeof(networkAddress));
-	networkAddress.s_addr = ipAddr->sin_addr.s_addr & netMask->sin_addr.s_addr;
-
-	return inet_ntoa(networkAddress);
+	return "";
 }
 
 
 std::string
 NetworkInterface::BroadcastAddress() const
 {
-	struct ifreq ifr;
-	if (_DoRequest(SIOCGIFBRDADDR, ifr) != 0)
-		return "";
-
-	struct sockaddr_in* ipaddr = (struct sockaddr_in*)&ifr.ifr_broadaddr;
-	return inet_ntoa(ipaddr->sin_addr);
+	return "";
 }
 
 
@@ -207,16 +166,6 @@ NetworkInterface::HasDefaultGateway() const
 std::string
 NetworkInterface::DefaultGateway() const
 {
-	std::list<route_info> routeInfo;
-	if (_GetRoutes(routeInfo) <= 0)
-		return "";
-
-	std::list<route_info>::const_iterator i;
-	for (i = routeInfo.begin(); i != routeInfo.end(); i++) {
-		if (i->dstAddr.s_addr == 0)
-			return (char*)inet_ntoa(i->gateway);
-	}
-
 	return "";
 }
 
@@ -233,17 +182,7 @@ NetworkInterface::Type() const
 std::string
 NetworkInterface::Speed() const
 {
-	struct ifreq ifr;
-	struct ethtool_cmd edata;
-
-	ifr.ifr_data = (char*)&edata;
-
-	edata.cmd = ETHTOOL_GSET;
-
-	if (_DoRequest(SIOCETHTOOL, ifr) != 0)
-		return "0";
-
-    return SpeedToString(&edata);
+    return ""; 
 }
 
 
@@ -267,163 +206,30 @@ NetworkInterface::SpeedWithUnit() const
 std::string
 NetworkInterface::Status() const
 {
-	struct ifreq ifr;
-	if (_DoRequest(SIOCGIFFLAGS, ifr) != 0)
-		return "";
-
-	return (ifr.ifr_flags & IFF_UP) ? "Up" : "Down";
+	return "";
 }
 
 
 bool
 NetworkInterface::IsLoopback() const
 {
-	struct ifreq ifr;
-	if (_DoRequest(SIOCGIFFLAGS, ifr) != 0)
-		return "";
-
-	return ifr.ifr_flags & IFF_LOOPBACK;
+	return false;
 }
 
 
 int
 NetworkInterface::_DoRequest(int request, struct ifreq& ifr)  const
 {
-	size_t ifNameLen = fName.size();
-	::memcpy(ifr.ifr_name, fName.c_str(), ifNameLen);
-	ifr.ifr_name[ifNameLen] = 0;
-
-	int fd = ::socket(AF_INET, SOCK_DGRAM, 0);
-	if (fd == -1)
-		return errno;
-
 	int status = 0;
-	if (::ioctl(fd, request, &ifr) < 0)
-		status = errno;
-
-	::close(fd);
 
 	return status;
 }
 
 
-const static int kBufSize = 8192;
-
-static bool
-ParseRoutes(struct nlmsghdr* nlHdr, route_info* rtInfo,
-	const char* interfaceName)
-{
-	rtmsg* rtMsg = (rtmsg*)NLMSG_DATA(nlHdr);
-
-	// If the route is not for AF_INET or does not belong to main routing table then return.
-	if ((rtMsg->rtm_family != AF_INET) || (rtMsg->rtm_table != RT_TABLE_MAIN))
-		return false;
-
-	int rtLen = RTM_PAYLOAD(nlHdr);
-	for (rtattr* rtAttr = (rtattr*)RTM_RTA(rtMsg);
-			RTA_OK(rtAttr, rtLen);
-			rtAttr = RTA_NEXT(rtAttr, rtLen)) {
-		switch (rtAttr->rta_type) {
-			case RTA_OIF:
-				if_indextoname(*(int*)RTA_DATA(rtAttr), rtInfo->ifName);
-				break;
-			case RTA_GATEWAY:
-				rtInfo->gateway = *(in_addr*)RTA_DATA(rtAttr);
-				break;
-			case RTA_PREFSRC:
-				rtInfo->srcAddr = *(in_addr*)RTA_DATA(rtAttr);
-				break;
-			case RTA_DST:
-				rtInfo->dstAddr = *(in_addr*)RTA_DATA(rtAttr);
-				break;
-			default:
-				break;
-		}
-	}
-
-	// If the route is for a different interface, return false
-	// TODO: Check if we can filter the list beforehand
-	return ::strcmp(interfaceName, rtInfo->ifName) == 0;
-}
-
-
-static int
-ReadRouteInfoFromSocket(int sockFd, char *bufPtr, int seqNum, int pId)
-{
-	nlmsghdr* nlHdr = NULL;
-	int msgLen = 0;
-	do {
-		// Receive response from the kernel
-		int readLen = 0;
-		if ((readLen = ::recv(sockFd, bufPtr, kBufSize - msgLen, 0)) < 0)
-			return -1;
-
-		nlHdr = (nlmsghdr*)bufPtr;
-
-		// Check if the header is valid
-		if ((NLMSG_OK(nlHdr, readLen) == (int)0) ||
-				(nlHdr->nlmsg_type == NLMSG_ERROR)) {
-			return -1;
-		}
-
-		// Check if the its the last message
-		if (nlHdr->nlmsg_type == NLMSG_DONE) {
-			break;
-		} else {
-			// Else move the pointer to buffer appropriately
-			bufPtr += readLen;
-			msgLen += readLen;
-		}
-
-		// Check if its a multi part message
-		if ((nlHdr->nlmsg_flags & NLM_F_MULTI) == 0)
-			break;
-	} while(((int)nlHdr->nlmsg_seq != seqNum) || ((int)nlHdr->nlmsg_pid != pId));
-
-	return msgLen;
-}
 
 
 int
 NetworkInterface::_GetRoutes(std::list<route_info>& routeList) const
 {
-	int sock = 0;
-	if ((sock = ::socket(PF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE)) < 0)
-		return errno;
-
-	char msgBuf[kBufSize];
-	::memset(msgBuf, 0, kBufSize);
-	struct nlmsghdr* nlMsg = (struct nlmsghdr*)msgBuf;
-
-	int msgSeq = 0;
-	// Fill in the nlmsg header
-	nlMsg->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-	nlMsg->nlmsg_type = RTM_GETROUTE;
-	nlMsg->nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST;
-	nlMsg->nlmsg_seq = msgSeq++;
-	nlMsg->nlmsg_pid = getpid();
-
-	if (::send(sock, nlMsg, nlMsg->nlmsg_len, 0) < 0) {
-		::close(sock);
-		return errno;
-	}
-
-	// Read the response
-	int len = 0;
-	if ((len = ReadRouteInfoFromSocket(sock, msgBuf, msgSeq, getpid())) < 0) {
-		::close(sock);
-		return len;
-	}
-
-	// Parse and add to list
-	for (; NLMSG_OK(nlMsg, len) != (int)0; nlMsg = NLMSG_NEXT(nlMsg, len)) {
-		route_info rtInfo;
-		memset(&rtInfo, 0, sizeof(rtInfo));
-		if (ParseRoutes(nlMsg, &rtInfo, Name().c_str()))
-			routeList.push_back(rtInfo);
-	}
-
-	::close(sock);
-
-	return routeList.size();
+	return 0;	
 }

NetworkRoster.h

@@ -9,7 +9,7 @@
 #define NETWORKROSTER_H_
 
 #include <netinet/in.h>
-#include <net/route.h>
+//#include <net/route.h>
 #include <string>
 #include <vector>
 
@@ -19,7 +19,7 @@ class NetworkRoster {
 	NetworkRoster();
 	~NetworkRoster();
 
-	int CountInterfaces(int family = AF_INET);
+	int CountInterfaces(int family);
 	int GetNextInterface(unsigned int* cookie, NetworkInterface& interface);
 
 private:

Support.cpp

@@ -127,7 +127,7 @@ CommandExists(const char* command)
 	int result = -1;
 	int systemStatus = ::system(fullCommand.c_str());
 	if (systemStatus == 0)
-		result = WEXITSTATUS(systemStatus);
+		result = 0;
 
 	return result == 0;
 }

backends/UnameBackend.cpp

@@ -41,7 +41,7 @@ UnameBackend::Run()
 	osInfo.fields["hostname"] = uName.nodename;
 	osInfo.fields["comments"] = uName.version;
 	osInfo.fields["release"] = uName.release;
-	osInfo.fields["domainname"] = uName.domainname;
+	//osInfo.fields["domainname"] = uName.domainname;
 	osInfo.fields["architecture"] = uName.machine;
 	osInfo.fields["kernelname"] = uName.sysname;