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 | #include "timer/Manager.h" |
33 | #include "timer/Manager.h" |
| 33 | 34 | ||
| 34 | namespace atom { |
35 | namespace atom { |
| 35 | namespace can { |
36 | namespace can { |
| 36 | 37 | ||
| 37 | class Network : public broker::Subscriber |
38 | class Network : public broker::Subscriber, public net::Subscriber |
| 38 | { |
39 | { |
| 39 | public: |
40 | public: |
| 40 | typedef boost::shared_ptr<Network> Pointer; |
41 | typedef boost::shared_ptr<Network> Pointer; |
| 41 | 42 | ||
| 42 | Network(std::string address); |
43 | Network(std::string address); |
| Line 50... | Line 51... | ||
| 50 | type::Byteset buffer_; |
51 | type::Byteset buffer_; |
| 51 | timer::TimerId timer_id_; |
52 | timer::TimerId timer_id_; |
| 52 | 53 | ||
| 53 | void SlotOnMessageHandler(broker::Message::Pointer message); |
54 | void SlotOnMessageHandler(broker::Message::Pointer message); |
| 54 | 55 | ||
| 55 | void SlotOnNewState(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state); |
- | |
| 56 | void SlotOnNewData(net::ClientId client_id, net::ServerId server_id, type::Byteset data); |
- | |
| 57 | void SlotOnTimeout(timer::TimerId timer_id); |
56 | void SlotOnTimeout(timer::TimerId timer_id); |
| 58 | 57 | ||
| 59 | void SlotOnNewStateHandler(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state); |
58 | void SlotOnNewStateHandler(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state); |
| 60 | void SlotOnNewDataHandler(net::ClientId client_id, net::ServerId server_id, type::Byteset data); |
59 | void SlotOnNewDataHandler(net::ClientId client_id, net::ServerId server_id, type::Byteset data); |
| 61 | void SlotOnTimeoutHandler(timer::TimerId timer_id); |
60 | void SlotOnTimeoutHandler(timer::TimerId timer_id); |