3 files changed, 8 insertions, 6 deletions
diff --git a/apps/iping/iPing_Common.c b/apps/iping/iPing_Common.c
index ec4fae69..9cc53559 100644
--- a/apps/iping/iPing_Common.c
+++ b/apps/iping/iPing_Common.c
@@ -22,7 +22,7 @@
 #include <parc/security/parc_IdentityFile.h>
 
 const size_t ccnxPing_DefaultReceiveTimeoutInUs = 1000000; // 1 second
-const size_t ccnxPing_DefaultPayloadSize = 4096;
+const size_t ccnxPing_DefaultPayloadSize = 1400;
 const size_t mediumNumberOfPings = 100;
 const size_t smallNumberOfPings = 10;
 
diff --git a/apps/iping/iPing_Common.h b/apps/iping/iPing_Common.h
index 1ffd15a1..df91186b 100644
--- a/apps/iping/iPing_Common.h
+++ b/apps/iping/iPing_Common.h
@@ -37,9 +37,10 @@ extern const size_t ccnxPing_DefaultPayloadSize;
 
 /**
  * The maximum size of a content object payload.
- * 64KB is the limit imposed by the packet structure
+ * 64KB is the limit imposed by the packet structure.
+ * Here we limit the max Payload Size to 1400 bytes.
  */
-#define ccnxPing_MaxPayloadSize 64000
+#define ccnxPing_MaxPayloadSize 1400
 
 /**
  * A default "medium" number of messages to send.
diff --git a/apps/iping/iPing_Server.c b/apps/iping/iPing_Server.c
index 199823d5..d3e5211c 100644
--- a/apps/iping/iPing_Server.c
+++ b/apps/iping/iPing_Server.c
@@ -101,7 +101,7 @@ static void _ccnxPingServer_Run(CCNxPingServer *server) {
 
   size_t yearInSeconds = 60 * 60 * 24 * 365;
 
-  size_t sizeIndex = ccnxName_GetSegmentCount(server->prefix) + 1;
+  size_t sizeIndex;
 
   if (ccnxPortal_Listen(server->portal, server->prefix, yearInSeconds, CCNxStackTimeout_Never)) {
     while (true) {
@@ -117,6 +117,7 @@ static void _ccnxPingServer_Run(CCNxPingServer *server) {
         CCNxName *interestName = ccnxInterest_GetName(interest);
 
         // Extract the size of the payload response from the client
+        sizeIndex = ccnxName_GetSegmentCount(interestName) - 2;
         CCNxNameSegment *sizeSegment = ccnxName_GetSegment(interestName, sizeIndex);
         char *segmentString = ccnxNameSegment_ToString(sizeSegment);
         int size = atoi(segmentString);
@@ -152,13 +153,13 @@ static void _displayUsage(char *progName) {
   printf("       %s -h\n", progName);
   printf("\n");
   printf("Example:\n");
-  printf("    ccnxPing_Server -l ccnx:/some/prefix -s 4096\n");
+  printf("    ccnxPing_Server -l ccnx:/some/prefix -s 1400\n");
   printf("\n");
   printf("Options:\n");
   printf("     -h (--help) Show this help message\n");
   printf("     -l (--locator) Set the locator for this server. The default is 'ccnx:/locator'. \n");
   printf(
-      "     -s (--size) Set the payload size (less than 64000 - see `ccnxPing_MaxPayloadSize` in ccnxPing_Common.h)\n");
+      "     -s (--size) Set the payload size (less than 1400 - see `ccnxPing_MaxPayloadSize` in ccnxPing_Common.h)\n");
 }
 
 /**