-
Notifications
You must be signed in to change notification settings - Fork 13
/
Copy pathRemoteManager_server.cpp.patch
170 lines (151 loc) · 6.33 KB
/
RemoteManager_server.cpp.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
--- RemoteManager_server.cpp.orig 2015-12-22 01:12:40.993675829 -0800
+++ RemoteManager_server.cpp 2015-12-22 01:31:57.078124279 -0800
@@ -1,11 +1,11 @@
// Automatically generated OpenZWave::Manager_server wrapper
-// (c) 2011 Elias Karakoulakis <elias.karakoulakis@gmail.com>
+// (c) 2011-2012 Elias Karakoulakis <elias.karakoulakis@gmail.com>
#include "RemoteManager.h"
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/server/TSimpleServer.h>
-#include <thrift/transport/TServerSocket.h>
-#include <thrift/transport/TBufferTransports.h>
+#include <protocol/TBinaryProtocol.h>
+#include <server/TSimpleServer.h>
+#include <transport/TServerSocket.h>
+#include <transport/TBufferTransports.h>
using namespace ::apache::thrift;
using namespace ::apache::thrift::protocol;
@@ -17,7 +17,17 @@
using namespace ::OpenZWave;
void BeginControllerCommand_callback(OpenZWave::Driver::ControllerState arg1, OpenZWave::Driver::ControllerError arg2, void* arg3) {
- // FIXME: fill in the blanks (sorry!)
+ g_criticalSection.lock();
+ //
+ STOMP::hdrmap headers;
+ headers["ControllerState"] = to_string<uint16_t>(arg1, std::hex);
+ if (arg2 != OpenZWave::Driver::ControllerError_None ) {
+ headers["ControllerError"] = to_string<uint16_t>(arg2, std::hex);
+ }
+ string empty = "" ;
+ stomp_client->send(*notifications_topic, headers, empty);
+ //
+ g_criticalSection.unlock();
}
class RemoteManagerHandler : virtual public RemoteManagerIf {
@@ -283,10 +293,15 @@
}
void GetNodeNeighbors(UInt32_ListByte& _return, const int32_t _homeId, const int8_t _nodeId) {
+ uint8* arr;
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetNodeNeighbors((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8**) &_return._nodeNeighbors);
+ _return.retval = mgr->GetNodeNeighbors((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8**) &arr);
g_criticalSection.unlock();
+ if (_return.retval > 0) {
+ for (int i=0; i<_return.retval; i++) _return._nodeNeighbors.push_back(arr[i]);
+ delete arr;
+ }
}
void GetNodeManufacturerName(std::string& _return, const int32_t _homeId, const int8_t _nodeId) {
@@ -571,11 +586,15 @@
g_criticalSection.unlock();
}
- void GetValueListItems(Bool_ListString& _return, const RemoteValueID& _id) {
+ void GetValueListItems(Bool_ListString& _return, const RemoteValueID& _id) {
+ std::vector<std::string> o_values;
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetValueListItems(_id.toValueID(), (std::vector<std::string, std::allocator<std::string> >*) &_return.o_value);
+ _return.retval = mgr->GetValueListItems(_id.toValueID(), &o_values);
g_criticalSection.unlock();
+ if (_return.retval > 0) {
+ for (int i=0; i< _return.retval; i++) _return.o_value.push_back(std::string(o_values[i]));
+ }
}
void GetValueFloatPrecision(Bool_UInt8& _return, const RemoteValueID& _id) {
@@ -604,7 +623,7 @@
bool SetValue_UInt8_UInt8(const RemoteValueID& _id, const std::vector<int8_t> & _value, const int8_t _length) {
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- bool function_result = mgr->SetValue(_id.toValueID(), (::uint8 const*) &_value, (::uint8 const) _length);
+ bool function_result = mgr->SetValue(_id.toValueID(), (const uint8*) _value.data(), _value.size());
g_criticalSection.unlock();
return(function_result);
}
@@ -658,10 +677,10 @@
}
void SetChangeVerified(const RemoteValueID& _id, const bool _verify) {
- Manager* mgr = Manager::Get();
- g_criticalSection.lock();
- mgr->SetChangeVerified(_id.toValueID(), (bool) _verify);
- g_criticalSection.unlock();
+ Manager* mgr = Manager::Get();
+ g_criticalSection.lock();
+ mgr->SetChangeVerified(_id.toValueID(), (bool) _verify);
+ g_criticalSection.unlock();
}
bool PressButton(const RemoteValueID& _id) {
@@ -763,10 +782,15 @@
}
void GetAssociations_uint8(GetAssociationsReturnStruct& _return, const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) {
+ uint8* o_associations;
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetAssociations((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8 const) _groupIdx, (::uint8**) &_return.o_associations);
+ _return.retval = mgr->GetAssociations((::uint32 const) _homeId, (::uint8 const) _nodeId, (::uint8 const) _groupIdx, (::uint8**) &o_associations);
g_criticalSection.unlock();
+ if (_return.retval > 0) {
+ for (int i=0; i<_return.retval; i++) _return.o_associations.push_back(o_associations[i]);
+ delete o_associations;
+ }
}
int8_t GetMaxAssociations(const int32_t _homeId, const int8_t _nodeId, const int8_t _groupIdx) {
@@ -865,10 +889,15 @@
}
void GetAllScenes(GetAllScenesReturnStruct& _return) {
+ uint8* _sceneIds;
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->GetAllScenes((::uint8**) &_return._sceneIds);
+ _return.retval = mgr->GetAllScenes((::uint8**) &_sceneIds);
g_criticalSection.unlock();
+ if (_return.retval>0) {
+ for (int i=0; i<_return.retval; i++) _return._sceneIds.push_back(_sceneIds[i]);
+ delete(_sceneIds);
+ }
}
void RemoveAllScenes(const int32_t _homeId) {
@@ -967,10 +996,12 @@
}
void SceneGetValues(SceneGetValuesReturnStruct& _return, const int8_t _sceneId) {
+ std::vector<OpenZWave::ValueID> o_values;
Manager* mgr = Manager::Get();
g_criticalSection.lock();
- _return.retval = mgr->SceneGetValues((::uint8 const) _sceneId, _return.o_value.toValueID());
+ _return.retval = mgr->SceneGetValues((::uint8 const) _sceneId, &o_values);
g_criticalSection.unlock();
+ for (int i=0; i< _return.retval; i++) _return.o_value.push_back(RemoteValueID(o_values[i]));
}
void SceneGetValueAsBool(Bool_Bool& _return, const int8_t _sceneId, const RemoteValueID& _valueId) {
@@ -1138,13 +1169,13 @@
}
void SendAllValues() {
- // Your implementation goes here
- printf("SendAllValues\n");
+ g_criticalSection.lock();
+ send_all_values();
+ g_criticalSection.unlock();
}
void ping() {
- // Your implementation goes here
- printf("ping\n");
+ // Dummy method to keep Thrift connection alive over NAT routers
}
};
@@ -1162,4 +1193,4 @@
// return 0;
// }
//
-//
\ No newline at end of file
+//