diff options
| author |   Dan Klein <danklein10@gmail.com> | 2015-11-26 13:15:33 +0200 |
|---|---|---|
| committer | Dan Klein <danklein10@gmail.com> | 2015-11-26 13:15:33 +0200 |
| commit | 4486f9863e7f541ce5b6b4ff2bce6c6f7c41fcd2 (patch) | |
| tree | 22415c9c16e198e07c6282780fb0787562329b90 /src/publisher | |
| parent | 91f6c24f45cbb0cbf8568a9938059a1a934e6ae6 (diff) | |
| parent | d9a11302236095e055247295021bdfce6c988802 (diff) | |
Merge branch 'master' into dan_stateless
# Conflicts (solved):
# scripts/automation/trex_control_plane/client_utils/parsing_opts.py
Diffstat (limited to 'src/publisher')
| -rw-r--r-- | src/publisher/trex_publisher.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/publisher/trex_publisher.h b/src/publisher/trex_publisher.h index 82603fda..8d1be064 100644 --- a/src/publisher/trex_publisher.h +++ b/src/publisher/trex_publisher.h @@ -39,10 +39,13 @@ public: void publish_json(const std::string &s); enum event_type_e { - EVENT_PORT_STOPPED = 0 + EVENT_PORT_STARTED = 0, + EVENT_PORT_STOPPED = 1, + EVENT_SERVER_STOPPED = 2, + EVENT_PORT_FINISHED_TX = 3, }; - void publish_event(event_type_e type, const Json::Value &data); + void publish_event(event_type_e type, const Json::Value &data = Json::nullValue); private: void show_zmq_last_error(const std::string &err); |