From 5724d88eac510891673f9eeb35836855d06a4b38 Mon Sep 17 00:00:00 2001
From: colin <colin@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 30 Nov 2011 03:09:04 +0000
Subject: [PATCH] [Nping] Make --safe-payloads default, add --include-payloads

Resolving item from todo list:
o [Nping] The --safe-payloads option should be default (though we
  should keep it for backward compatability).  We could then introduce
    --include-payloads for cases where they are desired.

-Documentation has not been updated.
---
 nping/ArgParser.cc | 3 +++
 nping/NpingOps.cc  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nping/ArgParser.cc b/nping/ArgParser.cc
index ef08f88c1..ed09d6eae 100644
--- a/nping/ArgParser.cc
+++ b/nping/ArgParser.cc
@@ -250,6 +250,7 @@ char errstr[256];
   {"nc", no_argument, 0, 0},
   {"once", no_argument, 0, 0},
   {"safe-payloads", no_argument, 0, 0},
+  {"include-payloads", no_argument, 0, 0},
 
   /* Timing and performance */
   {"delay", required_argument, 0, 0},
@@ -902,6 +903,8 @@ char errstr[256];
         o.doCrypto(false);
     } else if (optcmp(long_options[option_index].name, "safe-payloads")==0 ){
         o.echoPayload(false);
+    } else if (optcmp(long_options[option_index].name, "include-payloads")==0 ){
+        o.echoPayload(true);
 
 
 /* TIMING AND PERFORMANCE OPTIONS ********************************************/
diff --git a/nping/NpingOps.cc b/nping/NpingOps.cc
index 2fcd5b64a..d9b766109 100644
--- a/nping/NpingOps.cc
+++ b/nping/NpingOps.cc
@@ -337,7 +337,7 @@ NpingOps::NpingOps() {
 
     do_crypto=true;
 
-    echo_payload=true;
+    echo_payload=false;
 
     echo_server_once=false;
     echo_server_once_set=false;