[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kdnssd/ioslave
From:       Jakub Stachowski <qbast () go2 ! pl>
Date:       2009-08-24 20:34:37
Message-ID: 1251146077.303804.19708.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1015187 by qbast:

Restore wide-area browsing. Like before, domain is specified in host part of the URL, \
like: zeroconf://dns-sd.org/_ftp._tcp  . Lack of host means default domain so \
existing functionality does not change.
BUG:203294




 M  +3 -3      dnssd.cpp  
 M  +1 -1      zeroconf.protocol  
 M  +6 -3      zeroconfurl.h  


--- trunk/KDE/kdenetwork/kdnssd/ioslave/dnssd.cpp #1015186:1015187
@@ -120,7 +120,7 @@
     switch (type)
     {
     case ZeroConfUrl::RootDir:
-        serviceTypeBrowser = new ServiceTypeBrowser();
+        serviceTypeBrowser = new ServiceTypeBrowser(zeroConfUrl.domain());
         connect( serviceTypeBrowser, SIGNAL(serviceTypeAdded(const QString&)),
                  SLOT(addServiceType(const QString&)) );
         connect( serviceTypeBrowser, SIGNAL(finished()), SLOT(onBrowserFinished()) \
); @@ -133,7 +133,7 @@
             error( ERR_SERVICE_NOT_AVAILABLE, zeroConfUrl.serviceType() );
             break;
         }
-        serviceBrowser = new ServiceBrowser( zeroConfUrl.serviceType() );
+        serviceBrowser = new ServiceBrowser( zeroConfUrl.serviceType(), false, \
                zeroConfUrl.domain() );
         connect( serviceBrowser, SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),
                  SLOT(addService(DNSSD::RemoteService::Ptr)) );
         connect( serviceBrowser, SIGNAL(finished()), SLOT(onBrowserFinished()) );
@@ -186,7 +186,7 @@
             return;
         }
 
-        serviceToResolve = new RemoteService( zeroConfUrl.serviceName(), \
zeroConfUrl.serviceType(), QString() ); +        serviceToResolve = new \
RemoteService( zeroConfUrl.serviceName(), zeroConfUrl.serviceType(), \
zeroConfUrl.domain() );  if (!serviceToResolve->resolve())
         {
             error( ERR_DOES_NOT_EXIST, zeroConfUrl.serviceName() );
--- trunk/KDE/kdenetwork/kdnssd/ioslave/zeroconf.protocol #1015186:1015187
@@ -67,5 +67,5 @@
 Description[zh_HK]=用於 ZeroConf 的 kioslave
 Description[zh_TW]=ZeroConf 的 kioslave
 maxInstances=4
-Class=:local
+Class=:internet
 
--- trunk/KDE/kdenetwork/kdnssd/ioslave/zeroconfurl.h #1015186:1015187
@@ -38,29 +38,32 @@
   public:
     const QString& serviceType() const;
     const QString& serviceName() const;
+    const QString& domain() const;
     bool matches( const RemoteService* remoteService ) const;
     ZeroConfUrl::Type type() const;
 
   private:
     QString mServiceType;
     QString mServiceName;
+    QString mDomain;
 };
 
 
 inline ZeroConfUrl::ZeroConfUrl( const KUrl& url )
 {
-    // FIXME: encode domain name into url to support many services with the same \
                name on 
-    // different domains
     mServiceType = url.path().section('/',1,1);
     mServiceName = url.path().section('/',2,-1);
+    mDomain = url.host();
 }
 
 inline const QString& ZeroConfUrl::serviceType() const { return mServiceType; }
 inline const QString& ZeroConfUrl::serviceName() const { return mServiceName; }
+inline const QString& ZeroConfUrl::domain() const { return mDomain; }
 
 inline bool ZeroConfUrl::matches( const RemoteService* remoteService ) const
 {
-    return ( remoteService->serviceName()==mServiceName && \
remoteService->type()==mServiceType ); +    return ( \
remoteService->serviceName()==mServiceName && remoteService->type()==mServiceType  +  \
&& remoteService->domain()==mDomain);  }
 
 // TODO: how is a invalid url defined?


[prev in list] [next in list] [prev in thread] [next in thread]