Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-04-23 22:07:28 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-04-23 22:09:47 (GMT) |
| commit | 26c9854be9df706c550c0eec7e64708b5bf5cd81 (patch) | |
| tree | 5cd595beae075efe70da64a147f5a03264ddbe34 /Swiften/LinkLocal | |
| parent | 839a7abd808cf7901f13bd71d8cb8dc6d101cd9b (diff) | |
| download | swift-26c9854be9df706c550c0eec7e64708b5bf5cd81.zip swift-26c9854be9df706c550c0eec7e64708b5bf5cd81.tar.bz2 | |
Add beginnings of LinkLocalTool.
Diffstat (limited to 'Swiften/LinkLocal')
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h | 4 | ||||
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h | 2 | ||||
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDServiceID.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h index 44a82ee..7b641c5 100644 --- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h +++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h @@ -53,12 +53,12 @@ namespace Swift { break; case AVAHI_BROWSER_NEW: { DNSSDServiceID service(name, domain, type, interfaceIndex); - std::cout << "Service discovered " << name << " " << type << " " << domain << " " << interfaceIndex << std::endl; + std::cout << "Service discovered " << name << " " << domain << " " << type << " " << interfaceIndex << std::endl; MainEventLoop::postEvent(boost::bind(boost::ref(onServiceAdded), service), shared_from_this()); break; } case AVAHI_BROWSER_REMOVE: { - std::cout << "Service went away " << name << " " << type << " " << domain << std::endl; + std::cout << "Service went away " << name << " " << domain << " " << type << " " << interfaceIndex << std::endl; DNSSDServiceID service(name, domain, type, interfaceIndex); MainEventLoop::postEvent(boost::bind(boost::ref(onServiceRemoved), service), shared_from_this()); break; diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h index b173b9a..f86780a 100644 --- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h +++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h @@ -21,7 +21,7 @@ namespace Swift { } void start() { - std::cout << "Start resolving " << service.getName() << std::endl; + std::cout << "Start resolving " << service.getName() << " " << service.getType() << " " << service.getDomain() << std::endl; avahi_threaded_poll_lock(querier->getThreadedPoll()); assert(!resolver); resolver = avahi_service_resolver_new(querier->getClient(), service.getNetworkInterfaceID(), AVAHI_PROTO_UNSPEC, service.getName().getUTF8Data(), service.getType().getUTF8Data(), service.getDomain().getUTF8Data(), AVAHI_PROTO_UNSPEC, (AvahiLookupFlags) 0, handleServiceResolvedStatic, this); diff --git a/Swiften/LinkLocal/DNSSD/DNSSDServiceID.h b/Swiften/LinkLocal/DNSSD/DNSSDServiceID.h index 58aafdf..1a720a0 100644 --- a/Swiften/LinkLocal/DNSSD/DNSSDServiceID.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDServiceID.h @@ -17,7 +17,7 @@ namespace Swift { const String& name, const String& domain, const String& type = PresenceServiceType, - int networkInterface = 0) : + int networkInterface = -1) : name(name), domain(domain), type(type), |