Use pointers again

Author: mkochenough

src/commparty.cc

@@ -32,43 +32,54 @@ CommunicationParty::getIpAddress() {
   return mIpAddress;
 }
 
-WebSocketParser&
+WebSocketParser*
 CommunicationParty::getWebSocketParserIncoming() {
-  return mWsIncoming;
+  return &mWsIncoming;
 }
 
-WebSocketParser&
+WebSocketParser*
 CommunicationParty::getWebSocketParserOutgoing() {
-  return mWsOutgoing;
+  return &mWsOutgoing;
 }
 
-static map<string, CommunicationParty> parties;
+static map<string, CommunicationParty*> parties;
 
-CommunicationParty
+CommunicationParty*
 CommunicationParty::newParty(string ipAddress) {
   string name;
   name = 'A' + parties.size();
 
-  CommunicationParty party(name, ipAddress);
+  CommunicationParty* party = new CommunicationParty(name, ipAddress);
   return party;
 }
 
-CommunicationParty
+CommunicationParty*
 CommunicationPartyManager::getParty(string ipAddress) {
-  map<string, CommunicationParty>::iterator it = parties.find(ipAddress);
+  map<string, CommunicationParty*>::iterator it = parties.find(ipAddress);
 
   if (it != parties.end()) {
     return it->second;
   }
 
-  CommunicationParty party = CommunicationParty::newParty(ipAddress);
+  CommunicationParty* party = CommunicationParty::newParty(ipAddress);
   parties[ipAddress] = party;
   return party;
 }
 
-CommunicationParty
+CommunicationParty*
 CommunicationPartyManager::getParty(const struct in_addr& addr) {
   string localHostname = inet_ntoa((struct in_addr) addr);
-  CommunicationParty party = CommunicationPartyManager::getParty(localHostname);
+  CommunicationParty* party = CommunicationPartyManager::getParty(localHostname);
   return party;
 }
+
+void
+CommunicationPartyManager::cleanup() {
+  map<string, CommunicationParty*>::iterator it;
+
+  for (it = parties.begin(); it != parties.end(); ++it) {
+    delete it->second;
+  }
+
+  parties.clear();
+}

src/commparty.h

@@ -18,10 +18,10 @@ class CommunicationParty {
 
   string getIpAddress();
 
-  WebSocketParser& getWebSocketParserIncoming();
-  WebSocketParser& getWebSocketParserOutgoing();
+  WebSocketParser* getWebSocketParserIncoming();
+  WebSocketParser* getWebSocketParserOutgoing();
 
-  static CommunicationParty newParty(string ipAddress);
+  static CommunicationParty* newParty(string ipAddress);
 
  private:
   string mName;
@@ -32,8 +32,10 @@ class CommunicationParty {
 
 class CommunicationPartyManager {
  public:
-  static CommunicationParty getParty(string ipAddress);
-  static CommunicationParty getParty(const struct in_addr& addr);
+  static void cleanup();
+
+  static CommunicationParty* getParty(string ipAddress);
+  static CommunicationParty* getParty(const struct in_addr& addr);
 };
 
 #endif /* __COMMUNICATION_PARTY_H__ */

src/main.cc

@@ -175,11 +175,11 @@ void printPacketInfo(string partyName, bool isIncoming, struct timeval tv) {
   printTimestamp(tv);
 }
 
-void handleWebsocketNotification(string partyName, bool isIncoming, struct timeval tv, WebSocketParser& ws, const char* data, uint16_t len) {
+void handleWebsocketNotification(string partyName, bool isIncoming, struct timeval tv, WebSocketParser* ws, const char* data, uint16_t len) {
   WebSocketFrame* frame;
-  ws.addStreamData(data, len);
+  ws->addStreamData(data, len);
 
-  while ((frame = ws.getNextFrame()) != nullptr) {
+  while ((frame = ws->getNextFrame()) != nullptr) {
     printPacketInfo(partyName, isIncoming, tv);
     printf("ws %s\n", frame->getSubject().c_str());
 
@@ -233,11 +233,11 @@ 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);
-  string partyName = party.getName();
+  CommunicationParty* party = CommunicationPartyManager::getParty(ipAddr);
+  string partyName = party->getName();
 
   if (isWebSocketPort(ntohs(tcp->th_sport)) || isWebSocketPort(ntohs(tcp->th_dport))) {
-    WebSocketParser parser = isIncoming ? party.getWebSocketParserIncoming() : party.getWebSocketParserOutgoing();
+    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))){
     printPacketInfo(partyName, isIncoming, tv);
@@ -292,5 +292,6 @@ int main(int argc, char** argv) {
     handlePcapFile(*it);
   }
 
+  CommunicationPartyManager::cleanup();
   return 0;
 }