diff options
| author |   Dan Klein <danklein10@gmail.com> | 2015-12-20 00:07:44 +0200 |
|---|---|---|
| committer | Dan Klein <danklein10@gmail.com> | 2015-12-20 00:07:44 +0200 |
| commit | 4ca24cf31919870a684fe78f17c856e0d220e6d5 (patch) | |
| tree | f40ab95e52adca3ac713d61eb9fa3fd0d136e4ea /src/rpc-server/trex_rpc_cmd_api.h | |
| parent | 1895d21485621c3428d045fa0f5b9daf165c8260 (diff) | |
| parent | 5cef472bcdc6c0b7e20e5cc42485ed5570c10f8c (diff) | |
Merge branch 'master' into dan_stateless
Diffstat (limited to 'src/rpc-server/trex_rpc_cmd_api.h')
| -rw-r--r-- | src/rpc-server/trex_rpc_cmd_api.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rpc-server/trex_rpc_cmd_api.h b/src/rpc-server/trex_rpc_cmd_api.h index 3c718eaa..7cbdf4ff 100644 --- a/src/rpc-server/trex_rpc_cmd_api.h +++ b/src/rpc-server/trex_rpc_cmd_api.h @@ -99,6 +99,8 @@ protected: enum field_type_e { FIELD_TYPE_BYTE, FIELD_TYPE_UINT16, + FIELD_TYPE_UINT32, + FIELD_TYPE_UINT64, FIELD_TYPE_INT, FIELD_TYPE_DOUBLE, FIELD_TYPE_BOOL, @@ -136,6 +138,8 @@ protected: */ uint8_t parse_byte(const Json::Value &parent, const std::string &name, Json::Value &result); uint16_t parse_uint16(const Json::Value &parent, const std::string &name, Json::Value &result); + uint32_t parse_uint32(const Json::Value &parent, const std::string &name, Json::Value &result); + uint64_t parse_uint64(const Json::Value &parent, const std::string &name, Json::Value &result); int parse_int(const Json::Value &parent, const std::string &name, Json::Value &result); double parse_double(const Json::Value &parent, const std::string &name, Json::Value &result); bool parse_bool(const Json::Value &parent, const std::string &name, Json::Value &result); @@ -145,6 +149,8 @@ protected: uint8_t parse_byte(const Json::Value &parent, int index, Json::Value &result); uint16_t parse_uint16(const Json::Value &parent, int index, Json::Value &result); + uint32_t parse_uint32(const Json::Value &parent, int index, Json::Value &result); + uint64_t parse_uint64(const Json::Value &parent, int index, Json::Value &result); int parse_int(const Json::Value &parent, int index, Json::Value &result); double parse_double(const Json::Value &parent, int index, Json::Value &result); bool parse_bool(const Json::Value &parent, int index, Json::Value &result); @@ -159,7 +165,7 @@ protected: * parse a field from choices * */ - template<typename T> T parse_choice(const Json::Value ¶ms, const std::string &name, std::initializer_list<T> choices, Json::Value &result) { + template<typename T> T parse_choice(const Json::Value ¶ms, const std::string &name, const std::initializer_list<T> choices, Json::Value &result) { const Json::Value &field = params[name]; if (field == Json::Value::null) { |