Rev 981 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 981 | Rev 983 | ||
|---|---|---|---|
| Line 47... | Line 47... | ||
| 47 | Thread<CanDebug>(); |
47 | Thread<CanDebug>(); |
| 48 | } |
48 | } |
| 49 | 49 | ||
| 50 | CanDebug::~CanDebug() |
50 | CanDebug::~CanDebug() |
| 51 | { |
51 | { |
| - | 52 | stop(); |
|
| - | 53 | ||
| 52 | map<int, AsyncSocket*>::iterator iter; |
54 | map<int, AsyncSocket*>::iterator iter; |
| 53 | 55 | ||
| 54 | for (iter = myClientSockets.begin(); iter != myClientSockets.end(); iter++) |
56 | for (iter = myClientSockets.begin(); iter != myClientSockets.end(); iter++) |
| 55 | { |
57 | { |
| 56 | if (iter->second->isConnected()) |
58 | if (iter->second->isConnected()) |
| 57 | { |
59 | { |
| 58 | iter->second->stop(); |
60 | iter->second->stop(); |
| 59 | } |
61 | } |
| 60 | 62 | ||
| 61 | delete iter->second; |
63 | delete iter->second; |
| 62 | } |
64 | } |
| 63 | - | ||
| 64 | stop(); |
- | |
| 65 | } |
65 | } |
| 66 | 66 | ||
| 67 | void CanDebug::run() |
67 | void CanDebug::run() |
| 68 | { |
68 | { |
| 69 | SyslogStream &slog = SyslogStream::getInstance(); |
69 | SyslogStream &slog = SyslogStream::getInstance(); |
| Line 121... | Line 121... | ||
| 121 | } |
121 | } |
| 122 | } |
122 | } |
| 123 | 123 | ||
| 124 | void CanDebug::sendCanMessage(CanMessage canMessage) |
124 | void CanDebug::sendCanMessage(CanMessage canMessage) |
| 125 | { |
125 | { |
| 126 | if (!canMessage.isHeartbeat()) |
126 | if (!canMessage.isHeartbeat() && myClientSockets.size() > 0) |
| 127 | { |
127 | { |
| 128 | string debugData = ""; |
128 | string debugData = ""; |
| 129 | 129 | ||
| 130 | if (canMessage.getDirectionFlag() == "To_Owner") |
130 | if (canMessage.getDirectionFlag() == "To_Owner") |
| 131 | { |
131 | { |