commit b735e8dd41bbd98d092809fcd4cc810dd29358cc
author jeraldabraham <jeraldabraham@email.arizona.edu> Wed Feb 19 09:16:35 2014 -0700
committer jeraldabraham <jeraldabraham@email.arizona.edu> Wed Feb 19 09:16:35 2014 -0700
tree e2198c3826b0b859da32d3195a38fe445ff53e27
parent a599af3c88d092d7543d8963308fed1b17a31221

Printing Text Updated

ndn-traffic-client.cpp

diff --git a/ndn-traffic-client.cpp b/ndn-traffic-client.cpp
index b617b1c..aa909cd 100644
--- a/ndn-traffic-client.cpp
+++ b/ndn-traffic-client.cpp
@@ -585,9 +585,9 @@
     double roundTripTime;

     std::string logLine;

     logLine = "";

-    logLine += "Data Received      - GlobalID="+toString(globalReference);

+    logLine += "Data Received      - PatternType="+toString(patternId+1);

+    logLine += ", GlobalID="+toString(globalReference);

     logLine += ", LocalID="+toString(localReference);

-    logLine += ", PatternID="+toString(patternId);

     logLine += ", Name="+interest.getName().toUri();

     logger_.log(logLine, true, false);

     boost::posix_time::time_duration roundTripDuration;

@@ -618,9 +618,9 @@
   {

     std::string logLine;

     logLine = "";

-    logLine += "Interest Timed Out - GlobalID="+toString(globalReference);

+    logLine += "Interest Timed Out - PatternType="+toString(patternId+1);

+    logLine += ", GlobalID="+toString(globalReference);

     logLine += ", LocalID="+toString(localReference);

-    logLine += ", PatternID="+toString(patternId);

     logLine += ", Name="+interest.getName().toUri();

     logger_.log(logLine, true, false);

     if (totalInterestSent_ == interestCount_)

@@ -733,9 +733,9 @@
                                                   patternId));

             std::string logLine;

             logLine = "";

-            logLine += "Sending Interest   - GlobalID="+toString(totalInterestSent_);

+            logLine += "Sending Interest   - PatternType="+toString(patternId+1);

+            logLine += ", GlobalID="+toString(totalInterestSent_);

             logLine += ", LocalID="+toString(trafficPattern_[patternId].totalInterestSent);

-            logLine += ", PatternID="+toString(patternId);

             logLine += ", Name="+interest.getName().toUri();

             logger_.log(logLine, true, false);

             deadlineTimer->expires_at(deadlineTimer->expires_at() +

ndn-traffic-server.cpp

diff --git a/ndn-traffic-server.cpp b/ndn-traffic-server.cpp
index e059bbe..41527e0 100644
--- a/ndn-traffic-server.cpp
+++ b/ndn-traffic-server.cpp
@@ -432,7 +432,7 @@
     keyChain_.sign(data);

     totalInterestReceived_++;

     trafficPattern_[patternId].totalInterestReceived++;

-    logLine += "Interest Received          - PatternID="+toString(patternId);

+    logLine += "Interest Received          - PatternType="+toString(patternId+1);

     logLine += ", GlobalID="+toString(totalInterestReceived_);

     logLine += ", LocalID="+toString(trafficPattern_[patternId].totalInterestReceived);

     logLine += ", Name="+trafficPattern_[patternId].name;

@@ -445,7 +445,7 @@
   {

     std::string logLine;

     logLine = "";

-    logLine += "Prefix Registration Failed - PatternID="+toString(patternId);

+    logLine += "Prefix Registration Failed - PatternType="+toString(patternId+1);

     logLine += ", Name="+trafficPattern_[patternId].name;

     logger_.log(logLine, true, true);

     totalRegistrationsFailed_++;