From: Nils Faerber Date: Sat, 13 Aug 2011 11:41:24 +0000 (+0200) Subject: Break out Bluetooth functions in own module X-Git-Url: https://git.kernelconcepts.de/?p=metawatch.git;a=commitdiff_plain;h=d1e0ca32db6e93af4ad6c1b7a8019f084bc04dcd Break out Bluetooth functions in own module --- diff --git a/Makefile b/Makefile index fa2d9e4..3107098 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ LDFLAGS = `pkg-config --libs glib-2.0` `pkg-config --libs dbus-glib-1` `pkg-conf PRGNAME = metawatch -MEMBERS = metawatch crc16ccitt mw_utility mw_main +MEMBERS = metawatch crc16ccitt mw_utility mw_main bt_helper # no need to change anything below this line # ------------------------------------------ @@ -24,13 +24,14 @@ SOURCES = $(patsubst %,%.c,$(MEMBERS)) OBJS = $(patsubst %,%.o,$(MEMBERS)) DEPS = $(patsubst %,%.d,$(MEMBERS)) -all: $(PRGNAME) +all: $(PRGNAME) libmetawatch.a $(PRGNAME): $(OBJS) $(CC) -o $@ $^ $(LDFLAGS) -libmetawatch.a: metawatch.o crc16ccitt.o mw_utility.o - ar -cvq libmetawatch.a metawatch.o crc16ccitt.o mw_utility.o +libmetawatch.a: metawatch.o crc16ccitt.o mw_utility.o bt_helper.o + ar -cvq libmetawatch.a metawatch.o crc16ccitt.o mw_utility.o bt_helper.o + clean: rm -f *.o *.d $(PRGNAME) diff --git a/bt_helper.c b/bt_helper.c new file mode 100644 index 0000000..34ad50d --- /dev/null +++ b/bt_helper.c @@ -0,0 +1,136 @@ +/* + * (c) 2011 Siegen, Germany by Nils Faerber + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + + +int open_socket(bdaddr_t *bdaddr, uint8_t channel) +{ + struct sockaddr_rc addr; + int sk, opt; + + sk = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM); + if (sk < 0) { + fprintf(stderr, "Can't create socket: %s (%d)\n", + strerror(errno), errno); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.rc_family = AF_BLUETOOTH; + bacpy(&addr.rc_bdaddr, BDADDR_ANY); + + if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + fprintf(stderr, "Can't bind socket: %s (%d)\n", strerror(errno), errno); + close(sk); + return -1; + } + + /* Set link mode */ + opt = 0; + opt |= RFCOMM_LM_MASTER; + opt |= RFCOMM_LM_AUTH; +/* + opt |= RFCOMM_LM_ENCRYPT; + opt |= RFCOMM_LM_SECURE; +*/ + if (opt && setsockopt(sk, SOL_RFCOMM, RFCOMM_LM, &opt, sizeof(opt)) < 0) { + fprintf(stderr, "Can't set RFCOMM link mode: %s (%d)", strerror(errno), errno); + close(sk); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.rc_family = AF_BLUETOOTH; + bacpy(&addr.rc_bdaddr, bdaddr); + addr.rc_channel = channel; + + if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + fprintf(stderr, "Can't connect: %s (%d)\n", strerror(errno), errno); + close(sk); + return -1; + } + + return sk; +} + +static void mbaswap(bdaddr_t *dst, const bdaddr_t *src) +{ + register unsigned char *d = (unsigned char *) dst; + register const unsigned char *s = (const unsigned char *) src; + register int i; + + for (i = 0; i < 6; i++) + d[i] = s[5-i]; +} + +static int mbachk(const char *str) +{ + if (!str) + return -1; + + if (strlen(str) != 17) + return -1; + + while (*str) { + if (!isxdigit(*str++)) + return -1; + if (!isxdigit(*str++)) + return -1; + if (*str == 0) + break; + if (*str++ != ':') + return -1; + } + + return 0; +} + +int str2ba(const char *str, bdaddr_t *ba) +{ + bdaddr_t b; + int i; + + if (mbachk(str) < 0) { + memset(ba, 0, sizeof(*ba)); + return -1; + } + + for (i = 0; i < 6; i++, str += 3) + b.b[i] = strtol(str, NULL, 16); + + mbaswap(ba, &b); + + return 0; +} + diff --git a/bt_helper.h b/bt_helper.h new file mode 100644 index 0000000..9ecd968 --- /dev/null +++ b/bt_helper.h @@ -0,0 +1,8 @@ +#ifndef _BT_HELPER_H +#define _BT_HELPER_H + +int str2ba(const char *str, bdaddr_t *ba); +int open_socket(bdaddr_t *bdaddr, uint8_t channel); + +#endif + diff --git a/gtk-gui/mw-client.c b/gtk-gui/mw-client.c index f2597ee..b4dbab9 100644 --- a/gtk-gui/mw-client.c +++ b/gtk-gui/mw-client.c @@ -24,6 +24,7 @@ #include #include #include +#include typedef struct { // GMainLoop *mloop; @@ -175,120 +176,6 @@ void mw_get_real_time_clock_response_cb(mwdevice_t *mwdevice, struct tm *mw_tm, gtk_button_set_label(rtc_button, label_str); } -int open_socket(bdaddr_t *bdaddr, uint8_t channel) -{ - struct sockaddr_rc addr; - int sk, opt; - - sk = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM); - if (sk < 0) { - fprintf(stderr, "Can't create socket: %s (%d)\n", - strerror(errno), errno); - return -1; - } - -/* - f = 1; - if (setsockopt(sk, SOL_BLUETOOTH, BT_FLUSHABLE, &f, sizeof(f)) < 0) { - fprintf(stderr, "Can't set flushable: %s (%d)\n", - strerror(errno), errno); - return -1; - } -*/ - memset(&addr, 0, sizeof(addr)); - addr.rc_family = AF_BLUETOOTH; - bacpy(&addr.rc_bdaddr, BDADDR_ANY); - - if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - fprintf(stderr, "Can't bind socket: %s (%d)\n", - strerror(errno), errno); - close(sk); - return -1; - } - - /* Set link mode */ - opt = 0; - opt |= RFCOMM_LM_MASTER; - opt |= RFCOMM_LM_AUTH; -/* - opt |= RFCOMM_LM_ENCRYPT; - opt |= RFCOMM_LM_SECURE; -*/ - if (opt && setsockopt(sk, SOL_RFCOMM, RFCOMM_LM, &opt, sizeof(opt)) < 0) { - fprintf(stderr, "Can't set RFCOMM link mode: %s (%d)", - strerror(errno), errno); - close(sk); - return -1; - } - - memset(&addr, 0, sizeof(addr)); - addr.rc_family = AF_BLUETOOTH; - bacpy(&addr.rc_bdaddr, bdaddr); - addr.rc_channel = channel; - - if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - fprintf(stderr, "Can't connect: %s (%d)\n", - strerror(errno), errno); - close(sk); - return -1; - } - - return sk; -} - -void baswap(bdaddr_t *dst, const bdaddr_t *src) -{ - register unsigned char *d = (unsigned char *) dst; - register const unsigned char *s = (const unsigned char *) src; - register int i; - - for (i = 0; i < 6; i++) - d[i] = s[5-i]; -} - -int bachk(const char *str) -{ - if (!str) - return -1; - - if (strlen(str) != 17) - return -1; - - while (*str) { - if (!isxdigit(*str++)) - return -1; - - if (!isxdigit(*str++)) - return -1; - - if (*str == 0) - break; - - if (*str++ != ':') - return -1; - } - - return 0; -} - -int str2ba(const char *str, bdaddr_t *ba) -{ - bdaddr_t b; - int i; - - if (bachk(str) < 0) { - memset(ba, 0, sizeof(*ba)); - return -1; - } - - for (i = 0; i < 6; i++, str += 3) - b.b[i] = strtol(str, NULL, 16); - - baswap(ba, &b); - - return 0; -} - gboolean handle_mw_io(GIOChannel *mw_io, GIOCondition condition, gpointer udata) { mwdata_t *mdata = (mwdata_t *)udata; diff --git a/mw_main.c b/mw_main.c index 4e871b4..c08b2d3 100644 --- a/mw_main.c +++ b/mw_main.c @@ -34,6 +34,8 @@ #include "crc16ccitt.h" #include "mw_utility.h" +#include "bt_helper.h" + typedef struct { GMainLoop *mloop; mwdevice_t mwdevice; @@ -439,120 +441,6 @@ int feed_menu(mwdata_t *mdata) return 0; } -int open_socket(bdaddr_t *bdaddr, uint8_t channel) -{ - struct sockaddr_rc addr; - int sk, opt; - //int f; - - sk = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM); - if (sk < 0) { - fprintf(stderr, "Can't create socket: %s (%d)\n", - strerror(errno), errno); - return -1; - } - -/* - f = 1; - if (setsockopt(sk, SOL_BLUETOOTH, BT_FLUSHABLE, &f, sizeof(f)) < 0) { - fprintf(stderr, "Can't set flushable: %s (%d)\n", - strerror(errno), errno); - return -1; - } -*/ - memset(&addr, 0, sizeof(addr)); - addr.rc_family = AF_BLUETOOTH; - bacpy(&addr.rc_bdaddr, BDADDR_ANY); - - if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - fprintf(stderr, "Can't bind socket: %s (%d)\n", - strerror(errno), errno); - close(sk); - return -1; - } - - /* Set link mode */ - opt = 0; - opt |= RFCOMM_LM_MASTER; - opt |= RFCOMM_LM_AUTH; -/* - opt |= RFCOMM_LM_ENCRYPT; - opt |= RFCOMM_LM_SECURE; -*/ - if (opt && setsockopt(sk, SOL_RFCOMM, RFCOMM_LM, &opt, sizeof(opt)) < 0) { - fprintf(stderr, "Can't set RFCOMM link mode: %s (%d)", - strerror(errno), errno); - close(sk); - return -1; - } - - memset(&addr, 0, sizeof(addr)); - addr.rc_family = AF_BLUETOOTH; - bacpy(&addr.rc_bdaddr, bdaddr); - addr.rc_channel = channel; - - if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - fprintf(stderr, "Can't connect: %s (%d)\n", - strerror(errno), errno); - close(sk); - return -1; - } - - return sk; -} - -void baswap(bdaddr_t *dst, const bdaddr_t *src) -{ - register unsigned char *d = (unsigned char *) dst; - register const unsigned char *s = (const unsigned char *) src; - register int i; - - for (i = 0; i < 6; i++) - d[i] = s[5-i]; -} - -int bachk(const char *str) -{ - if (!str) - return -1; - - if (strlen(str) != 17) - return -1; - - while (*str) { - if (!isxdigit(*str++)) - return -1; - - if (!isxdigit(*str++)) - return -1; - - if (*str == 0) - break; - - if (*str++ != ':') - return -1; - } - - return 0; -} - -int str2ba(const char *str, bdaddr_t *ba) -{ - bdaddr_t b; - int i; - - if (bachk(str) < 0) { - memset(ba, 0, sizeof(*ba)); - return -1; - } - - for (i = 0; i < 6; i++, str += 3) - b.b[i] = strtol(str, NULL, 16); - - baswap(ba, &b); - - return 0; -} gboolean handle_mw_io(GIOChannel *mw_io, GIOCondition condition, gpointer udata) {