Merge branch 'master' into rx_phase_2

4 files changed, 34 insertions, 9 deletions

diff --git a/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp b/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp
index 4fa2447d..d08de4e1 100644
--- a/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp
+++ b/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp
@@ -235,3 +235,12 @@ TrexJsonRpcV2Parser::generate_common_error(Json::Value &json, const std::string
 
 }
 
+void
+TrexJsonRpcV2Parser::generate_common_error(std::string &response, const std::string &specific_err) {
+    Json::Value resp_json;
+    Json::FastWriter writer;
+
+    generate_common_error(resp_json, specific_err);
+    response = writer.write(resp_json);
+}
+
diff --git a/src/rpc-server/trex_rpc_jsonrpc_v2_parser.h b/src/rpc-server/trex_rpc_jsonrpc_v2_parser.h
index 0563f21d..d91cbe2d 100644
--- a/src/rpc-server/trex_rpc_jsonrpc_v2_parser.h
+++ b/src/rpc-server/trex_rpc_jsonrpc_v2_parser.h
@@ -89,6 +89,15 @@ public:
     static void generate_common_error(Json::Value &json, const std::string &specific_err);
 
     /**
+     * will generate a valid JSON RPC v2 error message with 
+     * generic error code and message 
+     * 
+     * @author imarom (16-Sep-15)
+     * 
+     */
+    static void generate_common_error(std::string &response, const std::string &specific_err);
+
+    /**
      * *tries* to generate a pretty string from JSON 
      * if json_str is not a valid JSON string 
      * it will duplicate the source
diff --git a/src/rpc-server/trex_rpc_req_resp_server.cpp b/src/rpc-server/trex_rpc_req_resp_server.cpp
index 28bf1d80..e762b8c1 100644
--- a/src/rpc-server/trex_rpc_req_resp_server.cpp
+++ b/src/rpc-server/trex_rpc_req_resp_server.cpp
@@ -171,7 +171,12 @@ void TrexRpcServerReqRes::_stop_rpc_thread() {
 void TrexRpcServerReqRes::handle_request(const std::string &request) {
     std::string response;
 
-    process_request(request, response);
+    if ( request.size() > MAX_RPC_MSG_LEN ) {
+        std::string err_msg = "Request is too large (" + std::to_string(request.size()) + " bytes). Consider splitting to smaller chunks.";
+        TrexJsonRpcV2Parser::generate_common_error(response, err_msg);
+    } else {
+        process_request(request, response);
+    }
 
     zmq_send(m_socket, response.c_str(), response.size(), 0);
 }
@@ -244,7 +249,12 @@ void TrexRpcServerReqRes::process_zipped_request(const std::string &request, std
 
     /* process the request */
     std::string raw_response;
-    process_request_raw(unzipped, raw_response);
+    if ( unzipped.size() > MAX_RPC_MSG_LEN ) {
+        std::string err_msg = "Request is too large (" + std::to_string(unzipped.size()) + " bytes). Consider splitting to smaller chunks.";
+        TrexJsonRpcV2Parser::generate_common_error(raw_response, err_msg);
+    } else {
+        process_request_raw(unzipped, raw_response);
+    }
 
     TrexRpcZip::compress(raw_response, response);
 
@@ -256,18 +266,14 @@ void TrexRpcServerReqRes::process_zipped_request(const std::string &request, std
  */
 void 
 TrexRpcServerReqRes::handle_server_error(const std::string &specific_err) {
-    Json::FastWriter writer;
-    Json::Value response;
+    std::string response;
 
     /* generate error */
     TrexJsonRpcV2Parser::generate_common_error(response, specific_err);
 
-     /* write the JSON to string and sever on ZMQ */
-    std::string response_str = writer.write(response);
-    
-    verbose_json("Server Replied:  ", response_str);
+    verbose_json("Server Replied:  ", response);
 
-    zmq_send(m_socket, response_str.c_str(), response_str.size(), 0);
+    zmq_send(m_socket, response.c_str(), response.size(), 0);
 }
 
 
diff --git a/src/rpc-server/trex_rpc_req_resp_server.h b/src/rpc-server/trex_rpc_req_resp_server.h
index 92d51a2a..9a994044 100644
--- a/src/rpc-server/trex_rpc_req_resp_server.h
+++ b/src/rpc-server/trex_rpc_req_resp_server.h
@@ -53,6 +53,7 @@ protected:
 
     void               *m_context;
     void               *m_socket;
+    static const uint32_t MAX_RPC_MSG_LEN = 999999;
 };
 
 /**