|
a/libupnpp/discovery.cxx |
|
b/libupnpp/discovery.cxx |
|
... |
|
... |
| 101 |
// which has all the interesting data. So let's try to only process
|
101 |
// which has all the interesting data. So let's try to only process
|
| 102 |
// one message per device: the one which probably correspond to the
|
102 |
// one message per device: the one which probably correspond to the
|
| 103 |
// upnp "root device" message and has empty service and device types:
|
103 |
// upnp "root device" message and has empty service and device types:
|
| 104 |
if (!disco->DeviceType[0] && !disco->ServiceType[0]) {
|
104 |
if (!disco->DeviceType[0] && !disco->ServiceType[0]) {
|
| 105 |
LOGDEB1("discovery:cllb:ALIVE: " << cluDiscoveryToStr(disco)
|
105 |
LOGDEB1("discovery:cllb:ALIVE: " << cluDiscoveryToStr(disco)
|
| 106 |
<< endl);
|
106 |
<< endl);
|
| 107 |
DiscoveredTask *tp = new DiscoveredTask(1, disco);
|
107 |
DiscoveredTask *tp = new DiscoveredTask(1, disco);
|
| 108 |
if (discoveredQueue.put(tp)) {
|
108 |
if (discoveredQueue.put(tp)) {
|
| 109 |
return UPNP_E_FINISH;
|
109 |
return UPNP_E_FINISH;
|
| 110 |
}
|
110 |
}
|
| 111 |
}
|
111 |
}
|
|
... |
|
... |
| 205 |
LOGERR("discoExplorer: description parse failed for " <<
|
205 |
LOGERR("discoExplorer: description parse failed for " <<
|
| 206 |
tsk->deviceId << endl);
|
206 |
tsk->deviceId << endl);
|
| 207 |
delete tsk;
|
207 |
delete tsk;
|
| 208 |
continue;
|
208 |
continue;
|
| 209 |
}
|
209 |
}
|
|
|
210 |
LOGDEB1("discoExplorer: found id [" << tsk->deviceId << "]"
|
|
|
211 |
<< " name " << d.device.friendlyName
|
|
|
212 |
<< " devtype " << d.device.deviceType << endl);
|
| 210 |
PTMutexLocker lock(o_pool.m_mutex);
|
213 |
PTMutexLocker lock(o_pool.m_mutex);
|
| 211 |
//LOGDEB1("discoExplorer: inserting device id "<< tsk->deviceId <<
|
214 |
//LOGDEB1("discoExplorer: inserting device id "<< tsk->deviceId <<
|
| 212 |
// " description: " << endl << d.device.dump() << endl);
|
215 |
// " description: " << endl << d.device.dump() << endl);
|
| 213 |
o_pool.m_devices[tsk->deviceId] = d;
|
216 |
o_pool.m_devices[tsk->deviceId] = d;
|
| 214 |
}
|
217 |
}
|