previously we simply used the ip address. this is fairly awkward though.
instead try to deduce a resolvable host name from the pretty name.
at discovery time we now mark wsdiscovieres for special handling
at listDir time we then attempt to resolve the name.local and if that
fails strip the .local to get the presumed LLMNR/netbios name. this means
the (first) listDir may be slower while we try to find a working hostname
but discovery is still as fast as possible.
wsdd on linux server resolves as expected, wsd on win10 also resolves as expected
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Competes with D27902
While this diff runs the risk of not being able to resolve 100% of the time (sans ip address fallback in listDir) it has the huge advantage that discovery isn't getting super slow when multiple wsd hosts are found and consequently need costly host resolution performed. So, I like this diff muuuuch better.
Stable was the plan, yes.
I've thought of some complications with this approach though. Actually a combination of two
to mitigate 2 we could just always fall back to netbios regardless of its resolvability, but that has the problem that we can then discover DNSSD services on bar.local have that fall back to bar and somewhat unexpected report that 'bar' was not resolvable (when in fact the intended and wanted resolution is bar.local for the DNSSD scenario). I'm not sure it's a huge problem, but it certainly irks me a bit because very practically libsmbc's resolution may be way more flexible than the regular libc/nss resolution.
OTOH fixing both would require yet more URL hackery to carry more context from the discovery into the list call. by either making the hostname foo.kio-discovery-wsd instead of foo.local or putting the discovery method into a query smb://foo?kio-discovery=wsd. I find both a bit meh. but then dnssd can be entirely unaffected by any of this
reshuffle: instead of using .local directly use a fake .kio-disocvery-wsd suffix. look for that at listing time and redirect to name.local or name as appropriate
this prevents dnssd results form incorrectly getting run through the query branch AND has a 100% fallback chance for the llmnr/netbios name if the dnssd name isn't resolvable for wsdiscoveries
| smb/kio_smb_browse.cpp | ||
|---|---|---|
| 239 | QString::remove() operates on the object itself, no need to assign back to host. Besides, why not use QString::chop(wsdSuffix.size()) ? | |
| smb/kio_smb_browse.cpp | ||
|---|---|---|
| 239 | Mh. Good point indeed, I'll move to chop. Thanks! | |