e7397de52a
20111221 - 1.31.0 [-] * Fixed compilation with latest libusb. [-] * Improved error handling in SQL backend of SMSD. [-] * SMSD documentation improvements. [-] * Indonesian translation updates. 20111213 - 1.30.92 [-] * Improved vCard parser to better handle location for various fields, thanks to Vladimir Serbinenko for initial patch. [-] * Fixed reading calls from some Nokia phones (bug #1553). [-] * Improved text mode SMS parsing in AT driver, thanks to Vladimir Serbinenko. [-] * Use glib's MD5 implementation if available. 20111129 - 1.30.91 [+] * Improved documentation for configuring Gammu. [-] * Fixed parsing birthday from vCard in some cases. [+] * Added option not to use configured logging in SMSD inject and monitor (bug #1539). [+] * Added SMSD configuration LogFacility (bug #1539). [-] * Fixed reading of data from OBEX phones (LP#891803). [-] * Fixed double reply detection (bug #1544). [-] * Increase maximal number of caller groups (bug #1541). [-] * Cancel all calls on maketerminated call if we don't get call ID. [-] * Fixed SMSC handling in some cases in SMSD (bug #1547). 20111107 - 1.30.90 [-] * Various documentation improvements. [-] * Detect Alcatel style reply on CPIN response (bug #1502). [-] * Fix build on some Win32 systems (bug #1496). [-] * Make jadmaker handle names with spaces (Rapha\xc3\xabl Droz). [-] * Display 8-bit messages in hex (Nicolas Pitre). [-] * Do not use AT+CUSD=2 on some phones (bug #1508). [-] * Fixed gammu-monitor with Windows service (bug #1515). [-] * Cleanup of contrib directory. [-] * Better support for Samsung AT phones (bug #1513). [-] * Fixed handling of MMS notification SMSes (bug #1530). [-] * Fixed CPIN reply handling (bug #1532). [+] * SMSD checks for PIN status just after connect (bug #1532). [-] * Fixed various MSVC compilation issues.
66 lines
2.1 KiB
Text
66 lines
2.1 KiB
Text
--- libgammu/device/bluetoth/bluez.c.orig 2011-12-21 17:25:37.000000000 +0400
|
|
+++ libgammu/device/bluetoth/bluez.c 2011-12-23 15:05:14.498122134 +0400
|
|
@@ -23,6 +23,8 @@
|
|
#ifdef GSM_ENABLE_BLUETOOTHDEVICE
|
|
#ifdef BLUEZ_FOUND
|
|
|
|
+#define BDADDR_ANY NG_HCI_BDADDR_ANY
|
|
+
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <fcntl.h>
|
|
@@ -31,11 +33,7 @@
|
|
#include <sys/socket.h>
|
|
#include <sys/time.h>
|
|
#include <unistd.h>
|
|
-#include <bluetooth/bluetooth.h>
|
|
-#include <bluetooth/rfcomm.h>
|
|
-#include <bluetooth/sdp.h>
|
|
-#include <bluetooth/sdp_lib.h>
|
|
-#include <bluetooth/hci_lib.h>
|
|
+#include <bluetooth.h>
|
|
|
|
#include "../../gsmcomon.h"
|
|
#include "../devfunc.h"
|
|
@@ -48,7 +46,7 @@ GSM_Error bluetooth_connect(GSM_StateMac
|
|
/* Some phones need time till they are accessible after SDP browsing */
|
|
for (tries = 0; tries < 5; tries++) {
|
|
GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
|
|
- struct sockaddr_rc laddr, raddr;
|
|
+ struct sockaddr_rfcomm laddr, raddr;
|
|
bdaddr_t bdaddr;
|
|
int fd;
|
|
|
|
@@ -61,15 +59,15 @@ GSM_Error bluetooth_connect(GSM_StateMac
|
|
|
|
smprintf(s, "Connecting to RF channel %i\n", port);
|
|
|
|
- fd = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
|
|
+ fd = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
|
|
if (fd < 0) {
|
|
smprintf(s, "Can't create socket\n");
|
|
continue;
|
|
}
|
|
|
|
- bacpy(&laddr.rc_bdaddr, BDADDR_ANY);
|
|
- laddr.rc_family = AF_BLUETOOTH;
|
|
- laddr.rc_channel = 0;
|
|
+ bacpy(&laddr.rfcomm_bdaddr, BDADDR_ANY);
|
|
+ laddr.rfcomm_family = AF_BLUETOOTH;
|
|
+ laddr.rfcomm_channel = 0;
|
|
|
|
if (bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)) < 0) {
|
|
smprintf(s, "Can't bind socket (%d, %s)\n", errno, strerror(errno));
|
|
@@ -78,9 +76,9 @@ GSM_Error bluetooth_connect(GSM_StateMac
|
|
}
|
|
|
|
str2ba(device, &bdaddr);
|
|
- bacpy(&raddr.rc_bdaddr, &bdaddr);
|
|
- raddr.rc_family = AF_BLUETOOTH;
|
|
- raddr.rc_channel = port;
|
|
+ bacpy(&raddr.rfcomm_bdaddr, &bdaddr);
|
|
+ raddr.rfcomm_family = AF_BLUETOOTH;
|
|
+ raddr.rfcomm_channel = port;
|
|
|
|
if (connect(fd, (struct sockaddr *)&raddr, sizeof(raddr)) < 0) {
|
|
smprintf(s, "Can't connect (%d, %s)\n", errno, strerror(errno));
|