Merge branch 'master' of csi-sceasr-b45:/auto/proj-pcube-b/apps/PL-b/tools/repo//trex-core

Conflicts:
	linux/ws_main.py

1 files changed, 25 insertions, 0 deletions

diff --git a/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp b/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp
index 3831bb37..928baca6 100644
--- a/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp
+++ b/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp
@@ -200,3 +200,28 @@ void TrexJsonRpcV2Parser::parse_single_request(Json::Value &request,
     commands.push_back(new JsonRpcMethod(msg_id, rpc_cmd, request["params"]));
 }
 
+/**
+ * tries to pretty a JSON str
+ * 
+ * @author imarom (03-Sep-15)
+ * 
+ * @param json_str 
+ * 
+ * @return std::string 
+ */
+std::string TrexJsonRpcV2Parser::pretty_json_str(const std::string &json_str) {
+    Json::Reader reader;
+    Json::Value  value;
+
+    /* basic JSON parsing */
+    bool rc = reader.parse(json_str, value, false);
+    if (!rc) {
+        /* duplicate the soruce */
+        return json_str;
+    }
+
+    /* successfully parsed */
+    Json::StyledWriter writer;
+    return writer.write(value);
+}
+