Rev 1596 | Rev 1642 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 1596 | Rev 1598 | ||
|---|---|---|---|
| Line 25... | Line 25... | ||
| 25 | 25 | ||
| 26 | #include <boost/shared_ptr.hpp> |
26 | #include <boost/shared_ptr.hpp> |
| 27 | 27 | ||
| 28 | #include "logging/Logger.h" |
28 | #include "logging/Logger.h" |
| 29 | #include "broker/Subscriber.h" |
29 | #include "broker/Subscriber.h" |
| - | 30 | #include "net/Subscriber.h" |
|
| 30 | #include "net/types.h" |
31 | #include "net/types.h" |
| 31 | #include "type/Byteset.h" |
32 | #include "type/Byteset.h" |
| 32 | 33 | ||
| 33 | namespace atom { |
34 | namespace atom { |
| 34 | namespace can { |
35 | namespace can { |
| 35 | 36 | ||
| 36 | class Monitor : public broker::Subscriber |
37 | class Monitor : public broker::Subscriber, public net::Subscriber |
| 37 | { |
38 | { |
| 38 | public: |
39 | public: |
| 39 | typedef boost::shared_ptr<Monitor> Pointer; |
40 | typedef boost::shared_ptr<Monitor> Pointer; |
| 40 | 41 | ||
| 41 | Monitor(unsigned int port); |
42 | Monitor(unsigned int port); |
| Line 43... | Line 44... | ||
| 43 | 44 | ||
| 44 | private: |
45 | private: |
| 45 | net::ServerId server_id_; |
46 | net::ServerId server_id_; |
| 46 | 47 | ||
| 47 | void SlotOnMessageHandler(broker::Message::Pointer message); |
48 | void SlotOnMessageHandler(broker::Message::Pointer message); |
| 48 | - | ||
| 49 | void SlotOnNewState(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state); |
- | |
| 50 | void SlotOnNewData(net::ClientId client_id, net::ServerId server_id, type::Byteset data); |
- | |
| 51 | - | ||
| 52 | void SlotOnNewStateHandler(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state); |
49 | void SlotOnNewStateHandler(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state); |
| 53 | void SlotOnNewDataHandler(net::ClientId client_id, net::ServerId server_id, type::Byteset data); |
50 | void SlotOnNewDataHandler(net::ClientId client_id, net::ServerId server_id, type::Byteset data); |
| 54 | 51 | ||
| 55 | logging::Logger LOG; |
52 | logging::Logger LOG; |
| 56 | }; |
53 | }; |