mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-14 18:14:50 +02:00
Code Issues Releases Wiki Activity

Add zerconf protocol v2

Browse Source
This commit is contained in:
Jeff Mitchell
2012-04-21 14:41:28 -04:00
parent c6ca3d8660
commit 985b54d84d
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/sip/zeroconf/tomahawkzeroconf.h
View File

@@ -55,6 +55,7 @@ signals:
public slots: public slots:
void resolved( QHostInfo i ) void resolved( QHostInfo i )
{ {
qDebug() << Q_FUNC_INFO << "zeroconf-derived IP has resolved to name " << i.hostName();
if ( i.hostName().length() ) if ( i.hostName().length() )
emit tomahawkHostFound( ip, port, i.hostName(), nid ); emit tomahawkHostFound( ip, port, i.hostName(), nid );
else else
@@ -64,6 +65,7 @@ public slots:
void resolve() void resolve()
{ {
qDebug() << Q_FUNC_INFO << "Resolving zeroconf-derived IP " << ip;
QHostInfo::lookupHost( ip, this, SLOT( resolved( QHostInfo ) ) ); QHostInfo::lookupHost( ip, this, SLOT( resolved( QHostInfo ) ) );
} }
@@ -96,13 +98,20 @@ public:
public slots: public slots:
void advertise() void advertise()
{ {
qDebug() << "Advertising us on the LAN"; qDebug() << "Advertising us on the LAN (both versions)";
QByteArray advert = QString( "TOMAHAWKADVERT:%1:%2" ) QByteArray advert = QString( "TOMAHAWKADVERT:%1:%2" )
.arg( m_port ) .arg( m_port )
.arg( Database::instance()->dbid() ) .arg( Database::instance()->dbid() )
.toAscii(); .toAscii();
m_sock.writeDatagram( advert.data(), advert.size(), m_sock.writeDatagram( advert.data(), advert.size(),
QHostAddress::Broadcast, ZCONF_PORT ); QHostAddress::Broadcast, ZCONF_PORT );
advert = QString( "TOMAHAWKADVERT:%1:%2:%3" )
.arg( m_port )
.arg( Database::instance()->dbid() )
.arg( QHostInfo::localHostName() )
.toAscii();
m_sock.writeDatagram( advert.data(), advert.size(),
QHostAddress::Broadcast, ZCONF_PORT );
} }
signals: signals:
@@ -127,11 +136,20 @@ private slots:
Servent::isIPWhitelisted( sender ) ) Servent::isIPWhitelisted( sender ) )
{ {
QStringList parts = QString::fromAscii( datagram ).split( ':' ); QStringList parts = QString::fromAscii( datagram ).split( ':' );
if ( parts.length() == 3 ) if ( parts.length() == 4 )
{ {
bool ok; bool ok;
int port = parts.at(1).toInt( &ok ); int port = parts.at(1).toInt( &ok );
if(ok && Database::instance()->dbid() != parts.at( 2 ) ) if ( ok && Database::instance()->dbid() != parts.at( 2 ) )
{
emit tomahawkHostFound( sender.toString(), port, parts.at( 3 ), parts.at( 2 ) );
}
}
else if ( parts.length() == 3 )
{
bool ok;
int port = parts.at(1).toInt( &ok );
if ( ok && Database::instance()->dbid() != parts.at( 2 ) )
{ {
qDebug() << "ADVERT received:" << sender << port; qDebug() << "ADVERT received:" << sender << port;
Node *n = new Node( sender.toString(), parts.at( 2 ), port ); Node *n = new Node( sender.toString(), parts.at( 2 ), port );