Skip to content

avahicore and avahiclient: fixed TXT records update on existing services #52

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

Open
morixhub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

avahicore and avahiclient: fixed TXT records update on existing services #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 14 additions & 10 deletions avahiclient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,23 @@ class QZeroConfPrivate
zcs->m_host = host_name;
zcs->m_interfaceIndex = interface;
zcs->m_port = port;
while (txt) // get txt records
{
QByteArray avahiText((const char *)txt->text, txt->size);
const ssize_t pos = avahiText.indexOf('=');
if (pos < 0)
zcs->m_txt[avahiText] = "";
else
zcs->m_txt[avahiText.left(pos)] = avahiText.mid(pos + 1, -1);
txt = txt->next;
}

ref->pub->services.insert(key, zcs);
}

// Update TXT records anyway
zcs->m_txt.clear();
while (txt)
{
QByteArray avahiText((const char *)txt->text, txt->size);
const ssize_t pos = avahiText.indexOf('=');
if (pos < 0)
zcs->m_txt[avahiText] = "";
else
zcs->m_txt[avahiText.left(pos)] = avahiText.mid(pos + 1, -1);
txt = txt->next;
}

char a[AVAHI_ADDRESS_STR_MAX];
avahi_address_snprint(a, sizeof(a), address);
QHostAddress addr(a);
Expand Down
24 changes: 14 additions & 10 deletions avahicore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,23 @@ class QZeroConfPrivate
zcs->m_host = host_name;
zcs->m_interfaceIndex = interface;
zcs->m_port = port;
while (txt) // get txt records
{
QByteArray avahiText((const char *)txt->text, txt->size);
const int pos = avahiText.indexOf('=');
if (pos < 0)
zcs->m_txt[avahiText] = "";
else
zcs->m_txt[avahiText.left(pos)] = avahiText.mid(pos + 1, -1);
txt = txt->next;
}

ref->pub->services.insert(key, zcs);
}

// Update TXT records anyway
zcs->m_txt.clear();
while (txt)
{
QByteArray avahiText((const char *)txt->text, txt->size);
const int pos = avahiText.indexOf('=');
if (pos < 0)
zcs->m_txt[avahiText] = "";
else
zcs->m_txt[avahiText.left(pos)] = avahiText.mid(pos + 1, -1);
txt = txt->next;
}

char a[AVAHI_ADDRESS_STR_MAX];
avahi_address_snprint(a, sizeof(a), address);
QHostAddress addr(a);
Expand Down