Add TcpAddress class and use it handle ip/port of src and dest

Author: mkochenough

src/commparty.cc

@@ -3,9 +3,9 @@
 #endif /* HAVE_CONFIG_H */
 
 #include "commparty.h"
+#include "tcp.h"
 #include "websocket.h"
 
-#include <arpa/inet.h>
 #include <map>
 
 CommunicationParty::CommunicationParty() : mName(""), mIpAddress("") {
@@ -67,8 +67,8 @@ CommunicationPartyManager::getParty(string ipAddress) {
 }
 
 CommunicationParty*
-CommunicationPartyManager::getParty(const struct in_addr& addr) {
-  string localHostname = inet_ntoa((struct in_addr) addr);
+CommunicationPartyManager::getParty(const TcpAddress& addr) {
+  string localHostname = addr.getHostname();
   CommunicationParty* party = CommunicationPartyManager::getParty(localHostname);
   return party;
 }

src/commparty.h

@@ -7,6 +7,8 @@
 
 using namespace std;
 
+class TcpAddress;
+
 class CommunicationParty {
  public:
   CommunicationParty();
@@ -35,7 +37,7 @@ class CommunicationPartyManager {
   static void cleanup();
 
   static CommunicationParty* getParty(string ipAddress);
-  static CommunicationParty* getParty(const struct in_addr& addr);
+  static CommunicationParty* getParty(const TcpAddress& addr);
 };
 
 #endif /* __COMMUNICATION_PARTY_H__ */

src/main.cc

@@ -233,14 +233,15 @@ void handleTcpPacket(struct timeval tv, const RawIpPacket* ip, const RawTcpPacke
 
   bool isIncoming = isIncomingIpPacket(ip);
   const char* tcpData = ((const char*) tcp) + tcp->th_off * 4;
-  const struct in_addr ipAddr = isIncoming ? ip->ip_dst : ip->ip_src;
-  CommunicationParty* party = CommunicationPartyManager::getParty(ipAddr);
+  TcpAddress src(ip->ip_src, ntohs(tcp->th_sport));
+  TcpAddress dest(ip->ip_dst, ntohs(tcp->th_dport));
+  CommunicationParty* party = CommunicationPartyManager::getParty(isIncoming ? dest : src);
   string partyName = party->getName();
 
-  if (isWebSocketPort(ntohs(tcp->th_sport)) || isWebSocketPort(ntohs(tcp->th_dport))) {
+  if (isWebSocketPort(src.getPort()) || isWebSocketPort(dest.getPort())) {
     WebSocketParser* parser = isIncoming ? party->getWebSocketParserIncoming() : party->getWebSocketParserOutgoing();
     handleWebsocketNotification(partyName, isIncoming, tv, parser, tcpData, tcpDataLen);
-  } else if (isHttpPort(ntohs(tcp->th_sport)) || isHttpPort(ntohs(tcp->th_dport))){
+  } else if (isHttpPort(src.getPort()) || isHttpPort(dest.getPort())) {
     printPacketInfo(partyName, isIncoming, tv);
 
     if (isIncoming) {

src/tcp.cc

@@ -4,6 +4,8 @@
 
 #include "tcp.h"
 
+#include <arpa/inet.h>
+
 IPv4::IPv4(const struct in_addr& addr) {
   mAddress = (const struct in_addr) addr;
 }
@@ -38,3 +40,22 @@ Netmask::matches(const IPv4& ip) const {
   uint32_t networkPacket = ntohl(ip.getAddress().s_addr) & mask;
   return networkFilter == networkPacket;
 }
+
+TcpAddress::TcpAddress(const struct in_addr& addr, unsigned short port) {
+  string hostname = inet_ntoa((struct in_addr) addr);
+  mHostname = hostname;
+  mPort = port;
+}
+
+TcpAddress::~TcpAddress() {
+}
+
+string
+TcpAddress::getHostname() const {
+  return mHostname;
+}
+
+unsigned short
+TcpAddress::getPort() const {
+  return mPort;
+}

src/tcp.h

@@ -3,6 +3,11 @@
 
 #include <netinet/in.h>
 
+#include <list>
+#include <string>
+
+using namespace std;
+
 typedef u_int32_t tcp_seq;
 
 struct nread_ip {
@@ -54,6 +59,8 @@ typedef struct ether_header RawEtherPacket;
 typedef struct nread_ip RawIpPacket;
 typedef struct nread_tcp RawTcpPacket;
 
+class Buffer;
+
 class IPv4 {
  public:
   IPv4(const struct in_addr& addr);
@@ -79,4 +86,17 @@ class Netmask {
   unsigned short mNetbits;
 };
 
+class TcpAddress {
+ public:
+  TcpAddress(const struct in_addr& addr, unsigned short port);
+  virtual ~TcpAddress();
+
+  string getHostname() const;
+  unsigned short getPort() const;
+
+ private:
+  string mHostname;
+  unsigned short mPort;
+};
+
 #endif /* __TCP_H__ */