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
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
|
From cb30875bd4e45736ff4ee1137ff97316295ff7be Mon Sep 17 00:00:00 2001
From: Pablo Barciela <scow@riseup.net>
Date: Sat, 24 Nov 2018 01:23:58 +0100
Subject: [PATCH] Fix build with libupnp 1.6
---
src/UPnPBase.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++++++-
src/UPnPBase.h | 6 +++
2 files changed, 142 insertions(+), 2 deletions(-)
diff --git a/src/UPnPBase.cpp b/src/UPnPBase.cpp
index d4063a136..774ebfc32 100644
--- a/src/UPnPBase.cpp
+++ b/src/UPnPBase.cpp
@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePortMapping(
// This function is static
+#if UPNP_VERSION >= 10800
int CUPnPControlPoint::Callback(Upnp_EventType_e EventType, const void *Event, void * /*Cookie*/)
+#else
+int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/)
+#endif
{
std::ostringstream msg;
std::ostringstream msg2;
@@ -1149,25 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_EventType_e EventType, const void *Event, v
msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
// UPnP Discovery
upnpDiscovery:
+#if UPNP_VERSION >= 10800
UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
+#else
+ struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
+#endif
IXML_Document *doc = NULL;
+#if UPNP_VERSION >= 10800
int errCode = UpnpDiscovery_get_ErrCode(d_event);
if (errCode != UPNP_E_SUCCESS) {
msg << UpnpGetErrorMessage(errCode) << ".";
+#else
+ int ret;
+ if (d_event->ErrCode != UPNP_E_SUCCESS) {
+ msg << UpnpGetErrorMessage(d_event->ErrCode) << ".";
+#endif
AddDebugLogLineC(logUPnP, msg);
}
// Get the XML tree device description in doc
+#if UPNP_VERSION >= 10800
const char *location = UpnpDiscovery_get_Location_cstr(d_event);
int ret = UpnpDownloadXmlDoc(location, &doc);
+#else
+ ret = UpnpDownloadXmlDoc(d_event->Location, &doc);
+#endif
if (ret != UPNP_E_SUCCESS) {
msg << "Error retrieving device description from " <<
+#if UPNP_VERSION >= 10800
location << ": " <<
+#else
+ d_event->Location << ": " <<
+#endif
UpnpGetErrorMessage(ret) <<
"(" << ret << ").";
AddDebugLogLineC(logUPnP, msg);
} else {
msg2 << "Retrieving device description from " <<
+#if UPNP_VERSION >= 10800
location << ".";
+#else
+ d_event->Location << ".";
+#endif
AddDebugLogLineN(logUPnP, msg2);
}
if (doc) {
@@ -1195,9 +1221,14 @@ upnpDiscovery:
AddDebugLogLineC(logUPnP, msg);
}
// Add the root device to our list
+#if UPNP_VERSION >= 10800
int expires = UpnpDiscovery_get_Expires(d_event);
upnpCP->AddRootDevice(rootDevice, urlBase,
location, expires);
+#else
+ upnpCP->AddRootDevice(rootDevice, urlBase,
+ d_event->Location, d_event->Expires);
+#endif
}
// Free the XML doc tree
IXML::Document::Free(doc);
@@ -1218,35 +1249,62 @@ upnpDiscovery:
case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
//fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
// UPnP Device Removed
+#if UPNP_VERSION >= 10800
UpnpDiscovery *dab_event = (UpnpDiscovery *)Event;
int errCode = UpnpDiscovery_get_ErrCode(dab_event);
if (errCode != UPNP_E_SUCCESS) {
+#else
+ struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event;
+ if (dab_event->ErrCode != UPNP_E_SUCCESS) {
+#endif
msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " <<
+#if UPNP_VERSION >= 10800
UpnpGetErrorMessage(errCode) <<
+#else
+ UpnpGetErrorMessage(dab_event->ErrCode) <<
+#endif
".";
AddDebugLogLineC(logUPnP, msg);
}
+#if UPNP_VERSION >= 10800
std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event);
+#else
+ std::string devType = dab_event->DeviceType;
+#endif
// Check for an InternetGatewayDevice and removes it from the list
- std::transform(devType.begin(), devType.end(),
- devType.begin(), tolower);
+
+ std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
+
if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
+#if UPNP_VERSION >= 10800
const char *deviceID =
UpnpDiscovery_get_DeviceID_cstr(dab_event);
upnpCP->RemoveRootDevice(deviceID);
+#else
+ upnpCP->RemoveRootDevice(dab_event->DeviceId);
+#endif
}
break;
}
case UPNP_EVENT_RECEIVED: {
//fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n");
// Event reveived
+#if UPNP_VERSION >= 10800
UpnpEvent *e_event = (UpnpEvent *)Event;
int eventKey = UpnpEvent_get_EventKey(e_event);
IXML_Document *changedVariables =
UpnpEvent_get_ChangedVariables(e_event);
const std::string sid = UpnpEvent_get_SID_cstr(e_event);
+#else
+ struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
+ const std::string Sid = e_event->Sid;
+#endif
// Parses the event
+#if UPNP_VERSION >= 10800
upnpCP->OnEventReceived(sid, eventKey, changedVariables);
+#else
+ upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables);
+#endif
break;
}
case UPNP_EVENT_SUBSCRIBE_COMPLETE:
@@ -1261,19 +1319,38 @@ upnpDiscovery:
//fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");
msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";
upnpEventRenewalComplete:
+#if UPNP_VERSION >= 10800
UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
int errCode = UpnpEventSubscribe_get_ErrCode(es_event);
if (errCode != UPNP_E_SUCCESS) {
+#else
+ struct Upnp_Event_Subscribe *es_event =
+ (struct Upnp_Event_Subscribe *)Event;
+ if (es_event->ErrCode != UPNP_E_SUCCESS) {
+#endif
msg << "Error in Event Subscribe Callback";
+#if UPNP_VERSION >= 10800
UPnP::ProcessErrorMessage(msg.str(), errCode, NULL, NULL);
+#else
+ UPnP::ProcessErrorMessage(
+ msg.str(), es_event->ErrCode, NULL, NULL);
+#endif
} else {
#if 0
+#if UPNP_VERSION >= 10800
+
const UpnpString *publisherUrl =
UpnpEventSubscribe_get_PublisherUrl(es_event);
const char *sid = UpnpEvent_get_SID_cstr(es_event);
int timeOut = UpnpEvent_get_TimeOut(es_event);
TvCtrlPointHandleSubscribeUpdate(
publisherUrl, sid, timeOut);
+#else
+ TvCtrlPointHandleSubscribeUpdate(
+ GET_UPNP_STRING(es_event->PublisherUrl),
+ es_event->Sid,
+ es_event->TimeOut );
+#endif
#endif
}
break;
@@ -1288,31 +1365,56 @@ upnpEventRenewalComplete:
msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";
msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";
upnpEventSubscriptionExpired:
+#if UPNP_VERSION >= 10800
UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+#else
+ struct Upnp_Event_Subscribe *es_event =
+ (struct Upnp_Event_Subscribe *)Event;
+#endif
Upnp_SID newSID;
memset(newSID, 0, sizeof(Upnp_SID));
int TimeOut = 1801;
+#if UPNP_VERSION >= 10800
const char *publisherUrl =
UpnpEventSubscribe_get_PublisherUrl_cstr(es_event);
+#endif
int ret = UpnpSubscribe(
upnpCP->m_UPnPClientHandle,
+#if UPNP_VERSION >= 10800
publisherUrl,
+#else
+ GET_UPNP_STRING(es_event->PublisherUrl),
+#endif
&TimeOut,
newSID);
if (ret != UPNP_E_SUCCESS) {
msg << "Error Subscribing to EventURL";
+#if UPNP_VERSION >= 10800
int errCode = UpnpEventSubscribe_get_ErrCode(es_event);
+#endif
UPnP::ProcessErrorMessage(
+#if UPNP_VERSION >= 10800
msg.str(), errCode, NULL, NULL);
+#else
+ msg.str(), es_event->ErrCode, NULL, NULL);
+#endif
} else {
ServiceMap::iterator it =
+#if UPNP_VERSION >= 10800
upnpCP->m_ServiceMap.find(publisherUrl);
+#else
+ upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl));
+#endif
if (it != upnpCP->m_ServiceMap.end()) {
CUPnPService &service = *(it->second);
service.SetTimeout(TimeOut);
service.SetSID(newSID);
msg2 << "Re-subscribed to EventURL '" <<
+#if UPNP_VERSION >= 10800
publisherUrl <<
+#else
+ GET_UPNP_STRING(es_event->PublisherUrl) <<
+#endif
"' with SID == '" <<
newSID << "'.";
AddDebugLogLineC(logUPnP, msg2);
@@ -1331,19 +1433,34 @@ upnpEventSubscriptionExpired:
case UPNP_CONTROL_ACTION_COMPLETE: {
//fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");
// This is here if we choose to do this asynchronously
+#if UPNP_VERSION >= 10800
UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
int errCode = UpnpActionComplete_get_ErrCode(a_event);
IXML_Document *actionResult =
UpnpActionComplete_get_ActionResult(a_event);
if (errCode != UPNP_E_SUCCESS) {
+#else
+ struct Upnp_Action_Complete *a_event =
+ (struct Upnp_Action_Complete *)Event;
+ if (a_event->ErrCode != UPNP_E_SUCCESS) {
+#endif
UPnP::ProcessErrorMessage(
"UpnpSendActionAsync",
+#if UPNP_VERSION >= 10800
errCode, NULL,
actionResult);
+#else
+ a_event->ErrCode, NULL,
+ a_event->ActionResult);
+#endif
} else {
// Check the response document
UPnP::ProcessActionResponse(
+#if UPNP_VERSION >= 10800
actionResult,
+#else
+ a_event->ActionResult,
+#endif
"<UpnpSendActionAsync>");
}
/* No need for any processing here, just print out results.
@@ -1354,17 +1471,28 @@ upnpEventSubscriptionExpired:
case UPNP_CONTROL_GET_VAR_COMPLETE: {
//fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");
msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";
+#if UPNP_VERSION >= 10800
UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
int errCode = UpnpStateVarComplete_get_ErrCode(sv_event);
if (errCode != UPNP_E_SUCCESS) {
+#else
+ struct Upnp_State_Var_Complete *sv_event =
+ (struct Upnp_State_Var_Complete *)Event;
+ if (sv_event->ErrCode != UPNP_E_SUCCESS) {
+#endif
msg << "m_UpnpGetServiceVarStatusAsync";
UPnP::ProcessErrorMessage(
+#if UPNP_VERSION >= 10800
msg.str(), errCode, NULL, NULL);
+#else
+ msg.str(), sv_event->ErrCode, NULL, NULL);
+#endif
} else {
#if 0
// Warning: The use of UpnpGetServiceVarStatus and
// UpnpGetServiceVarStatusAsync is deprecated by the
// UPnP forum.
+#if UPNP_VERSION >= 10800
const char *ctrlUrl =
UpnpStateVarComplete_get_CtrlUrl(sv_event);
const char *stateVarName =
@@ -1373,6 +1501,12 @@ upnpEventSubscriptionExpired:
UpnpStateVarComplete_get_CurrentVal(sv_event);
TvCtrlPointHandleGetVar(
ctrlUrl, stateVarName, currentVal);
+#else
+ TvCtrlPointHandleGetVar(
+ sv_event->CtrlUrl,
+ sv_event->StateVarName,
+ sv_event->CurrentVal );
+#endif
#endif
}
break;
diff --git a/src/UPnPBase.h b/src/UPnPBase.h
index 92753b86a..efe63bf0f 100644
--- a/src/UPnPBase.h
+++ b/src/UPnPBase.h
@@ -489,9 +489,15 @@ public:
// Callback function
static int Callback(
+#if UPNP_VERSION >= 10800
Upnp_EventType_e EventType,
const void *Event,
void *Cookie);
+#else
+ Upnp_EventType EventType,
+ void* Event,
+ void* Cookie);
+#endif
private:
void OnEventReceived(
--
2.24.1
|
