Changeset 220

Timestamp:

08/04/08 23:25:23 (4 months ago)

Author:

zany

Message:

upgrading btkit

Location:

trunk/obexftp

Files:

• bt_kit.c (modified) (6 diffs)
• bt_kit.h (modified) (2 diffs)
• bt_kit_test.c (added)

trunk/obexftp/bt_kit.c

@@ -28 +28 @@
 #include <unistd.h>
 
-#ifndef _WIN32
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2bth.h>
+#define WSA_VER_MAJOR 2
+#define WSA_VER_MINOR 2
+#else
 #include <netinet/in.h>
 #include <sys/types.h>
@@ -37 +42 @@
 
 #include <common.h>
+
+
+/**
+        Nokia OBEX PC Suite Services.
+        binary representation of 00005005-0000-1000-8000-0002ee000001
+        \note prefer this over FTP on Series 60 devices
+ */
+#define __SVC_UUID_PCSUITE_bytes \
+{ 0x00, 0x00, 0x50, 0x05, \
+  0x00, 0x00, 0x10, 0x00, 0x80, 0x00, \
+  0x00, 0x02, 0xee, 0x00, 0x00, 0x01 }
+#define SVC_UUID_PCSUITE ((const uint8_t []) __SVC_UUID_PCSUITE_bytes)
+
+
+/**
+        Allocate and setup the network stack.
+
+        \note Needed for win32 winsock compatibility.
+ */
+int btkit_init()
+{
+#ifdef _WIN32
+        WORD wVersionRequired = MAKEWORD(WSA_VER_MAJOR,WSA_VER_MINOR);
+        WSADATA lpWSAData;
+        if (WSAStartup(wVersionRequired, &lpWSAData) != 0) {
+                DEBUG(2, "%s: WSAStartup failed (%d)\n", __func__, WSAGetLastError());
+                return -1;
+        }
+        if (LOBYTE(lpWSAData.wVersion) != WSA_VER_MAJOR ||
+            HIBYTE(lpWSAData.wVersion) != WSA_VER_MINOR) {
+                DEBUG(2, "%s: WSA version mismatch\n", __func__);
+                WSACleanup();
+                return -1;
+        }
+#endif /* _WIN32 */
+        return 0;
+}
+
+
+/**
+        Tear-down and free the network stack.
+
+        \note Needed for win32 winsock compatibility.
+ */
+int btkit_exit()
+{
+#ifdef _WIN32
+        if (WSACleanup() != 0) {
+                DEBUG(2, "%s: WSACleanup failed (%d)\n", __func__, WSAGetLastError());
+                return -1;
+        }
+#endif /* _WIN32 */
+        return 0;
+}
+
  
 #ifdef HAVE_BLUETOOTH
 
 #ifdef _WIN32
+//void baswap(bdaddr_t *dst, const bdaddr_t *src)
+//bdaddr_t *strtoba(const char *str)
+//char *batostr(const bdaddr_t *ba)
+
+/**
+        Implementation of ba2str for winsock2.
+ */
+int ba2str(const bdaddr_t *btaddr, char *straddr)
+{
+        /* WSAAddressToString() is not useful, it adds parentheses */
+        unsigned char *b = btaddr;
+        return sprintf(straddr, "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
+                b[7], b[6], b[5], b[4], b[3], b[2]);
+
+}
+
+
 /**
         Implementation of str2ba for winsock2.
  */
-int str2ba(const char *straddr, BTH_ADDR *btaddr)
+int str2ba(const char *straddr, bdaddr_t *btaddr)
 {
         int i;
         unsigned int aaddr[6];
-        BTH_ADDR tmpaddr = 0;
+        bdaddr_t tmpaddr = 0;
 
         if (sscanf(straddr, "%02x:%02x:%02x:%02x:%02x:%02x",
@@ -56 +133 @@
         *btaddr = 0;
         for (i = 0; i < 6; i++) {
-                tmpaddr = (BTH_ADDR) (aaddr[i] & 0xff);
+                tmpaddr = (bdaddr_t) (aaddr[i] & 0xff);
                 *btaddr = ((*btaddr) << 8) + tmpaddr;
         }
         return 0;
 }
-#endif /* _WIN32 */
+
+
+char **btkit_discover(const char *src)
+{
+        unsigned int ret;
+        WSAQUERYSET querySet;
+        char addressAsString[18];
+        char **res, **p;
+
+        memset(&querySet, 0, sizeof(querySet));
+        querySet.dwSize = sizeof(querySet);
+        querySet.dwNameSpace = NS_BTH;
+
+        HANDLE hLookup;
+        DWORD flags = LUP_CONTAINERS | LUP_FLUSHCACHE | LUP_RETURN_ADDR | LUP_RES_SERVICE;
+
+        ret = WSALookupServiceBegin(&querySet, flags, &hLookup);
+        if (ret != 0) {
+                DEBUG(2, "%s: WSALookupServiceBegin failed (%d)\n", __func__, WSAGetLastError());
+        }
+
+        p = res = calloc(15 + 1, sizeof(char *));
+        for (;;) {
+
+                BYTE buffer[1000];
+                DWORD bufferLength = sizeof(buffer);
+                WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer;
+
+                ret = WSALookupServiceNext(hLookup, flags, &bufferLength, pResults);
+                if (GetLastError() == WSA_E_NO_MORE) {
+                        break;
+                }
+                if (ret != 0) {
+                        DEBUG(2, "%s: WSALookupServiceNext failed (%d)\n", __func__, WSAGetLastError());
+                }
+
+                ba2str(pResults->lpcsaBuffer->RemoteAddr.lpSockaddr, addressAsString);
+                DEBUG(3, "%s: Found\t%s\n", __func__, addressAsString);
+                *p++ = strdup(addressAsString);
+        }
+
+        ret = WSALookupServiceEnd(hLookup);
+        if (ret != 0) {
+                DEBUG(2, "%s: WSALookupServiceEnd failed (%d)\n", __func__, WSAGetLastError());
+        }
+        return res;
+}
+
+
+char *btkit_getname(const char *src, const char *addr)
+{
+        unsigned int ret;
+        WSAQUERYSET querySet;
+        char addressAsString[18];
+        char *res = NULL;
+
+        memset(&querySet, 0, sizeof(querySet));
+        querySet.dwSize = sizeof(querySet);
+        querySet.dwNameSpace = NS_BTH;
+
+        HANDLE hLookup;
+        DWORD flags = LUP_CONTAINERS | LUP_FLUSHCACHE | LUP_RETURN_ADDR | LUP_RES_SERVICE;
+
+        ret = WSALookupServiceBegin(&querySet, flags, &hLookup);
+        if (ret != 0) {
+                DEBUG(2, "%s: WSALookupServiceBegin failed (%d)\n", __func__, WSAGetLastError());
+        }
+
+        for (;;) {
+
+                BYTE buffer[1000];
+                DWORD bufferLength = sizeof(buffer);
+                WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer;
+
+                ret = WSALookupServiceNext(hLookup, flags | LUP_RETURN_NAME, &bufferLength, pResults);
+                if (GetLastError() == WSA_E_NO_MORE) {
+                        break;
+                }
+                if (ret != 0) {
+                        DEBUG(2, "%s: WSALookupServiceNext failed (%d)\n", __func__, WSAGetLastError());
+                }
+
+                ba2str(pResults->lpcsaBuffer->RemoteAddr.lpSockaddr, addressAsString);
+                if (!strcmp(addressAsString, addr)) {
+                        DEBUG(3, "%s: Found\t%s\n", __func__, pResults->lpszServiceInstanceName);
+                        res = pResults->lpszServiceInstanceName;
+                        break;
+                }
+                DEBUG(3, "%s: Skipping\t%s\n", __func__, pResults->lpszServiceInstanceName);
+        }
+
+        ret = WSALookupServiceEnd(hLookup);
+        if (ret != 0) {
+                DEBUG(2, "%s: WSALookupServiceEnd failed (%d)\n", __func__, WSAGetLastError());
+        }
+        return res;
+}
+
+
+// http://msdn2.microsoft.com/en-us/library/aa362914.aspx
+int btkit_browse(const char *src, const char *addr, int svclass)
+{
+        unsigned int ret;
+        WSAQUERYSET querySet;
+        char addressAsString[20];
+        DWORD addressSize = sizeof(addressAsString);
+
+        memset(&querySet, 0, sizeof(querySet));
+        querySet.dwSize = sizeof(querySet);
+        querySet.dwNameSpace = NS_BTH;
+//      querySet.lpServiceClassId = RFCOMM;
+        querySet.lpszContext = addressAsString;
+
+        if (0 == WSAAddressToString(lpSockaddr, sizeof(bdaddr_t), NULL, addressAsString, &addressSize)) {
+                printf("search address: %s\n", addressAsString);
+        }
+
+        HANDLE hLookup;
+        DWORD flags = LUP_NOCONTAINERS | LUP_FLUSHCACHE | LUP_RETURN_ADDR | LUP_RES_SERVICE
+            | LUP_RETURN_NAME | LUP_RETURN_TYPE | LUP_RETURN_BLOB;
+
+        ret = WSALookupServiceBegin(&querySet, flags, &hLookup);
+        if (ret != 0) {
+                DEBUG(2, "%s: WSALookupServiceBegin failed (%d)\n", __func__, WSAGetLastError());
+        }
+
+        for (;;) {
+
+                BYTE buffer[1000];
+                DWORD bufferLength = sizeof(buffer);
+                WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer;
+
+                ret = WSALookupServiceNext(hLookup, flags, &bufferLength, pResults);
+                if (GetLastError() == WSA_E_NO_MORE) {
+                        break;
+                }
+                if (ret != 0) {
+                        DEBUG(2, "%s: WSALookupServiceNext failed (%d)\n", __func__, WSAGetLastError());
+                }
+
+                DEBUG(3, "%s: Found\t%s\n", __func__, pResults->lpszServiceInstanceName);
+        }
+
+        ret = WSALookupServiceEnd(hLookup);
+        if (ret != 0) {
+                DEBUG(2, "%s: WSALookupServiceEnd failed (%d)\n", __func__, WSAGetLastError());
+        }
+        return 0;
+}
+
+#else /* _WIN32 */
 
 #ifdef HAVE_SDPLIB /* should switch on OS here */
-
-/**
-        Nokia OBEX PC Suite Services.
-        binary representation of 00005005-0000-1000-8000-0002ee000001
-        \note prefer this over FTP on Series 60 devices
- */
-#define __SVC_UUID_PCSUITE_bytes \
-{ 0x00, 0x00, 0x50, 0x05, \
-  0x00, 0x00, 0x10, 0x00, 0x80, 0x00, \
-  0x00, 0x02, 0xee, 0x00, 0x00, 0x01 }
-#define SVC_UUID_PCSUITE ((const uint8_t []) __SVC_UUID_PCSUITE_bytes)
 
 
@@ -82 +298 @@
         \return an array of device addresses
  */
-// Win32 note: WSALookupServiceBegin for Device Inquiry
-// see http://msdn2.microsoft.com/en-us/library/aa362913.aspx
 char **btkit_discover(const char *src)
 {
@@ -216 +430 @@
  */
 // Win32 note:
-// WSALookupServiceBegin for Service Discovery
-// see http://msdn2.microsoft.com/en-us/library/aa362914.aspx
 // WSALookupServiceBegin( WSAQUERYSET with
+//  dwNameSpace = NS_BTH
 //  lpServiceClassId = RFCOMM
-//  dwNameSpace = NS_BTH
 //  lpszContext = WSAAddressToString  )
 // WSALookupServiceNext
@@ -450 +662 @@
 
 #endif /* HAVE_SDPLIB */
+#endif /* _WIN32 */
 
 #else

trunk/obexftp/bt_kit.h

@@ -58 +58 @@
 #define bacpy(dst,src)  memcpy((dst),(src),sizeof(BTH_ADDR))
 #define bacmp(a,b)      memcmp((a),(b),sizeof(BTH_ADDR))
+BTKITSYM int ba2str(const bdaddr_t *btaddr, char *straddr);
 BTKITSYM int str2ba(const char *straddr, BTH_ADDR *btaddr);
 
@@ -92 +93 @@
 #endif /* _WIN32 */
 
+/* library setup/teardown functions (needed for win32) */
+
+BTKITSYM int btkit_init();
+BTKITSYM int btkit_exit();
+
 /* additional functions */