diff options
author | Remko Tronçon <git@el-tramo.be> | 2009-07-25 09:37:42 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2009-07-25 09:37:42 (GMT) |
commit | 0f77a684b42f25052eb1cfa688721e321526a90d (patch) | |
tree | 226c07deff7a663f8aefdfc8814e9ecd04085999 /Swiften/LinkLocal | |
parent | b33a2937fe4a3cae0017892ad7f5c27b8a6f976d (diff) | |
download | swift-contrib-0f77a684b42f25052eb1cfa688721e321526a90d.zip swift-contrib-0f77a684b42f25052eb1cfa688721e321526a90d.tar.bz2 |
Created DNSSD submodule for LinkLocal.
Diffstat (limited to 'Swiften/LinkLocal')
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h (renamed from Swiften/LinkLocal/BonjourBrowseQuery.h) | 4 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp (renamed from Swiften/LinkLocal/BonjourQuerier.cpp) | 10 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h (renamed from Swiften/LinkLocal/BonjourQuerier.h) | 4 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.cpp (renamed from Swiften/LinkLocal/BonjourQuery.cpp) | 4 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h (renamed from Swiften/LinkLocal/BonjourQuery.h) | 0 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h (renamed from Swiften/LinkLocal/BonjourRegisterQuery.h) | 4 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveHostnameQuery.h (renamed from Swiften/LinkLocal/BonjourResolveHostnameQuery.h) | 4 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h (renamed from Swiften/LinkLocal/BonjourResolveServiceQuery.h) | 4 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc | 3 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.cpp (renamed from Swiften/LinkLocal/DNSSDBrowseQuery.cpp) | 2 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h (renamed from Swiften/LinkLocal/DNSSDBrowseQuery.h) | 0 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDQuerier.cpp (renamed from Swiften/LinkLocal/DNSSDQuerier.cpp) | 2 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDQuerier.h (renamed from Swiften/LinkLocal/DNSSDQuerier.h) | 0 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.cpp (renamed from Swiften/LinkLocal/DNSSDRegisterQuery.cpp) | 2 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h (renamed from Swiften/LinkLocal/DNSSDRegisterQuery.h) | 0 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.cpp (renamed from Swiften/LinkLocal/DNSSDResolveHostnameQuery.cpp) | 2 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h (renamed from Swiften/LinkLocal/DNSSDResolveHostnameQuery.h) | 0 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.cpp (renamed from Swiften/LinkLocal/DNSSDResolveServiceQuery.cpp) | 2 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h (renamed from Swiften/LinkLocal/DNSSDResolveServiceQuery.h) | 0 | ||||
-rw-r--r-- | Swiften/LinkLocal/DNSSD/Makefile.inc | 12 | ||||
-rw-r--r-- | Swiften/LinkLocal/Makefile.inc | 10 |
21 files changed, 39 insertions, 30 deletions
diff --git a/Swiften/LinkLocal/BonjourBrowseQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h index 6db108d..edff064 100644 --- a/Swiften/LinkLocal/BonjourBrowseQuery.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h @@ -1,7 +1,7 @@ #pragma once -#include "Swiften/LinkLocal/BonjourQuery.h" -#include "Swiften/LinkLocal/DNSSDBrowseQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h" #include "Swiften/EventLoop/MainEventLoop.h" namespace Swift { diff --git a/Swiften/LinkLocal/BonjourQuerier.cpp b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp index 42ba12a..064e3c5 100644 --- a/Swiften/LinkLocal/BonjourQuerier.cpp +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp @@ -1,13 +1,13 @@ -#include "Swiften/LinkLocal/BonjourQuerier.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h" #include <unistd.h> #include <sys/socket.h> #include <fcntl.h> -#include "Swiften/LinkLocal/BonjourBrowseQuery.h" -#include "Swiften/LinkLocal/BonjourRegisterQuery.h" -#include "Swiften/LinkLocal/BonjourResolveServiceQuery.h" -#include "Swiften/LinkLocal/BonjourResolveHostnameQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveHostnameQuery.h" #include "Swiften/Base/foreach.h" namespace Swift { diff --git a/Swiften/LinkLocal/BonjourQuerier.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h index 324e79e..79f9a81 100644 --- a/Swiften/LinkLocal/BonjourQuerier.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h @@ -6,8 +6,8 @@ #include <boost/thread.hpp> #include <boost/thread/mutex.hpp> -#include "Swiften/LinkLocal/DNSSDQuerier.h" -#include "Swiften/LinkLocal/BonjourQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDQuerier.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h" namespace Swift { class LinkLocalServiceInfo; diff --git a/Swiften/LinkLocal/BonjourQuery.cpp b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.cpp index a9c13fb..c1c481b 100644 --- a/Swiften/LinkLocal/BonjourQuery.cpp +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.cpp @@ -1,5 +1,5 @@ -#include "Swiften/LinkLocal/BonjourQuery.h" -#include "Swiften/LinkLocal/BonjourQuerier.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h" namespace Swift { diff --git a/Swiften/LinkLocal/BonjourQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h index bdb91a4..bdb91a4 100644 --- a/Swiften/LinkLocal/BonjourQuery.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h diff --git a/Swiften/LinkLocal/BonjourRegisterQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h index c34ba02..31e86fc 100644 --- a/Swiften/LinkLocal/BonjourRegisterQuery.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h @@ -1,7 +1,7 @@ #pragma once -#include "Swiften/LinkLocal/BonjourQuery.h" -#include "Swiften/LinkLocal/DNSSDRegisterQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h" #include "Swiften/LinkLocal/LinkLocalServiceInfo.h" #include "Swiften/Base/ByteArray.h" #include "Swiften/EventLoop/MainEventLoop.h" diff --git a/Swiften/LinkLocal/BonjourResolveHostnameQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveHostnameQuery.h index 771fc84..58c6588 100644 --- a/Swiften/LinkLocal/BonjourResolveHostnameQuery.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveHostnameQuery.h @@ -1,8 +1,8 @@ #pragma once #include "Swiften/Base/String.h" -#include "Swiften/LinkLocal/BonjourQuery.h" -#include "Swiften/LinkLocal/DNSSDResolveHostnameQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h" #include "Swiften/EventLoop/MainEventLoop.h" #include "Swiften/Network/HostAddress.h" diff --git a/Swiften/LinkLocal/BonjourResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h index e4f02ee..1afdf5a 100644 --- a/Swiften/LinkLocal/BonjourResolveServiceQuery.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h @@ -1,7 +1,7 @@ #pragma once -#include "Swiften/LinkLocal/BonjourQuery.h" -#include "Swiften/LinkLocal/DNSSDResolveServiceQuery.h" +#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h" #include "Swiften/LinkLocal/LinkLocalServiceInfo.h" #include "Swiften/Base/ByteArray.h" #include "Swiften/EventLoop/MainEventLoop.h" diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc b/Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc new file mode 100644 index 0000000..efa329d --- /dev/null +++ b/Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc @@ -0,0 +1,3 @@ +SWIFTEN_SOURCES += \ + Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.cpp \ + Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp diff --git a/Swiften/LinkLocal/DNSSDBrowseQuery.cpp b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.cpp index 4924247..1dbff2c 100644 --- a/Swiften/LinkLocal/DNSSDBrowseQuery.cpp +++ b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.cpp @@ -1,4 +1,4 @@ -#include "Swiften/LinkLocal/DNSSDBrowseQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h" namespace Swift { diff --git a/Swiften/LinkLocal/DNSSDBrowseQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h index e548ca5..e548ca5 100644 --- a/Swiften/LinkLocal/DNSSDBrowseQuery.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h diff --git a/Swiften/LinkLocal/DNSSDQuerier.cpp b/Swiften/LinkLocal/DNSSD/DNSSDQuerier.cpp index be87a3c..cc8d6ef 100644 --- a/Swiften/LinkLocal/DNSSDQuerier.cpp +++ b/Swiften/LinkLocal/DNSSD/DNSSDQuerier.cpp @@ -1,4 +1,4 @@ -#include "Swiften/LinkLocal/DNSSDQuerier.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDQuerier.h" namespace Swift { diff --git a/Swiften/LinkLocal/DNSSDQuerier.h b/Swiften/LinkLocal/DNSSD/DNSSDQuerier.h index 528a6ea..528a6ea 100644 --- a/Swiften/LinkLocal/DNSSDQuerier.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDQuerier.h diff --git a/Swiften/LinkLocal/DNSSDRegisterQuery.cpp b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.cpp index fe00b02..bbb8692 100644 --- a/Swiften/LinkLocal/DNSSDRegisterQuery.cpp +++ b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.cpp @@ -1,4 +1,4 @@ -#include "Swiften/LinkLocal/DNSSDRegisterQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h" namespace Swift { diff --git a/Swiften/LinkLocal/DNSSDRegisterQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h index 252fbf0..252fbf0 100644 --- a/Swiften/LinkLocal/DNSSDRegisterQuery.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h diff --git a/Swiften/LinkLocal/DNSSDResolveHostnameQuery.cpp b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.cpp index f7c88bd..e247e39 100644 --- a/Swiften/LinkLocal/DNSSDResolveHostnameQuery.cpp +++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.cpp @@ -1,4 +1,4 @@ -#include "Swiften/LinkLocal/DNSSDResolveHostnameQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h" namespace Swift { diff --git a/Swiften/LinkLocal/DNSSDResolveHostnameQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h index a2e218c..a2e218c 100644 --- a/Swiften/LinkLocal/DNSSDResolveHostnameQuery.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h diff --git a/Swiften/LinkLocal/DNSSDResolveServiceQuery.cpp b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.cpp index 83a9ccd..67a5d66 100644 --- a/Swiften/LinkLocal/DNSSDResolveServiceQuery.cpp +++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.cpp @@ -1,4 +1,4 @@ -#include "Swiften/LinkLocal/DNSSDResolveServiceQuery.h" +#include "Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h" namespace Swift { diff --git a/Swiften/LinkLocal/DNSSDResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h index d8b5cf1..d8b5cf1 100644 --- a/Swiften/LinkLocal/DNSSDResolveServiceQuery.h +++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h diff --git a/Swiften/LinkLocal/DNSSD/Makefile.inc b/Swiften/LinkLocal/DNSSD/Makefile.inc new file mode 100644 index 0000000..81beee0 --- /dev/null +++ b/Swiften/LinkLocal/DNSSD/Makefile.inc @@ -0,0 +1,12 @@ +SWIFTEN_SOURCES += \ + Swiften/LinkLocal/DNSSD/DNSSDQuerier.cpp \ + Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.cpp \ + Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.cpp \ + Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.cpp \ + Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.cpp + +ifeq ($(HAVE_BONJOUR),yes) +include Swiften/LinkLocal/DNSSD/Bonjour/Makefile.inc +endif +ifeq ($(HAVE_AVAHI),yes) +endif diff --git a/Swiften/LinkLocal/Makefile.inc b/Swiften/LinkLocal/Makefile.inc index 9522cbb..86a25fd 100644 --- a/Swiften/LinkLocal/Makefile.inc +++ b/Swiften/LinkLocal/Makefile.inc @@ -1,12 +1,7 @@ SWIFTEN_SOURCES += \ - Swiften/LinkLocal/DNSSDQuerier.cpp \ - Swiften/LinkLocal/DNSSDBrowseQuery.cpp \ - Swiften/LinkLocal/DNSSDRegisterQuery.cpp \ - Swiften/LinkLocal/DNSSDResolveServiceQuery.cpp \ - Swiften/LinkLocal/DNSSDResolveHostnameQuery.cpp \ Swiften/LinkLocal/DNSSDServiceFactory.cpp \ - Swiften/LinkLocal/PlatformDNSSDServiceFactory.cpp \ Swiften/LinkLocal/DNSSDService.cpp \ + Swiften/LinkLocal/PlatformDNSSDServiceFactory.cpp \ Swiften/LinkLocal/LinkLocalRoster.cpp \ Swiften/LinkLocal/LinkLocalServiceID.cpp \ Swiften/LinkLocal/LinkLocalServiceInfo.cpp \ @@ -17,8 +12,6 @@ SWIFTEN_SOURCES += \ ifeq ($(HAVE_BONJOUR),yes) SWIFTEN_SOURCES += \ - Swiften/LinkLocal/BonjourQuery.cpp \ - Swiften/LinkLocal/BonjourQuerier.cpp \ Swiften/LinkLocal/AppleDNSSDService.cpp endif ifeq ($(HAVE_AVAHI),yes) @@ -26,4 +19,5 @@ SWIFTEN_SOURCES += \ Swiften/LinkLocal/AvahiDNSSDService.cpp endif +include Swiften/LinkLocal/DNSSD/Makefile.inc include Swiften/LinkLocal/UnitTest/Makefile.inc |