Merge branch 'dev'

dannyp11 · Aug 2, 2018 · 2cc42ca · 2cc42ca
2 parents d5fb174 + fb42c0c
commit 2cc42ca
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/McastModuleInterface.h b/McastModuleInterface.h
@@ -45,9 +45,9 @@ class McastModuleInterface
   int joinMcastIfaceV6(int sock, const char* ifaceName = "");
 
 protected:
-  vector<IfaceData> mIfaces; // all interfaces to be listened/sent to
-  vector<string> mMcastAddresses;
-  int mMcastPort, mAckPort;
+  vector<IfaceData>   mIfaces; // all interfaces to be listened/sent to
+  vector<string>      mMcastAddresses;
+  int                 mMcastPort, mAckPort;
 
 private:
   bool mIsIpV6;

diff --git a/ReceiverModule.cpp b/ReceiverModule.cpp
@@ -111,12 +111,14 @@ bool ReceiverModule::run()
     {
       // Retrieve the fd that has data
       int fd = -1;
+      std::string recvIface = "default";
       for (unsigned ii = 0; ii < mIfaces.size(); ++ii)
       {
         fd = mIfaces[ii].sockFd;
         if (FD_ISSET(fd, &rfds))
         {
           FD_CLR(fd, &rfds);
+          recvIface = mIfaces[ii].ifaceName;
           break;
         }
       }
@@ -164,11 +166,11 @@ bool ReceiverModule::run()
       {
         if (isIpV6())
         {
-          printf("%-40s - %s\n", senderIp, decodedMsg.c_str());
+          printf("%-40s -> %-15s - %s\n", senderIp, recvIface.c_str(), decodedMsg.c_str());
         }
         else
         {
-          printf("%-15s - %s\n", senderIp, decodedMsg.c_str());
+          printf("%-15s -> %-15s - %s\n", senderIp, recvIface.c_str(), decodedMsg.c_str());
         }
       }
 

diff --git a/SenderModule.cpp b/SenderModule.cpp
@@ -99,12 +99,15 @@ void* SenderModule::runUcastReceiver()
     while(numReady-- > 0)
     {
       int resultFd = -1;
+      std::string recvIfaceName = "default";
+
       for (unsigned ii = 0 ; ii < mIfaces.size(); ++ii)
       {
         resultFd = mIfaces[ii].sockFd;
         if (FD_ISSET(resultFd, &listenSet))
         {
           FD_CLR(resultFd, &listenSet);
+          recvIfaceName = mIfaces[ii].ifaceName;
           break;
         }
       }
@@ -140,16 +143,16 @@ void* SenderModule::runUcastReceiver()
       {
         if (isIpV6())
         {
-          printf("[ACK] %-45s (%s)\n", senderIp, decodedMsg.c_str());
+          printf("[ACK] %-45s -> %-10s (%s)\n", senderIp, recvIfaceName.c_str(), decodedMsg.c_str());
         }
         else
         {
-          printf("[ACK] %-15s (%s)\n", senderIp, decodedMsg.c_str());
+          printf("[ACK] %-15s -> %-10s (%s)\n", senderIp, recvIfaceName.c_str(), decodedMsg.c_str());
         }
       }
       else
       {
-        cout << "Stray message: " << rxBuf << endl;
+        printf("[STRAY] %-15s -> %-10s (%s)\n", senderIp, recvIfaceName.c_str(), rxBuf);
       }
     }
   }