Changeset 158 for trunk

Timestamp:

06/05/07 01:19:46 (18 months ago)

Author:

zany

Message:

enabling bt on win32

Location:

trunk

Files:

• acinclude.m4 (modified) (2 diffs)
• apps/obexftpd.c (modified) (2 diffs)
• configure.in (modified) (1 diff)
• obexftp/client.c (modified) (5 diffs)

trunk/acinclude.m4

@@ -41 +41 @@
 dnl
 
+AC_DEFUN([AC_PATH_WINBT], [ 
+        AC_CACHE_VAL(winbt_found,[ 
+                AC_CHECK_HEADERS(ws2bth.h, winbt_found=yes, winbt_found=no, [ 
+                                #include <winsock2.h> 
+                ]) 
+        ]) 
+        AC_MSG_CHECKING([for Windows Bluetooth support]) 
+        AC_MSG_RESULT([$winbt_found]) 
+])
+
+AC_DEFUN([AC_PATH_NETBSDBT], [
+        AC_CACHE_CHECK([for NetBSD Bluetooth support], netbsdbt_found, [
+                AC_TRY_COMPILE([
+                                #include <bluetooth.h>
+                        ], [
+                                struct sockaddr_bt *bt;
+                        ], netbsdbt_found=yes, netbsdbt_found=no)
+        ])
+])
+
+AC_DEFUN([AC_PATH_FREEBSDBT], [
+        AC_CACHE_CHECK([for FreeBSD Bluetooth support], freebsdbt_found, [
+                AC_TRY_COMPILE([
+                                #include <bluetooth.h>
+                        ], [
+                                struct sockaddr_rfcomm *rfcomm;
+                        ], freebsdbt_found=yes, freebsdbt_found=no)
+        ])
+])
+
+AC_DEFUN([AC_PATH_BLUEZ], [
+        PKG_CHECK_MODULES(BLUETOOTH, bluez, bluez_found=yes, AC_MSG_RESULT(no)) 
+])
+
+AC_DEFUN([AC_PATH_BLUETOOTH], [
+        case $host in
+        *-*-linux*)
+                AC_PATH_BLUEZ
+                ;;
+        *-*-freebsd*)
+                AC_PATH_FREEBSDBT
+                ;;
+        *-*-netbsd*)
+                AC_PATH_NETBSDBT
+                ;;
+        *-*-mingw32*) 
+                AC_PATH_WINBT 
+                ;;
+        esac
+        AC_SUBST(BLUETOOTH_CFLAGS)
+        AC_SUBST(BLUETOOTH_LIBS)
+])
+
 AC_DEFUN([BLUETOOTH_CHECK],[  
 AC_ARG_ENABLE([bluetooth],
@@ -48 +101 @@
 
 if test "$ac_bluetooth_enabled" = yes; then
-        AC_CACHE_CHECK([for Bluetooth support], am_cv_bluetooth_found,[
-
-                AC_TRY_COMPILE([
-                                #ifdef __FreeBSD__
-                                #include <sys/types.h>
-                                #include <bluetooth.h>
-                                #else /* Linux */
-                                #include <sys/socket.h>
-                                #include <bluetooth/bluetooth.h>
-                                #include <bluetooth/rfcomm.h>
-                                #endif
-                        ],[
-                                #ifdef __FreeBSD__
-                                bdaddr_t bdaddr;
-                                struct sockaddr_rfcomm addr;
-                                #else /* Linux */
-                                bdaddr_t bdaddr;
-                                struct sockaddr_rc addr;
-                                #endif
-                        ],
-                                am_cv_bluetooth_found=yes,
-                                am_cv_bluetooth_found=no)])
-        if test $am_cv_bluetooth_found = yes; then
+        AC_PATH_BLUETOOTH
+        if test "${netbsdbt_found}" = "yes" -o "${freebsdbt_found}" = "yes" -o "${bluez_found}" = "yes" -o "${winbt_found}" = "yes"; then
                 AC_DEFINE([HAVE_BLUETOOTH], [1], [Define if system supports Bluetooth and it's enabled])
-                BLUETOOTH_CFLAGS=""
-                BLUETOOTH_LIBS="-lbluetooth"
         fi
-        AC_SUBST(BLUETOOTH_CFLAGS)
-        AC_SUBST(BLUETOOTH_LIBS)
 fi
 ])

trunk/apps/obexftpd.c

@@ -26 +26 @@
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define _GNU_SOURCE
 #include <stdio.h>
@@ -40 +44 @@
 #ifdef _WIN32
 #include <winsock2.h>
+#ifdef HAVE_BLUETOOTH
+#include <ws2bth.h>
+#define bdaddr_t        BTH_ADDR
+#define BDADDR_ANY      BTH_ADDR_NULL
+#endif
 #define S_IRGRP 0
 #define S_IROTH 0

trunk/configure.in

@@ -33 +33 @@
 dnl IRDA_CHECK
 BLUETOOTH_CHECK
-if test $am_cv_bluetooth_found = yes; then
+if test "${bluez_found}" = "yes"; then
         SDPLIB_CHECK
 fi

trunk/obexftp/client.c

@@ -51 +51 @@
 
 #ifdef HAVE_BLUETOOTH
+#ifdef _WIN32
+#include <ws2bth.h>
+#define bdaddr_t        BTH_ADDR
+#define BDADDR_ANY      BTH_ADDR_NULL
+#define bacpy(dst,src)  memcpy((dst),(src),sizeof(BTH_ADDR))
+#else /* _WIN32 */
+
 #ifdef __FreeBSD__
 #include <sys/types.h>
@@ -60 +67 @@
 #include <bluetooth/hci_lib.h>
 #endif /* __FreeBSD__ */
-#endif
+
+#endif /* _WIN32 */
+#endif /* HAVE_BLUETOOTH */
 
 #include <openobex/obex.h>
@@ -81 +90 @@
 } __attribute__((packed)) apparam_t;
 
+#ifdef _WIN32
+#ifdef HAVE_BLUETOOTH
+static int str2ba(const char *straddr, BTH_ADDR *btaddr)
+{
+        int i;
+        unsigned int aaddr[6];
+        BTH_ADDR tmpaddr = 0;
+
+        if (sscanf(straddr, "%02x:%02x:%02x:%02x:%02x:%02x",
+                   &aaddr[0], &aaddr[1], &aaddr[2], &aaddr[3], &aaddr[4], &aaddr[5]) != 6)
+                return 1;
+        *btaddr = 0;
+        for (i = 0; i < 6; i++) {
+                tmpaddr = (BTH_ADDR) (aaddr[i] & 0xff);
+                *btaddr = ((*btaddr) << 8) + tmpaddr;
+        }
+        return 0;
+}
+#endif
+#endif
 
 static void dummy_info_cb(int UNUSED(event), const char *UNUSED(msg), int UNUSED(len), void *UNUSED(data))
@@ -555 +584 @@
                         peer.sin_family = AF_INET;
                         peer.sin_port = htons(port); /* overridden with OBEX_PORT 650 anyhow */
-                        ret = OBEX_TransportConnect(cli->obexhandle, (struct sockaddr *) &peer,
+                        ret = InOBEX_TransportConnect(cli->obexhandle, (struct sockaddr *) &peer,
                                                   sizeof(struct sockaddr_in));
                         DEBUG(3, "%s() TCP %d\n", __func__, ret);
@@ -581 +610 @@
                         str2ba(src, &src_addr);
                         hci_id = atoi(src);
+#ifndef _WIN32
                         if (hci_id > 0) {
                                 hci_devba(hci_id, &src_addr);   
                         }
+#endif
                 }
                 if (!device) {