Ticket #9: 600_win32_bluetooth.patch

(a) /dev/null vs. (b) openobex-anoncvs/lib/bluez_compat.h

@@ +1 @@
+
+/* Here are the defines that make it possible to
+ * implement bluetooth with the Bluez API
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef _WIN32
+/* you need the headers files from the Platform SDK */
+#include <winsock2.h>
+#include <ws2bth.h>
+#define bdaddr_t    BTH_ADDR
+#define sockaddr_rc _SOCKADDR_BTH
+#define rc_family   addressFamily
+#define rc_bdaddr   btAddr
+#define rc_channel  port
+#define PF_BLUETOOTH   PF_BTH
+#define AF_BLUETOOTH   PF_BLUETOOTH
+#define BTPROTO_RFCOMM BTHPROTO_RFCOMM
+#define BDADDR_ANY     (&(BTH_ADDR){BTH_ADDR_NULL})
+#define bacpy(dst,src) memcpy((dst),(src),sizeof(BTH_ADDR))
+#define bacmp(a,b)     memcmp((a),(b),sizeof(BTH_ADDR))
+
+#else /* _WIN32 */
+/* Linux/FreeBSD/NetBSD case */
+
+#if defined(HAVE_BLUETOOTH_LINUX)
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/rfcomm.h>
+
+#elif defined(HAVE_BLUETOOTH_FREEBSD)
+#include <bluetooth.h>
+#define sockaddr_rc sockaddr_rfcomm
+#define rc_family   rfcomm_family
+#define rc_bdaddr   rfcomm_bdaddr
+#define rc_channel  rfcomm_channel
+
+#elif defined(HAVE_BLUETOOTH_NETBSD)
+#include <bluetooth.h>
+#include <netbt/rfcomm.h>
+#define sockaddr_rc sockaddr_bt
+#define rc_family   bt_family
+#define rc_bdaddr   bt_bdaddr
+#define rc_channel  bt_channel
+#define BDADDR_ANY  NG_HCI_BDADDR_ANY
+
+#endif /* HAVE_BLUETOOTH_* */
+
+#endif /* _WIN32 */

openobex-anoncvs

@@ -45 +45 @@
 #include <errno.h>              /* errno and EADDRNOTAVAIL */
 #include <netinet/in.h>
 #include <sys/socket.h>
-
-#ifdef HAVE_BLUETOOTH_LINUX
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/rfcomm.h>
-#endif
-#ifdef HAVE_BLUETOOTH_FREEBSD
-#include <bluetooth.h>
-#define sockaddr_rc  sockaddr_rfcomm
-#define rc_family    rfcomm_family
-#define rc_bdaddr    rfcomm_bdaddr
-#define rc_channel   rfcomm_channel
-#endif
-#ifdef HAVE_BLUETOOTH_NETBSD
-#define rc_family    bt_family
-#define rc_bdaddr    bt_bdaddr
-#define rc_channel   bt_channel
-#define sockaddr_rc  sockaddr_bt
-#include <bluetooth.h>
-#include <netbt/rfcomm.h>
-#endif
-
 #endif /* _WIN32 */
 
 #include "obex_main.h"
@@ -79 +58 @@
  */
 void btobex_prepare_connect(obex_t *self, bdaddr_t *src, bdaddr_t *dst, uint8_t channel)
 {
-#ifndef _WIN32
         self->trans.self.rfcomm.rc_family = AF_BLUETOOTH;
         bacpy(&self->trans.self.rfcomm.rc_bdaddr, src);
         self->trans.self.rfcomm.rc_channel = 0;
@@ -87 +65 @@
         self->trans.peer.rfcomm.rc_family = AF_BLUETOOTH;
         bacpy(&self->trans.peer.rfcomm.rc_bdaddr, dst);
         self->trans.peer.rfcomm.rc_channel = channel;
-#endif /* _WIN32 */
 }
 
 /*
@@ -98 +75 @@
  */
 void btobex_prepare_listen(obex_t *self, bdaddr_t *src, uint8_t channel)
 {
-#ifndef _WIN32
         /* Bind local service */
         self->trans.self.rfcomm.rc_family = AF_BLUETOOTH;
         bacpy(&self->trans.self.rfcomm.rc_bdaddr, src);
         self->trans.self.rfcomm.rc_channel = channel;
-#endif /* _WIN32 */
 }
 
 /*
@@ -114 +89 @@
  */
 int btobex_listen(obex_t *self)
 {
-#ifndef _WIN32
         DEBUG(3, "\n");
 
         self->serverfd = obex_create_socket(self, AF_BLUETOOTH);
@@ -142 +116 @@
 out_freesock:
         obex_delete_socket(self, self->serverfd);
         self->serverfd = INVALID_SOCKET;
-#endif /* _WIN32 */
         return -1;
 }
 
@@ -156 +129 @@
  */
 int btobex_accept(obex_t *self)
 {
-#ifndef _WIN32
         socklen_t addrlen = sizeof(struct sockaddr_rc);
         //int mtu;
         //int len = sizeof(int);
@@ -170 +142 @@
         }
 
         self->trans.mtu = OBEX_DEFAULT_MTU;
-#endif /* _WIN32 */
         return 0;
 }
         
@@ -183 +154 @@
 int btobex_connect_request(obex_t *self)
 {
         int ret;
-#ifndef _WIN32
         int mtu = 0;
         //int len = sizeof(int);
 
@@ -220 +190 @@
 out_freesock:
         obex_delete_socket(self, self->fd);
         self->fd = INVALID_SOCKET;
-#endif /* _WIN32 */
         return ret;     
 }
 
@@ -233 +202 @@
 int btobex_disconnect_request(obex_t *self)
 {
         int ret;
-#ifndef _WIN32
         DEBUG(4, "\n");
         ret = obex_delete_socket(self, self->fd);
         if(ret < 0)
                 return ret;
         self->fd = INVALID_SOCKET;
-#endif /* _WIN32 */
         return ret;     
 }
 
@@ -254 +221 @@
 int btobex_disconnect_server(obex_t *self)
 {
         int ret;
-#ifndef _WIN32
         DEBUG(4, "\n");
         ret = obex_delete_socket(self, self->serverfd);
         self->serverfd = INVALID_SOCKET;
-#endif /* _WIN32 */
         return ret;     
 }
 

openobex-anoncvs

@@ -30 +30 @@
 #ifndef BTOBEX_H
 #define BTOBEX_H
 
+#include "bluez_compat.h"
+
 void btobex_prepare_connect(obex_t *self, bdaddr_t *src, bdaddr_t *dst, uint8_t channel);
 void btobex_prepare_listen(obex_t *self, bdaddr_t *src, uint8_t channel);
 int btobex_listen(obex_t *self);

openobex-anoncvs

@@ -43 +43 @@
 #ifdef DLL_EXPORT
 #define LIB_SYMBOL __declspec(dllexport)
 #endif
+static unsigned long wsa_init = 0;
+#define WSA_VER_MAJOR 2
+#define WSA_VER_MINOR 2
 
 #else /* _WIN32 */
 #include <fcntl.h>
@@ -63 +66 @@
 #include "obex_client.h"
 
 #include "inobex.h"
+
 #ifdef HAVE_IRDA
 #include "irobex.h"
 #endif
+
 #ifdef HAVE_USB
 #include "usbobex.h"
 #endif
+
 #ifdef HAVE_BLUETOOTH
 #include "btobex.h"
-#ifdef HAVE_BLUETOOTH_FREEBSD
-#define BDADDR_ANY  NG_HCI_BDADDR_ANY
-#endif
 #else
 // This is to workaround compilation without Bluetooth support. - Jean II
 typedef char *bdaddr_t;
@@ -126 +129 @@
         obex_return_val_if_fail(eventcb != NULL, NULL);
 
 #ifdef _WIN32
-        {
-                WSADATA WSAData;
-                if (WSAStartup (MAKEWORD(2,0), &WSAData) != 0) {
-                        DEBUG(4, "WSAStartup failed\n");
-                        return NULL;
-                }
-        }
+        if (!wsa_init) {
+                WORD ver = MAKEWORD(WSA_VER_MAJOR,WSA_VER_MINOR);
+                WSADATA WSAData;
+                if (WSAStartup (ver, &WSAData) != 0) {
+                        DEBUG(4, "WSAStartup failed (%d)\n",WSAGetLastError());
+                        return NULL;
+                }
+                if (LOBYTE(WSAData.wVersion) != WSA_VER_MAJOR ||
+                    HIBYTE(WSAData.wVersion) != WSA_VER_MINOR) {
+                        DEBUG(4, "WSA version mismatch\n");
+                        WSACleanup();
+                        return NULL;
+                }
+        }
+        ++wsa_init;
 #endif
 
         self = malloc(sizeof(obex_t));

openobex-anoncvs

@@ -64 +64 @@
         ])
 ])
 
+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([
@@ -85 +97 @@
 ])
 
 AC_DEFUN([AC_PATH_BLUEZ], [
-        PKG_CHECK_MODULES(BLUEZ, bluez, bluez_found=yes, AC_MSG_RESULT(no))
-        AC_SUBST(BLUEZ_CFLAGS)
-        AC_SUBST(BLUEZ_LIBS)
+        PKG_CHECK_MODULES(BLUETOOTH, bluez, bluez_found=yes, AC_MSG_RESULT(no))
 ])
 
 AC_DEFUN([AC_PATH_BLUETOOTH], [
@@ -101 +111 @@
         *-*-netbsd*)
                 AC_PATH_NETBSDBT
                 ;;
+        *-*-mingw32*)
+                AC_PATH_WINBT
+                ;;
         esac
+        AC_SUBST(BLUETOOTH_CFLAGS)
+        AC_SUBST(BLUETOOTH_LIBS)
 ])
 
 AC_DEFUN([AC_PATH_USB], [
@@ -200 +215 @@
                 AC_DEFINE(HAVE_IRDA, 1, [Define if system supports IrDA and it's enabled])
         fi
 
+        if (test "${bluetooth_enable}" = "yes" && test "${winbt_found}" = "yes"); then
+                AC_DEFINE(HAVE_BLUETOOTH, 1, [Define if system supports Bluetooth and it's enabled])
+        fi
+
         if (test "${bluetooth_enable}" = "yes" && test "${netbsdbt_found}" = "yes"); then
                 AC_DEFINE(HAVE_BLUETOOTH, 1, [Define if system supports Bluetooth and it's enabled])
                 AC_DEFINE(HAVE_BLUETOOTH_NETBSD, 1, [Define if system supports Bluetooth stack for NetBSD])

apps/Makefile.am

@@ -14 +14 @@
         obex_test_server.c obex_test_server.h \
         obex_test_cable.c obex_test_cable.h
 
-obex_test_LDADD = $(top_builddir)/lib/libopenobex.la @BLUEZ_LIBS@ libmisc.a
+obex_test_LDADD = $(top_builddir)/lib/libopenobex.la @BLUETOOTH_LIBS@ libmisc.a
 
 LDADD = $(top_builddir)/lib/libopenobex.la libmisc.a
 
-INCLUDES = @BLUEZ_CFLAGS@ -I$(top_builddir)/include
+INCLUDES = @BLUETOOTH_CFLAGS@ -I$(top_builddir)/include
 endif
 
 MAINTAINERCLEANFILES = Makefile.in

lib/obex_transport.h

@@ -41 +41 @@
 #include "irda_wrap.h"
 #endif /*HAVE_IRDA*/
 #ifdef HAVE_BLUETOOTH
-#ifdef HAVE_BLUETOOTH_LINUX
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/rfcomm.h>
-#endif
-#ifdef HAVE_BLUETOOTH_FREEBSD
-#include <bluetooth.h>
-#define sockaddr_rc  sockaddr_rfcomm
-#endif
-#ifdef HAVE_BLUETOOTH_NETBSD
-#include <bluetooth.h>
-#include <netbt/rfcomm.h>
-#endif
+#include "bluez_compat.h"
 #endif /*HAVE_BLUETOOTH*/
 #ifdef HAVE_USB
 #include "usbobex.h"
@@ -66 +55 @@
 #endif /*HAVE_IRDA*/
         struct sockaddr_in6  inet6;
 #ifdef HAVE_BLUETOOTH
-#ifdef HAVE_BLUETOOTH_LINUX
         struct sockaddr_rc   rfcomm;
-#endif
-#ifdef HAVE_BLUETOOTH_NETBSD
-        struct sockaddr_bt   rfcomm;
-#endif
 #endif /*HAVE_BLUETOOTH*/
 #ifdef HAVE_USB
         struct obex_usb_intf_transport_t usb;

openobex-anoncvs

@@ -60 +60 @@
 typedef void* obex_object_t;
 typedef void (*obex_event_t)(obex_t *handle, obex_object_t *obj, int mode, int event, int obex_cmd, int obex_rsp);
 // This is to workaround compilation without Bluetooth support. - Jean II
-#ifndef SOL_RFCOMM
-typedef char* bdaddr_t;
-#endif
 
 #include <openobex/obex_const.h>
 
@@ -146 +143 @@
 /*
  * Bluetooth OBEX API
  */
+#ifdef SOL_RFCOMM
+#ifdef _WIN32
+#define bdaddr_t BTH_ADDR
+#endif
 LIB_SYMBOL int BtOBEX_ServerRegister(obex_t *self, bdaddr_t *src, uint8_t channel);
 LIB_SYMBOL int BtOBEX_TransportConnect(obex_t *self, bdaddr_t *src, bdaddr_t *dst, uint8_t channel);
+#endif
 
 /*
  * OBEX File API

lib/obex_main.c

@@ -45 +45 @@
 #include <sys/types.h>
 #include <stdio.h>
 
+#endif /* _WIN32 */
+
 #ifdef HAVE_BLUETOOTH
-#ifdef HAVE_BLUETOOTH_LINUX
-#include <bluetooth/bluetooth.h>
-#endif
-#ifdef HAVE_BLUETOOTH_FREEBSD
-#include <bluetooth.h>
-#define BTPROTO_RFCOMM  BLUETOOTH_PROTO_RFCOMM
-#endif
-#ifdef HAVE_BLUETOOTH_NETBSB
-#include <bluetooth.h>
-#endif
+#include "bluez_compat.h"
 #endif /*HAVE_BLUETOOTH*/
 
-#endif /* _WIN32 */
-
 #include "obex_main.h"
 #include "obex_header.h"
 #include "obex_server.h"