Merge pull request #20 from Rudloff/osx

OSX compatibility

README.md

@@ -10,7 +10,8 @@ Introduction
 
 NetHogs is a small 'net top' tool. Instead of breaking the traffic down per protocol or per subnet, like most tools do, it groups bandwidth by process. NetHogs does not rely on a special kernel module to be loaded. If there's suddenly a lot of network traffic, you can fire up NetHogs and immediately see which PID is causing this. This makes it easy to indentify programs that have gone wild and are suddenly taking up your bandwidth.
 
-Since NetHogs heavily relies on /proc, it currently runs on Linux only. 
+Since NetHogs heavily relies on /proc, some functionalities are only available on Linux.
+NetHogs can be built on Mac OS X, but it will only show connections, not processes.
 
 Status
 ------

connection.cpp

@@ -22,7 +22,11 @@
 
 #include <iostream>
 #include <cassert>
+#ifdef __APPLE__
+	#include <sys/malloc.h>
+#else
 	#include <malloc.h>
+#endif
 #include "nethogs.h"
 #include "connection.h"
 #include "process.h"

conninode.cpp

@@ -28,6 +28,12 @@
 #include "nethogs.h"
 #include "conninode.h"
 
+#if defined __APPLE__
+	#ifndef s6_addr32
+		#define s6_addr32 __u6_addr.__u6_addr32
+	#endif
+#endif
+
 extern local_addr * local_addrs;
 
 /*
@@ -179,12 +185,16 @@ void refreshconninode ()
 	//delete conninode;
 	//conninode = new HashTable (256);
 
+	#if defined(__APPLE__)
+		addprocinfo("net.inet.tcp.pcblist");
+	#else
 		if (! addprocinfo ("/proc/net/tcp"))
 		{
 			std::cout << "Error: couldn't open /proc/net/tcp\n";
 			exit(0);
 		}
 		addprocinfo ("/proc/net/tcp6");
+	#endif
 
 	//if (DEBUG)
 	//	reviewUnknown();

inode2prog.cpp

@@ -225,7 +225,9 @@ struct prg_node * findPID (unsigned long inode)
 		return node;
 	}
 
+	#ifndef __APPLE__
 		reread_mapping();
+	#endif
 
 	struct prg_node * retval = inodeproc[inode];
 	if (bughuntmode)

nethogs.cpp

@@ -128,10 +128,18 @@ int process_tcp (u_char * userdata, const dp_header * header, const u_char * m_p
 	switch (args->sa_family)
 	{
 		case (AF_INET):
+			#ifdef __APPLE__
+				packet = new Packet (args->ip_src, ntohs(tcp->th_sport), args->ip_dst, ntohs(tcp->th_dport), header->len, header->ts);
+			#else
 				packet = new Packet (args->ip_src, ntohs(tcp->source), args->ip_dst, ntohs(tcp->dest), header->len, header->ts);
+			#endif
 			break;
 		case (AF_INET6):
+			#ifdef __APPLE__
+				packet = new Packet (args->ip6_src, ntohs(tcp->th_sport), args->ip6_dst, ntohs(tcp->th_dport), header->len, header->ts);
+			#else
 				packet = new Packet (args->ip6_src, ntohs(tcp->source), args->ip6_dst, ntohs(tcp->dest), header->len, header->ts);
+			#endif
 			break;
 	}
 
@@ -162,10 +170,18 @@ int process_udp (u_char * userdata, const dp_header * header, const u_char * m_p
 	switch (args->sa_family)
 	{
 		case (AF_INET):
+			#ifdef __APPLE__
+				packet = new Packet (args->ip_src, ntohs(udp->uh_sport), args->ip_dst, ntohs(udp->uh_dport), header->len, header->ts);
+			#else
 				packet = new Packet (args->ip_src, ntohs(udp->source), args->ip_dst, ntohs(udp->dest), header->len, header->ts);
+			#endif
 			break;
 		case (AF_INET6):
+			#ifdef __APPLE__
+				packet = new Packet (args->ip6_src, ntohs(udp->uh_sport), args->ip6_dst, ntohs(udp->uh_dport), header->len, header->ts);
+			#else
 				packet = new Packet (args->ip6_src, ntohs(udp->source), args->ip6_dst, ntohs(udp->dest), header->len, header->ts);
+			#endif
 			break;
 	}
 

nethogs.h

@@ -29,7 +29,11 @@
 #include <arpa/inet.h>
 #include <cassert>
 #include <cstring>
+#ifdef __APPLE__
+	#include <sys/malloc.h>
+#else
 	#include <malloc.h>
+#endif
 #include <iostream>
 
 #define _BSD_SOURCE 1

packet.cpp

@@ -25,7 +25,11 @@
 #include "packet.h"
 #include <netinet/tcp.h>
 #include <netinet/in.h>
+#ifdef __APPLE__
+	#include <sys/malloc.h>
+#else
 	#include <malloc.h>
+#endif
 #include <cassert>
 #include <net/if.h>
 #include <net/ethernet.h>

process.cpp

@@ -24,7 +24,9 @@
 #include <strings.h>
 #include <string>
 #include <ncurses.h>
+#ifndef __APPLE__
 	#include <asm/types.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -221,7 +223,9 @@ Process * getProcess (Connection * connection, const char * devicename)
 		// is slow, making this worthwhile.
 		// We take the fact for granted that we might already know the inode->pid (unlikely anyway if we
 		// haven't seen the connection->inode yet though).
+		#ifndef __APPLE__
 			reread_mapping();
+		#endif
 		refreshconninode();
 		inode = conninode[connection->refpacket->gethashstring()];
 		if (bughuntmode)