Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-02-08 16:48:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-02-08 16:48:54 (GMT) |
| commit | 936f7ff9b80aca95040301a4b3cfcd2a248e3334 (patch) | |
| tree | 3abf0d398fd4211b99b6593c92006fef3dcb2951 /Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp | |
| parent | c7e907730e98176be0fdd4e484f2a903b4228348 (diff) | |
| download | swift-936f7ff9b80aca95040301a4b3cfcd2a248e3334.zip swift-936f7ff9b80aca95040301a4b3cfcd2a248e3334.tar.bz2 | |
Added beginnings of Avahi support.
Diffstat (limited to 'Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp')
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp index 55ccede..c4bfcb4 100644 --- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp +++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp @@ -2,11 +2,10 @@ #include <iostream> -//#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h" -//#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h" -//#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h" -//#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h" -//#include "Swiften/Base/foreach.h" +#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h" +#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h" +#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h" +#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h" namespace Swift { @@ -17,22 +16,23 @@ AvahiQuerier::~AvahiQuerier() { } boost::shared_ptr<DNSSDBrowseQuery> AvahiQuerier::createBrowseQuery() { - //return boost::shared_ptr<DNSSDBrowseQuery>(new AvahiBrowseQuery(shared_from_this())); + return boost::shared_ptr<DNSSDBrowseQuery>(new AvahiBrowseQuery(shared_from_this())); } boost::shared_ptr<DNSSDRegisterQuery> AvahiQuerier::createRegisterQuery(const String& name, int port, const ByteArray& info) { - //return boost::shared_ptr<DNSSDRegisterQuery>(new AvahiRegisterQuery(name, port, info, shared_from_this())); + return boost::shared_ptr<DNSSDRegisterQuery>(new AvahiRegisterQuery(name, port, info, shared_from_this())); } boost::shared_ptr<DNSSDResolveServiceQuery> AvahiQuerier::createResolveServiceQuery(const DNSSDServiceID& service) { - //return boost::shared_ptr<DNSSDResolveServiceQuery>(new AvahiResolveServiceQuery(service, shared_from_this())); + return boost::shared_ptr<DNSSDResolveServiceQuery>(new AvahiResolveServiceQuery(service, shared_from_this())); } boost::shared_ptr<DNSSDResolveHostnameQuery> AvahiQuerier::createResolveHostnameQuery(const String& hostname, int interfaceIndex) { - //return boost::shared_ptr<DNSSDResolveHostnameQuery>(new AvahiResolveHostnameQuery(hostname, interfaceIndex, shared_from_this())); + return boost::shared_ptr<DNSSDResolveHostnameQuery>(new AvahiResolveHostnameQuery(hostname, interfaceIndex, shared_from_this())); } void AvahiQuerier::start() { + std::cout << "Starrting querier" << std::endl; assert(!threadedPoll); threadedPoll = avahi_threaded_poll_new(); int error; @@ -45,6 +45,7 @@ void AvahiQuerier::start() { std::cerr << "Avahi Error: " << avahi_strerror(error) << std::endl; return; } + std::cout << "Starrting event loop" << std::endl; avahi_threaded_poll_start(threadedPoll); } |