feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

zeroconf: set exports consistently

Browse Source 
Fixes build on windows.

Change-Id: I46d918aa9e22843f073f0ebae05dc4da2b701834
Reviewed-on: http://codereview.qt-project.org/6366
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Fawzi Mohamed
2011-10-10 19:21:00 +02:00
committed by Robert Löhning
parent a3d0b084a5
commit 8538459e6d
3 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/libs/zeroconf/nativeLib.cpp
View File

@@ -155,42 +155,42 @@ public:
if (m_refSockFD == 0) qDebug() << QLatin1String("NativeZConfLib.m_refSockFD == 0"); if (m_refSockFD == 0) qDebug() << QLatin1String("NativeZConfLib.m_refSockFD == 0");
} }
virtual ~NativeZConfLib() { ~NativeZConfLib() {
} }
virtual QString name(){ QString name(){
return QString::fromUtf8("NativeZeroConfLib@%1").arg(size_t(this),0,16); return QString::fromUtf8("NativeZeroConfLib@%1").arg(size_t(this),0,16);
} }
// virtual bool tryStartDaemon(); // virtual bool tryStartDaemon();
virtual void refDeallocate(DNSServiceRef sdRef) { void refDeallocate(DNSServiceRef sdRef) {
if (m_refDeallocate == 0) return; if (m_refDeallocate == 0) return;
m_refDeallocate(sdRef); m_refDeallocate(sdRef);
} }
virtual DNSServiceErrorType resolve(DNSServiceRef *sdRef, DNSServiceFlags flags, DNSServiceErrorType resolve(DNSServiceRef *sdRef, DNSServiceFlags flags,
uint32_t interfaceIndex, const char *name, uint32_t interfaceIndex, const char *name,
const char *regtype, const char *domain, const char *regtype, const char *domain,
DNSServiceResolveReply callBack, void *context) DNSServiceResolveReply callBack, void *context)
{ {
if (m_resolve == 0) return kDNSServiceErr_Unsupported; if (m_resolve == 0) return kDNSServiceErr_Unsupported;
return m_resolve(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context); return m_resolve(sdRef, flags, interfaceIndex, name, regtype, domain, callBack, context);
} }
virtual DNSServiceErrorType queryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags, DNSServiceErrorType queryRecord(DNSServiceRef *sdRef, DNSServiceFlags flags,
uint32_t interfaceIndex, const char *fullname, uint32_t interfaceIndex, const char *fullname,
uint16_t rrtype, uint16_t rrclass, uint16_t rrtype, uint16_t rrclass,
DNSServiceQueryRecordReply callBack, void *context) DNSServiceQueryRecordReply callBack, void *context)
{ {
if (m_queryRecord == 0) return kDNSServiceErr_Unsupported; if (m_queryRecord == 0) return kDNSServiceErr_Unsupported;
return m_queryRecord(sdRef, flags, interfaceIndex, fullname, return m_queryRecord(sdRef, flags, interfaceIndex, fullname,
rrtype, rrclass, callBack, context); rrtype, rrclass, callBack, context);
} }
virtual DNSServiceErrorType getAddrInfo(DNSServiceRef *sdRef, DNSServiceFlags flags, DNSServiceErrorType getAddrInfo(DNSServiceRef *sdRef, DNSServiceFlags flags,
uint32_t interfaceIndex, DNSServiceProtocol protocol, uint32_t interfaceIndex, DNSServiceProtocol protocol,
const char *hostname, DNSServiceGetAddrInfoReply callBack, const char *hostname, DNSServiceGetAddrInfoReply callBack,
void *context) void *context)
{ {
enum { longTTL = 100 }; enum { longTTL = 100 };
if (m_getAddrInfo == 0) { if (m_getAddrInfo == 0) {
@@ -220,60 +220,60 @@ public:
hostname, callBack, context); hostname, callBack, context);
} }
virtual uint16_t txtRecordGetCount(uint16_t txtLen, const void *txtRecord) uint16_t txtRecordGetCount(uint16_t txtLen, const void *txtRecord)
{ {
if (m_txtRecordGetCount == 0) return 0; if (m_txtRecordGetCount == 0) return 0;
return m_txtRecordGetCount(txtLen, txtRecord); return m_txtRecordGetCount(txtLen, txtRecord);
} }
virtual DNSServiceErrorType txtRecordGetItemAtIndex(uint16_t txtLen, const void *txtRecord, DNSServiceErrorType txtRecordGetItemAtIndex(uint16_t txtLen, const void *txtRecord,
uint16_t itemIndex, uint16_t keyBufLen, uint16_t itemIndex, uint16_t keyBufLen,
char *key, uint8_t *valueLen, const void **value) char *key, uint8_t *valueLen, const void **value)
{ {
if (m_txtRecordGetItemAtIndex == 0) return kDNSServiceErr_Unsupported; if (m_txtRecordGetItemAtIndex == 0) return kDNSServiceErr_Unsupported;
return m_txtRecordGetItemAtIndex(txtLen, txtRecord, itemIndex, keyBufLen, return m_txtRecordGetItemAtIndex(txtLen, txtRecord, itemIndex, keyBufLen,
key, valueLen, value); key, valueLen, value);
} }
virtual DNSServiceErrorType reconfirmRecord(DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType reconfirmRecord(DNSServiceFlags flags, uint32_t interfaceIndex,
const char *fullname, uint16_t rrtype, const char *fullname, uint16_t rrtype,
uint16_t rrclass, uint16_t rdlen, const void *rdata) uint16_t rrclass, uint16_t rdlen, const void *rdata)
{ {
if (m_reconfirmRecord == 0) return kDNSServiceErr_Unsupported; if (m_reconfirmRecord == 0) return kDNSServiceErr_Unsupported;
return m_reconfirmRecord(flags, interfaceIndex, fullname, rrtype, return m_reconfirmRecord(flags, interfaceIndex, fullname, rrtype,
rrclass, rdlen, rdata); rrclass, rdlen, rdata);
} }
virtual DNSServiceErrorType browse(DNSServiceRef *sdRef, DNSServiceFlags flags, DNSServiceErrorType browse(DNSServiceRef *sdRef, DNSServiceFlags flags,
uint32_t interfaceIndex, const char *regtype, uint32_t interfaceIndex, const char *regtype,
const char *domain, DNSServiceBrowseReply callBack, const char *domain, DNSServiceBrowseReply callBack,
void *context) void *context)
{ {
if (m_browse == 0) return kDNSServiceErr_Unsupported; if (m_browse == 0) return kDNSServiceErr_Unsupported;
return m_browse(sdRef, flags, interfaceIndex, regtype, domain, callBack, context); return m_browse(sdRef, flags, interfaceIndex, regtype, domain, callBack, context);
} }
virtual DNSServiceErrorType getProperty(const char *property, // Requested property (i.e. kDNSServiceProperty_DaemonVersion) DNSServiceErrorType getProperty(const char *property, // Requested property (i.e. kDNSServiceProperty_DaemonVersion)
void *result, // Pointer to place to store result void *result, // Pointer to place to store result
uint32_t *size // size of result location uint32_t *size // size of result location
) )
{ {
if (m_getProperty == 0) if (m_getProperty == 0)
return kDNSServiceErr_Unsupported; return kDNSServiceErr_Unsupported;
return m_getProperty(property, result, size); return m_getProperty(property, result, size);
} }
virtual DNSServiceErrorType processResult(DNSServiceRef sdRef) { DNSServiceErrorType processResult(DNSServiceRef sdRef) {
if (m_processResult == 0) return kDNSServiceErr_Unsupported; if (m_processResult == 0) return kDNSServiceErr_Unsupported;
return m_processResult(sdRef); return m_processResult(sdRef);
} }
virtual DNSServiceErrorType createConnection(DNSServiceRef *sdRef) { DNSServiceErrorType createConnection(DNSServiceRef *sdRef) {
if (m_createConnection == 0) return kDNSServiceErr_Unsupported; if (m_createConnection == 0) return kDNSServiceErr_Unsupported;
return m_createConnection(sdRef); return m_createConnection(sdRef);
} }
virtual int refSockFD(DNSServiceRef sdRef) { int refSockFD(DNSServiceRef sdRef) {
if (m_refSockFD == 0) return kDNSServiceErr_Unsupported; if (m_refSockFD == 0) return kDNSServiceErr_Unsupported;
return m_refSockFD(sdRef); return m_refSockFD(sdRef);
} }

74
src/libs/zeroconf/servicebrowser.cpp
View File

@@ -125,16 +125,16 @@ int fromFullNameC(const char * const fullName, QString &service, QString &regtyp
// ----------------- C callbacks ----------------- // ----------------- C callbacks -----------------
extern "C" void cServiceResolveReply(DNSServiceRef sdRef, extern "C" void DNSSD_API cServiceResolveReply(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
DNSServiceErrorType errorCode, DNSServiceErrorType errorCode,
const char *fullname, const char *fullname,
const char *hosttarget, const char *hosttarget,
uint16_t port, /* In network byte order */ uint16_t port, /* In network byte order */
uint16_t txtLen, uint16_t txtLen,
const unsigned char *txtRecord, const unsigned char *txtRecord,
void *context) void *context)
{ {
if (DEBUG_SERVICEBROWSER) if (DEBUG_SERVICEBROWSER)
qDebug() << "cServiceResolveReply(" << ((size_t)sdRef) << ", " << ((quint32)flags) << ", " << interfaceIndex qDebug() << "cServiceResolveReply(" << ((size_t)sdRef) << ", " << ((quint32)flags) << ", " << interfaceIndex
@@ -146,17 +146,17 @@ extern "C" void cServiceResolveReply(DNSServiceRef sdRef,
} }
} }
extern "C" void cTxtRecordReply(DNSServiceRef sdRef, extern "C" void DNSSD_API cTxtRecordReply(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
DNSServiceErrorType errorCode, DNSServiceErrorType errorCode,
const char *fullname, const char *fullname,
uint16_t rrtype, uint16_t rrtype,
uint16_t rrclass, uint16_t rrclass,
uint16_t rdlen, uint16_t rdlen,
const void *rdata, const void *rdata,
uint32_t ttl, uint32_t ttl,
void *context) void *context)
{ {
if (DEBUG_SERVICEBROWSER) if (DEBUG_SERVICEBROWSER)
qDebug() << "cTxtRecordReply(" << ((size_t)sdRef) << ", " << ((int)flags) << ", " << interfaceIndex qDebug() << "cTxtRecordReply(" << ((size_t)sdRef) << ", " << ((int)flags) << ", " << interfaceIndex
@@ -168,14 +168,14 @@ extern "C" void cTxtRecordReply(DNSServiceRef sdRef,
} }
} }
extern "C" void cAddrReply(DNSServiceRef sdRef, extern "C" void DNSSD_API cAddrReply(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
DNSServiceErrorType errorCode, DNSServiceErrorType errorCode,
const char *hostname, const char *hostname,
const struct sockaddr *address, const struct sockaddr *address,
uint32_t ttl, uint32_t ttl,
void *context) void *context)
{ {
if (DEBUG_SERVICEBROWSER) if (DEBUG_SERVICEBROWSER)
qDebug() << "cAddrReply(" << ((size_t)sdRef) << ", " << ((int)flags) << ", " << interfaceIndex qDebug() << "cAddrReply(" << ((size_t)sdRef) << ", " << ((int)flags) << ", " << interfaceIndex
@@ -188,14 +188,14 @@ extern "C" void cAddrReply(DNSServiceRef sdRef,
} }
/// callback for service browsing /// callback for service browsing
extern "C" void cBrowseReply(DNSServiceRef sdRef, extern "C" void DNSSD_API cBrowseReply(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
DNSServiceErrorType errorCode, DNSServiceErrorType errorCode,
const char *serviceName, const char *serviceName,
const char *regtype, const char *regtype,
const char *replyDomain, const char *replyDomain,
void *context) void *context)
{ {
if (DEBUG_SERVICEBROWSER) if (DEBUG_SERVICEBROWSER)
qDebug() << "cBrowseReply(" << ((size_t)sdRef) << ", " << flags << ", " << interfaceIndex qDebug() << "cBrowseReply(" << ((size_t)sdRef) << ", " << flags << ", " << interfaceIndex

8
src/libs/zeroconf/servicebrowser_p.h
View File

@@ -74,10 +74,10 @@ public:
DNSServiceGetAddrInfoReply callBack, void *context) = 0; DNSServiceGetAddrInfoReply callBack, void *context) = 0;
// remove txt functions from lib and always embed? // remove txt functions from lib and always embed?
virtual uint16_t DNSSD_API txtRecordGetCount(uint16_t txtLen, const void *txtRecord) = 0; virtual uint16_t txtRecordGetCount(uint16_t txtLen, const void *txtRecord) = 0;
virtual DNSServiceErrorType DNSSD_API txtRecordGetItemAtIndex(uint16_t txtLen, const void *txtRecord, virtual DNSServiceErrorType txtRecordGetItemAtIndex(uint16_t txtLen, const void *txtRecord,
uint16_t itemIndex, uint16_t keyBufLen, char *key, uint16_t itemIndex, uint16_t keyBufLen, char *key,
uint8_t *valueLen, const void **value) = 0; uint8_t *valueLen, const void **value) = 0;
virtual DNSServiceErrorType reconfirmRecord(DNSServiceFlags flags, uint32_t interfaceIndex, virtual DNSServiceErrorType reconfirmRecord(DNSServiceFlags flags, uint32_t interfaceIndex,
const char *fullname, uint16_t rrtype, uint16_t rrclass, const char *fullname, uint16_t rrtype, uint16_t rrclass,