Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix android dns-sd subtype error, and fix manualcode code pair search… #15009

Merged
merged 6 commits into from
Feb 16, 2022
Merged

fix android dns-sd subtype error, and fix manualcode code pair search… #15009

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7fca1d
fix android dns-sd subtype error, and fix manualcode code pair search…
xylophone21 Feb 10, 2022
d586a36
fix restyled-io and ci errors
xylophone21 Feb 10, 2022
910d6ee
using append instead of +
xylophone21 Feb 10, 2022
69d2be4
added comment about this PR
xylophone21 Feb 15, 2022
7c5e385
fix restyled-io and ci errors
xylophone21 Feb 15, 2022
70d7bad
fix typos
xylophone21 Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/platform/android/java/chip/platform/NsdManagerServiceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,22 @@ public void publish(
String[] subTypes) {
NsdServiceInfo serviceInfo = new NsdServiceInfo();
serviceInfo.setServiceName(serviceName);
serviceInfo.setServiceType(type);

/**
* Note, subtypes registration is using an undocumented feature of android dns-sd
* service/mDNSResponder which MAY STOP WORKING in future Android versions. Here, set type =
* "${type},${subtypes1},${subtypes2},...", then subtypes1, subtypes2 etc are all registered to
* this dns-sd server, we can usd `dns-sd -B ${type},${subtypes}` or avahi-browse
* ${subtypes}._sub.${type} -r to browser it
*/
StringBuilder sb = new StringBuilder(type);
for (String subType : subTypes) {
sb.append(",").append(subType);
lazarkov marked this conversation as resolved.
Show resolved Hide resolved
}
serviceInfo.setServiceType(sb.toString());

serviceInfo.setPort(port);
Log.i(TAG, "publish serviceName=" + serviceName + " type=" + type + " port=" + port);
Log.i(TAG, "publish serviceName=" + serviceName + " type=" + sb.toString() + " port=" + port);
int cnt = Math.min(textEntriesDatas.length, textEntriesKeys.length);
for (int i = 0; i < cnt; i++) {
String value = new String(textEntriesDatas[i]);
Expand Down