[dss-commits] r8804 - dss/trunk/unix

[dss-commits at forum.digitalstrom.org]

Author: pstaehlin
Date: 2009-09-29 08:56:21 +0200 (Tue, 29 Sep 2009)
New Revision: 8804

Modified:
   dss/trunk/unix/ds485proxy.cpp
Log:
Log origin of ds485 frame

Modified: dss/trunk/unix/ds485proxy.cpp
===================================================================
--- dss/trunk/unix/ds485proxy.cpp	2009-09-28 11:46:22 UTC (rev 8803)
+++ dss/trunk/unix/ds485proxy.cpp	2009-09-29 06:56:21 UTC (rev 8804)
@@ -1223,7 +1223,7 @@
           m_IncomingFrames.erase(m_IncomingFrames.begin());
           m_IncomingFramesGuard.unlock();
           log("R");
-
+          
           const std::vector<unsigned char>& ch = frame->getPayload().toChar();
           if(ch.size() < 1) {
             log("received Command Frame w/o function identifier", lsFatal);
@@ -1238,6 +1238,11 @@
             }
             std::ostringstream sstream;
             sstream << "Got request: " << functionIDStr << " from " << int(frame->getHeader().getSource()) << " ";
+            if(frame->getFrameSource() == fsWire) {
+              sstream << "over the wire ";
+            } else {
+              sstream << "from the dss ";
+            }
 
             PayloadDissector pdDump(frame->getPayload());
             while(!pdDump.isEmpty()) {