From b96133c91a2abcc6b0a6de80176623f0ee6f600e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 4 Jun 2006 12:09:30 +0000 Subject: Build a generic helper library --- common/Makefile.am | 11 ++---- common/oui.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++ common/oui.h | 25 ++++++++++++ daemon/Makefile.am | 2 +- hcid/Makefile.am | 10 ++--- hidd/Makefile.am | 2 +- test/Makefile.am | 11 ++---- tools/Makefile.am | 6 +-- tools/oui.c | 109 ----------------------------------------------------- tools/oui.h | 25 ------------ 10 files changed, 150 insertions(+), 160 deletions(-) create mode 100644 common/oui.c create mode 100644 common/oui.h delete mode 100644 tools/oui.c delete mode 100644 tools/oui.h diff --git a/common/Makefile.am b/common/Makefile.am index d2233f94..4ab7af66 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,14 +1,11 @@ -noinst_LIBRARIES = libtextfile.a libglib-ectomy.a liblist.a +noinst_LIBRARIES = libhelper.a -liblist_a_SOURCES = list.h list.c - -libtextfile_a_SOURCES = textfile.h textfile.c - -libglib_ectomy_a_SOURCES = glib-ectomy.h glib-ectomy.c +libhelper_a_SOURCES = oui.h oui.c list.h list.c \ + textfile.h textfile.c glib-ectomy.h glib-ectomy.c noinst_PROGRAMS = test_textfile -test_textfile_LDADD = libtextfile.a +test_textfile_LDADD = libhelper.a MAINTAINERCLEANFILES = Makefile.in diff --git a/common/oui.c b/common/oui.c new file mode 100644 index 00000000..cc695a90 --- /dev/null +++ b/common/oui.c @@ -0,0 +1,109 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2006 Marcel Holtmann + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "oui.h" + +/* http://standards.ieee.org/regauth/oui/oui.txt */ + +#define OUIFILE "/var/lib/misc/oui.txt" + +char *ouitocomp(const char *oui) +{ + struct stat st; + char *str, *map, *off, *end; + int fd; + + fd = open("oui.txt", O_RDONLY); + if (fd < 0) { + fd = open(OUIFILE, O_RDONLY); + if (fd < 0) { + fd = open("/usr/share/misc/oui.txt", O_RDONLY); + if (fd < 0) + return NULL; + } + } + + if (fstat(fd, &st) < 0) { + close(fd); + return NULL; + } + + str = malloc(128); + if (!str) { + close(fd); + return NULL; + } + + memset(str, 0, 128); + + map = mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0); + if (!map || map == MAP_FAILED) { + free(str); + close(fd); + return NULL; + } + + off = strstr(map, oui); + if (off) { + off += 18; + end = strpbrk(off, "\r\n"); + strncpy(str, off, end - off); + } else { + free(str); + str = NULL; + } + + munmap(map, st.st_size); + + close(fd); + + return str; +} + +int oui2comp(const char *oui, char *comp, size_t size) +{ + char *tmp; + + tmp = ouitocomp(oui); + if (!tmp) + return -1; + + snprintf(comp, size, "%s", tmp); + + free(tmp); + + return 0; +} diff --git a/common/oui.h b/common/oui.h new file mode 100644 index 00000000..c166038f --- /dev/null +++ b/common/oui.h @@ -0,0 +1,25 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2006 Marcel Holtmann + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +char *ouitocomp(const char *oui); +int oui2comp(const char *oui, char *comp, size_t size); diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 41875066..12ff263b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -3,7 +3,7 @@ noinst_PROGRAMS = bluetoothd bluetoothd_SOURCES = main.c -bluetoothd_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a +bluetoothd_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 0d4f3c91..8998e477 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -23,13 +23,9 @@ hcid_SOURCES = main.c security.c device.c logging.c storage.c \ dbus.h dbus.c dbus-common.c \ dbus-error.c dbus-manager.c dbus-adapter.c \ dbus-device.c dbus-service.c dbus-security.c \ - dbus-sdp.c dbus-rfcomm.c \ - $(top_builddir)/tools/oui.h $(top_builddir)/tools/oui.c + dbus-sdp.c dbus-rfcomm.c -hcid_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ \ - $(top_builddir)/common/libglib-ectomy.a \ - $(top_builddir)/common/libtextfile.a \ - $(top_builddir)/common/liblist.a +hcid_LDADD = @DBUS_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a passkey_agent_SOURCES = passkey-agent.c @@ -37,7 +33,7 @@ passkey_agent_LDADD = @DBUS_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ -INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/tools +INCLUDES = -I$(top_srcdir)/common man_MANS = hcid.8 hcid.conf.5 diff --git a/hidd/Makefile.am b/hidd/Makefile.am index ba01caeb..9d66ceda 100644 --- a/hidd/Makefile.am +++ b/hidd/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = hidd hidd_SOURCES = main.c hidd.h sdp.c uinput.h fakehid.c -hidd_LDADD = @BLUEZ_LIBS@ -lm $(top_builddir)/common/libtextfile.a +hidd_LDADD = @BLUEZ_LIBS@ -lm $(top_builddir)/common/libhelper.a AM_CFLAGS = @BLUEZ_CFLAGS@ diff --git a/test/Makefile.am b/test/Makefile.am index 32b32b33..065ebdee 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -6,10 +6,7 @@ bin_PROGRAMS = l2test rctest noinst_PROGRAMS = scotest attest hstest bdaddr -hciemu_LDADD = @BLUEZ_LIBS@ \ - $(top_builddir)/common/libglib-ectomy.a \ - $(top_builddir)/common/liblist.a - +hciemu_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a l2test_LDADD = @BLUEZ_LIBS@ @@ -21,16 +18,16 @@ attest_LDADD = @BLUEZ_LIBS@ hstest_LDADD = @BLUEZ_LIBS@ -bdaddr_SOURCES = bdaddr.c $(top_builddir)/tools/oui.h $(top_builddir)/tools/oui.c +bdaddr_SOURCES = bdaddr.c -bdaddr_LDADD = @BLUEZ_LIBS@ +bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a noinst_MANS = bdaddr.8 AM_CFLAGS = @BLUEZ_CFLAGS@ endif -INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/tools +INCLUDES = -I$(top_srcdir)/common EXTRA_DIST = hsplay hsmicro bdaddr.8 diff --git a/tools/Makefile.am b/tools/Makefile.am index d682448c..31626523 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -40,10 +40,10 @@ noinst_PROGRAMS = hcisecfilter ppporc hciattach_SOURCES = hciattach.c hciattach_st.c hciconfig_SOURCES = hciconfig.c csr.h csr.c -hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a +hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a -hcitool_SOURCES = hcitool.c oui.h oui.c -hcitool_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libtextfile.a +hcitool_SOURCES = hcitool.c +hcitool_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a l2ping_LDADD = @BLUEZ_LIBS@ diff --git a/tools/oui.c b/tools/oui.c deleted file mode 100644 index cc695a90..00000000 --- a/tools/oui.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2004-2006 Marcel Holtmann - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "oui.h" - -/* http://standards.ieee.org/regauth/oui/oui.txt */ - -#define OUIFILE "/var/lib/misc/oui.txt" - -char *ouitocomp(const char *oui) -{ - struct stat st; - char *str, *map, *off, *end; - int fd; - - fd = open("oui.txt", O_RDONLY); - if (fd < 0) { - fd = open(OUIFILE, O_RDONLY); - if (fd < 0) { - fd = open("/usr/share/misc/oui.txt", O_RDONLY); - if (fd < 0) - return NULL; - } - } - - if (fstat(fd, &st) < 0) { - close(fd); - return NULL; - } - - str = malloc(128); - if (!str) { - close(fd); - return NULL; - } - - memset(str, 0, 128); - - map = mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0); - if (!map || map == MAP_FAILED) { - free(str); - close(fd); - return NULL; - } - - off = strstr(map, oui); - if (off) { - off += 18; - end = strpbrk(off, "\r\n"); - strncpy(str, off, end - off); - } else { - free(str); - str = NULL; - } - - munmap(map, st.st_size); - - close(fd); - - return str; -} - -int oui2comp(const char *oui, char *comp, size_t size) -{ - char *tmp; - - tmp = ouitocomp(oui); - if (!tmp) - return -1; - - snprintf(comp, size, "%s", tmp); - - free(tmp); - - return 0; -} diff --git a/tools/oui.h b/tools/oui.h deleted file mode 100644 index c166038f..00000000 --- a/tools/oui.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2004-2006 Marcel Holtmann - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -char *ouitocomp(const char *oui); -int oui2comp(const char *oui, char *comp, size_t size); -- cgit