TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

ServiceBrowser: Ignore local services.

Browse Source
This commit is contained in:
Vibhav Pant
2023-08-29 16:46:24 +05:30
parent bbde0a5859
commit 78c1714e8e
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/linux/avahi.cc
+15 -6
View File
@@ -17,6 +17,10 @@ void ServiceBrowser::onItemNew(const int32_t &interface,
<< protocol << ", name: '" << name << "', type: '"
<< type << "', domain: '" << domain
<< "', flags: " << flags;
if (flags & kAvahiLookupResultLocal) {
NEARBY_LOGS(VERBOSE) << __func__ << ": Ignoring local service.";
return;
}
NsdServiceInfo info;
try {
@@ -45,9 +49,9 @@ void ServiceBrowser::onItemNew(const int32_t &interface,
discovery_cb_.service_discovered_cb(std::move(info));
}
void ServiceBrowser::onItemRemove(const int32_t &interface, const int32_t &protocol,
const std::string &name, const std::string &type,
const std::string &domain, const uint32_t &flags) {
void ServiceBrowser::onItemRemove(
const int32_t &interface, const int32_t &protocol, const std::string &name,
const std::string &type, const std::string &domain, const uint32_t &flags) {
// TODO: Can we even resolve removed items?
NEARBY_LOGS(VERBOSE) << __func__ << ": " << getObjectPath()
<< ": Item removed through the ServiceBrowser: "
@@ -55,6 +59,11 @@ void ServiceBrowser::onItemRemove(const int32_t &interface, const int32_t &proto
<< protocol << ", name: '" << name << "', type: '"
<< type << "', domain: '" << domain
<< "', flags: " << flags;
if (flags & kAvahiLookupResultLocal) {
NEARBY_LOGS(VERBOSE) << __func__ << ": Ignoring local service.";
return;
}
NsdServiceInfo info;
try {
auto [r_iface, r_protocol, r_name, r_type, r_domain, r_host, r_aprotocol,
@@ -89,13 +98,13 @@ void ServiceBrowser::onFailure(const std::string &error) {
void ServiceBrowser::onAllForNow() {
NEARBY_LOGS(VERBOSE) << __func__ << ": " << getObjectPath()
<< ": notified via ServiceBrowser that all records have "
"been added for now";
<< ": notified via ServiceBrowser that all records have "
"been added for now";
}
void ServiceBrowser::onCacheExhausted() {
NEARBY_LOGS(VERBOSE) << __func__ << ": " << getObjectPath()
<< ": notified via ServiceBrowser of cache exhaustion";
<< ": notified via ServiceBrowser of cache exhaustion";
}
} // namespace avahi
internal/platform/implementation/linux/avahi.h
+9
View File
@@ -91,6 +91,15 @@ protected:
void onCacheExhausted() override;
private:
enum LookupResultFlags {
kAvahiLookupResultFlagCached = 1,
kAvahiLookupResultFlagWideArea = 2,
kAvahiLookupResultFlagMulticast = 4,
kAvahiLookupResultLocal = 8,
kAvahiLookupResultOurOwn = 16,
kAvahiLookupResultStatic = 32,
};
api::WifiLanMedium::DiscoveredServiceCallback discovery_cb_;
std::shared_ptr<Server> server_;
};