Index: .gitignore
===================================================================
--- .gitignore	(revision 7c985f3b605a6bab44a1f850837c9133dede20ea)
+++ .gitignore	(revision a316c652c21d53db0f7c1b136950d3ccf7f99975)
@@ -1,4 +1,4 @@
-.o
-.swp
+*.o
+*.swp
 netslow
 bin/
Index: NetFlow9Processor.cpp
===================================================================
--- NetFlow9Processor.cpp	(revision 7c985f3b605a6bab44a1f850837c9133dede20ea)
+++ NetFlow9Processor.cpp	(revision a316c652c21d53db0f7c1b136950d3ccf7f99975)
@@ -14,7 +14,7 @@
 
 
-NetFlow9Processor::NetFlow9Processor(struct sockaddr *remaddr, socklen_t *addrlen) {
+NetFlow9Processor::NetFlow9Processor(struct sockaddr *remoteAddress, socklen_t *addressLength) {
 	dataTemplateCache = new NetFlowDataTemplateCache();
-	switch (remaddr->sa_family) {
+	switch (remoteAddress->sa_family) {
 		case AF_INET:
 			//set IP
Index: NetFlow9Processor.h
===================================================================
--- NetFlow9Processor.h	(revision 7c985f3b605a6bab44a1f850837c9133dede20ea)
+++ NetFlow9Processor.h	(revision a316c652c21d53db0f7c1b136950d3ccf7f99975)
@@ -15,5 +15,5 @@
 	public:
 
-		NetFlow9Processor(struct sockaddr *remaddr, socklen_t *addrlen);
+		NetFlow9Processor(struct sockaddr *remoteAddress, socklen_t *addressLength);
 		int ProcessPacket(unsigned char buffer[], int bufferLength, FlowSet* processedFlowSet);
 
Index: NetFlowDataTemplate.h
===================================================================
--- NetFlowDataTemplate.h	(revision 7c985f3b605a6bab44a1f850837c9133dede20ea)
+++ NetFlowDataTemplate.h	(revision a316c652c21d53db0f7c1b136950d3ccf7f99975)
@@ -17,5 +17,5 @@
 	std::list<Field_t> Fields;
 
-	//Constructor (id, length)
+	//Constructor (templateID, fieldCount)
 	NetFlowDataTemplate(unsigned short templateID, unsigned short fieldCount);
 	
Index: netslow.cpp
===================================================================
--- netslow.cpp	(revision 7c985f3b605a6bab44a1f850837c9133dede20ea)
+++ netslow.cpp	(revision a316c652c21d53db0f7c1b136950d3ccf7f99975)
@@ -9,17 +9,18 @@
 #include "FlowSet.h"
 
-#define BUFSIZE 2048
+//TODO: Base this on the MTU of the interface
+#define BUFSIZE 2048	/* Assuming we're using a 1500MTU */
 
 int main(int argc, char **argv) {
 
-	struct sockaddr_in myaddr;			/* our address */
-	struct sockaddr_in remaddr;			/* remote address */
-	socklen_t addrlen = sizeof(remaddr);/* length of addresses */
-	int recvlen;						/* # bytes received */
-	int fd;								/* our socket */
-	unsigned char buf[BUFSIZE];			/* receive buffer */
-	NetFlow9Processor *NetFlow9;		/* Processor do the hard work */
-	int retval;							/*Return value from processor */
-	FlowSet *processedFlowSet;
+	struct sockaddr_in localAddress;				/* Address to bind */
+	struct sockaddr_in remoteAddress;				/* Remote address */
+	socklen_t addressLength = sizeof(remoteAddress);/* Length of addresses */
+	int bytesReceived;								/* Number of bytes received */
+	int fd;											/* Our socket */
+	unsigned char buffer[BUFSIZE];					/* Receive buffer */
+	NetFlow9Processor *NetFlow9;					/* Processor do the hard work */
+	int retval;										/* Return value from processor */
+	FlowSet *processedFlowSet;						/* Returned flowset after processing */
 
 
@@ -35,17 +36,19 @@
 	//TODO: Move to CLI args for interfaces/IPs/ports
 
-	memset((char *)&myaddr, 0, sizeof(myaddr));
-	myaddr.sin_family = AF_INET;
-	myaddr.sin_addr.s_addr = htonl(INADDR_ANY);
-	myaddr.sin_port = htons(SERVICE_PORT);
+	memset((char *)&localAddress, 0, sizeof(localAddress));
+	localAddress.sin_family = AF_INET;
+	localAddress.sin_addr.s_addr = htonl(INADDR_ANY);
+	localAddress.sin_port = htons(SERVICE_PORT);
 
-	if (bind(fd, (struct sockaddr *)&myaddr, sizeof(myaddr)) < 0) {
+	if (bind(fd, (struct sockaddr *)&localAddress, sizeof(localAddress)) < 0) {
 		perror("bind failed");
 		return 0;
 	}
 
-	remaddr.sin_family = AF_INET;
-	inet_pton(AF_INET, "8.8.8.8", &(remaddr.sin_addr));
-	NetFlow9 = new NetFlow9Processor((struct sockaddr *)&remaddr, &addrlen);
+	remoteAddress.sin_family = AF_INET;
+	//TODO: Massive fudge for testing - get real IP and make array of Processors
+	//TODO: One per IP.  Also support IPv6
+	inet_pton(AF_INET, "8.8.8.8", &(remoteAddress.sin_addr));
+	NetFlow9 = new NetFlow9Processor((struct sockaddr *)&remoteAddress, &addressLength);
 
 	//NetFlow is very simple, so we can simply loop over all packets
@@ -53,13 +56,13 @@
 	for (;;) {
 //		printf("waiting on port %d\n", SERVICE_PORT);
-		recvlen = recvfrom(fd, buf, BUFSIZE, 0, (struct sockaddr *)&remaddr, &addrlen);
+		bytesReceived = recvfrom(fd, buffer, BUFSIZE, 0, (struct sockaddr *)&remoteAddress, &addressLength);
 
-		if (remaddr.sin_family != AF_INET) {
+		if (remoteAddress.sin_family != AF_INET) {
 			continue; //Ooops something wrong with this packet
 		}
 
-//		printf("received %d bytes\n", recvlen);
-		if (recvlen > 2) {
-			int version = (buf[0] << 8 ) + buf [1];
+//		printf("received %d bytes\n", bytesReceived);
+		if (bytesReceived > 2) {
+			int version = (buffer[0] << 8 ) + buffer [1];
 
 
@@ -67,6 +70,6 @@
 				case 9:
 					//NFv9
-//					printf("Len: %d...  Running NetFlow9Packet Processor\n", recvlen);
-					retval = NetFlow9->ProcessPacket(buf,recvlen,processedFlowSet);
+//					printf("Len: %d...  Running NetFlow9Packet Processor\n", bytesReceived);
+					retval = NetFlow9->ProcessPacket(buffer,bytesReceived,processedFlowSet);
 					if ( processedFlowSet == 0 ) {
 						printf("Error in NF9Processor - invalid pointer\n");