Menu
▾
▴
openbt-commit — CVS commits to the AXIS OpenBT Stack
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
(44) |
Mar
(202) |
Apr
(134) |
May
(89) |
Jun
(94) |
Jul
(58) |
Aug
(58) |
Sep
(56) |
Oct
(75) |
Nov
(26) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(24) |
Feb
(30) |
Mar
(15) |
Apr
(49) |
May
(12) |
Jun
(6) |
Jul
(11) |
Aug
(20) |
Sep
(19) |
Oct
(3) |
Nov
(13) |
Dec
(1) |
| 2003 |
Jan
(7) |
Feb
(4) |
Mar
(7) |
Apr
(5) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(2) |
Nov
(51) |
Dec
(1) |
| 2004 |
Jan
(11) |
Feb
(5) |
Mar
|
Apr
(5) |
May
(2) |
Jun
|
Jul
(21) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Anders J. <and...@us...> - 2003-11-04 11:04:30
|
The following files were modified in libs/expat/xmltok: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.3 Removed asciitab.h 1.1 Removed iasciitab.h 1.1 Removed latin1tab.h 1.1 Removed nametab.h 1.1 Removed utf8tab.h 1.1 Removed xmldef.h 1.1 Removed xmlrole.c 1.1 Removed xmlrole.h 1.1 Removed xmltok.c 1.1 Removed xmltok.h 1.1 Removed xmltok_impl.c 1.1 Removed xmltok_impl.h 1.1 Removed xmltok_ns.c 1.1 Removed The accompanying log: Removed old libexpat. Use external package from libexpat.org. |
|
From: Anders J. <and...@us...> - 2003-11-04 11:04:29
|
The following files were modified in libs/expat/xmlparse: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.3 Removed hashtable.c 1.1 Removed hashtable.h 1.1 Removed xmlparse.c 1.1 Removed xmlparse.h 1.1 Removed The accompanying log: Removed old libexpat. Use external package from libexpat.org. |
|
From: Anders J. <and...@us...> - 2003-11-04 11:04:28
|
The following file was modified in libs/expat: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.2 Removed The accompanying log: Removed old libexpat. Use external package from libexpat.org. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:41
|
The following files were modified in apps/bluetooth/utils/bttest: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added bttest.c 1.1 Added bttest.h 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:40
|
The following files were modified in libs/openbt: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added bt_errno.h 1.1 Added bt_if.c 1.1 Added bt_if.h 1.1 Added bt_misc.c 1.1 Added bt_misc.h 1.1 Added bt_vendor.c 1.1 Added bt_vendor.h 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:40
|
The following files were modified in apps/bluetooth/utils/memul: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added modememul.c 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:40
|
The following files were modified in apps/bluetooth/utils/btsec: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added README_btsec.txt 1.1 Added bt_linkkey_common.c 1.1 Added bt_linkkey_common.h 1.1 Added btsec.c 1.1 Added btsec.h 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:40
|
The following files were modified in apps/bluetooth/utils/btdm: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added bt_ipa.c 1.1 Added bt_ipa.h 1.1 Added btd.c 1.1 Added btd.h 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:40
|
The following files were modified in apps/bluetooth/utils/bti: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added btinit.c 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:40
|
The following files were modified in apps/bluetooth/utils/btping: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added btping.c 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:40
|
The following files were modified in apps/bluetooth/utils/btinq: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added btinq.c 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:39
|
The following files were modified in apps/bluetooth/utils/btconnect: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added btcon.c 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:39
|
The following files were modified in apps/bluetooth/utils/btdisc: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added btdisc.c 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:39
|
The following files were modified in apps/bluetooth/sdp_server:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
Makefile 1.13 1.14=20=20=20=20=20=20=20=20=20=20=20=20=20=20
sdp_server.c 1.33 1.34=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
* Created OpenBT library from common files in experimental.
* Removed experimental, BluetoothPN and btd. Usermode stack will not be=20
supported from now on.
* Moved applications to utils-directory.
* Removed warnings.
The diff of the modified file(s):
--- Makefile 2002/09/27 12:59:03 1.13
+++ Makefile 2003/11/04 10:59:38 1.14
@@ -22,7 +22,7 @@ SRCS =3D sdp_server.c sdp_parser.c
=20
CFLAGS +=3D -I$(INCDIR) -MMD
LDFLAGS +=3D -L$(LIBDIR)
-LDLIBS +=3D -lxmlparse -lxmltok
+LDLIBS +=3D -lexpat
=20
all: $(PROGS)
=20
--- sdp_server.c 2003/03/29 18:44:56 1.33
+++ sdp_server.c 2003/11/04 10:59:38 1.34
@@ -46,7 +46,7 @@
#include <syslog.h>
#include <unistd.h>
=20
-#include <xmlparse.h>
+#include <expat.h>
=20
#include "sdp_server.h"
#include "sdp_parser.h"
@@ -812,7 +812,7 @@ get_attribute_list(int fd, unsigned int=20
=20
if (search_struct.attribute_name =3D=3D NULL)
{
- fprintf(stderr, __FUNCTION__ ": Didn't find service attribute id name =
for uuid 0x%04x\n", attr_id_code);
+ fprintf(stderr, "%s: Didn't find service attribute id name for uuid 0x=
%04x\n", __FUNCTION__, attr_id_code);
return NULL;
}
=20=20=20
@@ -823,7 +823,7 @@ get_attribute_list(int fd, unsigned int=20
=20=20=20
if (search_struct.service_class =3D=3D NULL)
{
- fprintf(stderr, __FUNCTION__ ": Didn't find service class name for Rec=
ordHandle 0x%08x\n", record_handle);
+ fprintf(stderr, "%s: Didn't find service class name for RecordHandle 0=
x%08x\n", __FUNCTION__, record_handle);
=20
set_err(SDP_INVALID_SERVICE_RECORD_HANDLE);
D_MEM("<--- free%d 0x%8p", --malloc_dbg, search_struct.attribute_name);
@@ -1108,7 +1108,7 @@ get_from_xml(int fd, char *tag, char *at
{=20=20=20=20
if (set_value !=3D -1)
{
- fprintf(stderr, __FUNCTION__ ": Error more than one attribute =3D=3D=
NULL\n");
+ fprintf(stderr, "%s: Error more than one attribute =3D=3D NULL\n", _=
_FUNCTION__);
return NULL;
}
=20
@@ -1120,7 +1120,7 @@ get_from_xml(int fd, char *tag, char *at
{
if (set_value !=3D -1)
{
- fprintf(stderr, __FUNCTION__ ": Error more than one attribute =3D=3D=
NULL\n");
+ fprintf(stderr, "%s: Error more than one attribute =3D=3D NULL\n", _=
_FUNCTION__);
return NULL;
}
=20
@@ -1630,11 +1630,11 @@ handle_service_search_attr_req(service_s
}
if (tmp_ptr)
{=20=20=20
- printf(__FUNCTION__ ": Copying %d bytes to rsp_pkt\n", tmp_ptr[1]);
+ printf("%s: Copying %d bytes to rsp_pkt\n", __FUNCTION__, tmp_ptr=
[1]);
memcpy(rsp_pkt + rsp_pkt_len + tmp_len, tmp_ptr + 2, tmp_ptr[1]);
tmp_len +=3D tmp_ptr[1];
=20
- printf(__FUNCTION__ ": list_len: %d\n", tmp_len);
+ printf("%s: list_len: %d\n", __FUNCTION__, tmp_len);
=20
D_MEM("<--- free%d tmp_ptr 0x%8p", --malloc_dbg, tmp_ptr);
free(tmp_ptr);
|
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:39
|
The following files were modified in apps/bluetooth/utils/btconfig: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.1 Added btconfig.c 1.1 Added The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:38
|
The following files were modified in apps/bluetooth/experimental: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- .cvsignore 1.5 Removed Makefile 1.16 Removed README.txt 1.7 Removed README_btsec.txt 1.2 Removed bt_conf.h 1.4 Removed bt_errno.h 1.4 Removed bt_if.c 1.58 Removed bt_if.h 1.40 Removed bt_ipa.c 1.6 Removed bt_ipa.h 1.3 Removed bt_linkkey_common.c 1.2 Removed bt_linkkey_common.h 1.1 Removed bt_misc.c 1.24 Removed bt_misc.h 1.13 Removed bt_user.h 1.1 Removed bt_vendor.c 1.40 Removed bt_vendor.h 1.13 Removed btcon.c 1.7 Removed btconfig.c 1.12 Removed btd.c 1.43 Removed btd.h 1.1 Removed btdisc.c 1.7 Removed btinit.c 1.27 Removed btinq.c 1.4 Removed btping.c 1.1 Removed btsec.c 1.3 Removed btsec.h 1.1 Removed btsend.c 1.6 Removed bttest.c 1.27 Removed bttest.h 1.2 Removed modememul.c 1.16 Removed The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:38
|
The following files were modified in apps/bluetooth/btd: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- .cvsignore 1.1 Removed Makefile 1.13 Removed btd.c 1.108 Removed btd.h 1.40 Removed The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:38
|
The following files were modified in apps/bluetooth/BluetoothPN/fltk/includ= e/FL: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Fl_Toggle_Button.H 1.1.1.1 Removed Fl_Toggle_Light_Button.H 1.1.1.1 Removed Fl_Toggle_Node.H 1.1.1.1 Removed Fl_Toggle_Node_Base.H 1.1.1.1 Removed Fl_Toggle_Round_Button.H 1.1.1.1 Removed Fl_Toggle_Tree.H 1.1.1.1 Removed Fl_Toggle_Tree_Base.H 1.1.1.1 Removed bluetooth.xpm 1.1.1.1 Removed closed_icon.xpm 1.1.1.1 Removed file_small.xpm 1.1.1.1 Removed folder_small.xpm 1.1.1.1 Removed open_icon.xpm 1.1.1.1 Removed The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:38
|
The following files were modified in apps/bluetooth/BluetoothPN/fltk: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Fl_Toggle_Node.cxx 1.1.1.1 Removed Fl_Toggle_Node_Base.cxx 1.1.1.1 Removed Fl_Toggle_Tree.cxx 1.1.1.1 Removed Fl_Toggle_Tree_Base.cxx 1.1.1.1 Removed The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-04 10:59:38
|
The following files were modified in apps/bluetooth/BluetoothPN: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- BluetoothPN.cxx 1.1.1.1 Removed BluetoothPN.h 1.1.1.1 Removed Makefile 1.2 Removed README 1.1.1.1 Removed main.cxx 1.1.1.1 Removed The accompanying log: * Created OpenBT library from common files in experimental. * Removed experimental, BluetoothPN and btd. Usermode stack will not be=20 supported from now on. * Moved applications to utils-directory. * Removed warnings. |
|
From: Anders J. <and...@us...> - 2003-11-03 14:54:03
|
The following file was modified in apps/bluetooth/experimental: Name Old version New version Tag Comment ---- ----------- ----------- --- ------- Makefile 1.15 1.16=20=20=20=20=20=20=20=20=20=20=20=20=20=20 The accompanying log: Build openbt library. Will probably need some code cleanup to make one=20 common includefile for the library. The diff of the modified file(s): --- Makefile 2002/09/27 12:59:02 1.15 +++ Makefile 2003/11/03 14:54:01 1.16 @@ -5,6 +5,19 @@ AXIS_USABLE_LIBS =3D UCLIBC GLIBC =20 PROGS =3D btdm memul bti btinq btcon btdisc btconfig btping btsec # bt= send bttest =20 +# The name of the main library target. +ifeq ($(AXIS_SHARE_LIBS), yes) +LIBRARY_NAME =3D libopenbt.so +CFLAGS +=3D -fpic +PERM =3D -m 0755 +else +LIBRARY_NAME =3D libopenbt.a +PERM =3D -m 0644 +endif + +incdir =3D $(prefix)/include +libdir =3D $(prefix)/lib + # Define HAVE_READLINE_READLINE if you have readline support, with the inc= lude # files in $(include_dir)/readline. Define HAVE_READLINE if you have the # include files in $(include_dir). Define neither if you do not want to use @@ -21,16 +34,18 @@ INSTMODE =3D 0755 INSTOWNER =3D root INSTGROUP =3D root =20 -BTDOBJS =3D btd.o bt_ipa.o bt_vendor.o bt_if.o bt_misc.o -MEMULOBJS =3D modememul.o bt_if.o bt_misc.o -BTINITOBJS =3D btinit.o bt_vendor.o bt_if.o bt_misc.o -BTCONOBJS =3D btcon.o bt_if.o bt_misc.o -BTSENDOBJS =3D btsend.o bt_if.o bt_misc.o -BTDISCOBJS =3D btdisc.o bt_if.o bt_misc.o -BTINQOBJS =3D btinq.o bt_if.o bt_misc.o -BTTESTOBJS =3D bttest.o bt_misc.o bt_vendor.o bt_if.o -BTCONFIGOBJS =3D btconfig.o bt_vendor.o bt_if.o bt_misc.o -BTPINGOBJS =3D btping.o bt_if.o bt_misc.o +LIBOPENBTOBJS =3D bt_if.o bt_misc.o bt_vendor.o +HSOURCES =3D bt_if.h bt_vendor.h bt_misc.h bt_conf.h +BTDOBJS =3D btd.o bt_ipa.o +MEMULOBJS =3D modememul.o +BTINITOBJS =3D btinit.o +BTCONOBJS =3D btcon.o=20 +BTSENDOBJS =3D btsend.o=20 +BTDISCOBJS =3D btdisc.o=20 +BTINQOBJS =3D btinq.o=20 +BTTESTOBJS =3D bttest.o +BTCONFIGOBJS =3D btconfig.o +BTPINGOBJS =3D btping.o BTSECOBJS =3D btsec.o bt_linkkey_common.o =20 ifdef HAVE_READLINE_READLINE @@ -53,11 +68,22 @@ endif =20 CFLAGS +=3D -MMD =20 -all: $(PROGS) +LDLIBS +=3D -L./ -lopenbt + +all: $(LIBRARY_NAME) $(PROGS) =20 # 'btdm' =3D> 'multipoint btd' instead of btd to differentiate from=20 # standard btd while testing new btd =20 +libopenbt.so: $(LIBOPENBTOBJS) + rm -f $@ + $(CC) -shared -o $@ $(LIBOPENBTOBJS) + +libopenbt.a: $(LIBOPENBTOBJS) + rm -f $@ + $(AR) ucvr $@ $(LIBOPENBTOBJS) + $(RANLIB) $@ + btdm: $(BTDOBJS) $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ =20 @@ -94,8 +120,9 @@ btsec: $(BTSECOBJS) install: $(PROGS) $(INSTALL) -d $(INSTDIR) $(INSTALL) -m $(INSTMODE) -o $(INSTOWNER) -g $(INSTGROUP) $(PROGS) $(INST= DIR) - + $(INSTALL) $(HSOURCES) $(incdir) + $(INSTALL) $(PERM) $(LIBRARY_NAME) $(libdir)/$(LIBRARY_NAME) clean: - rm -f $(PROGS) *.o *.d core + rm -f $(PROGS) *.o *.d core *.so *.a =20 -include *.d |
|
From: Anders J. <and...@us...> - 2003-10-23 19:36:11
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btinit.c 1.26 1.27=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
Changed to use daemon()
The diff of the modified file(s):
--- btinit.c 2003/10/21 09:15:56 1.26
+++ btinit.c 2003/10/23 11:27:20 1.27
@@ -144,8 +144,6 @@ static void init_sighandler(void);
static void btd_cleanup(void);
static void btd_killchilds(void);
static void sighandler(int sig);
-static void daemonize(void);
-
=20
void unreset_force_rts()
{
@@ -190,7 +188,7 @@ main(int argc, char **argv)
int opt;
int bt_disc =3D N_BT;
volatile int dtr_hard_reset =3D 0;
- int daemon =3D 1;
+ int godaemon =3D 1;
=20
syslog(LOG_INFO, "Bluetooth daemon starting");
=20
@@ -201,7 +199,7 @@ main(int argc, char **argv)
switch(opt)
{
case 'n':
- daemon =3D 0;
+ godaemon =3D 0;
break;
=20=20=20=20=20=20=20
case 'f':
@@ -301,9 +299,9 @@ main(int argc, char **argv)
init_hw(bt_cfd, phys_fd, speedstr);
=20=20=20
/* All initialized and ready to accept connections in other BT apps */
- if(daemon)
+ if(godaemon)
{
- daemonize();
+ daemon(0, 0);
}
=20
if (atexit(btd_cleanup) < 0)
@@ -316,36 +314,6 @@ main(int argc, char **argv)
while (1)
sleep(100);
} /* main */
-
-static void daemonize(void) /* go to background */
-{
- switch (fork())
- {
- case -1: /* fork failed */
- fprintf(stderr,"fork() failed!\n");
- syslog(LOG_ERR, "Exit after failure to fork. %m");
- exit(EXIT_FAILURE);
- case 0: /* child continues */
- if (chdir("/"))
- {
- syslog(LOG_ERR, "Failed changing working directory to '/': %m");
- exit(EXIT_FAILURE);
- }
- break;
- default: /* parent quits */
- exit(EXIT_SUCCESS);
- }
- if (setsid() =3D=3D -1)
- {
- fprintf(stderr,"setsid() failed!\n");
- syslog(LOG_ERR, "Exit after failed call to setsid().");
- exit(EXIT_FAILURE);
- }
- fclose(stdin);
- fclose(stdout);
- fclose(stderr);
-}
-
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
/* Signal handler */
=20
|
|
From: Anders J. <and...@us...> - 2003-10-21 10:09:46
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
btinit.c 1.25 1.26=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
bti is now a daemon as default. Override with -n.=20
The diff of the modified file(s):
--- btinit.c 2002/08/19 15:18:57 1.25
+++ btinit.c 2003/10/21 09:15:56 1.26
@@ -129,10 +129,11 @@ static struct option long_options[] =3D
{ "noflow", 1, NULL, 'f' }, /* do not use flow control */
{ "initial-speed", 1, NULL, 'i' }, /* initial uart speed */
{ "physdev", 1, NULL, 'u' }, /* phys device used from stack */
- { "local-name", 1, NULL, 'n' }, /* set local bluetooth name */
+ { "local-name", 1, NULL, 'l' }, /* set local bluetooth name */
{ "reset", 0, NULL, 'R' }, /* reset BT HW */
{ "speed", 1, NULL, 's' }, /* uart speed towards hw */
{ "use-dtr", 1, NULL, 'D' }, /* user dtr for hard reset */
+ { "nodaemon", 0, NULL, 'n' }, /* don't daemonize */
{ 0, 0, 0, 0 }
};
=20
@@ -143,6 +144,7 @@ static void init_sighandler(void);
static void btd_cleanup(void);
static void btd_killchilds(void);
static void sighandler(int sig);
+static void daemonize(void);
=20
=20
void unreset_force_rts()
@@ -188,21 +190,20 @@ main(int argc, char **argv)
int opt;
int bt_disc =3D N_BT;
volatile int dtr_hard_reset =3D 0;
+ int daemon =3D 1;
=20
syslog(LOG_INFO, "Bluetooth daemon starting");
=20
- if (atexit(btd_cleanup) < 0)
- {
- printf("btd failed to register cleanup function.\n");
- exit(1);
- }
-
/* now parse options */
- while ((opt =3D getopt_long(argc, argv, "fi:n:Rs:u:D",
+ while ((opt =3D getopt_long(argc, argv, "fi:l:Rs:u:Dn",
long_options, &option_index)) !=3D -1)
{
switch(opt)
{
+ case 'n':
+ daemon =3D 0;
+ break;
+=20=20=20=20=20=20
case 'f':
/* do not use flow control */
flow_control =3D USE_NO_FLOW;
@@ -215,7 +216,7 @@ main(int argc, char **argv)
D(syslog(LOG_INFO, "init_hw_speed %s baud", init_hw_speedstr));
break;
=20
- case 'n':
+ case 'l':
local_name =3D optarg;
D(syslog(LOG_INFO, "setting local name to %s", local_name));
break;
@@ -300,11 +301,51 @@ main(int argc, char **argv)
init_hw(bt_cfd, phys_fd, speedstr);
=20=20=20
/* All initialized and ready to accept connections in other BT apps */
+ if(daemon)
+ {
+ daemonize();
+ }
+
+ if (atexit(btd_cleanup) < 0)
+ {
+ printf("btd failed to register cleanup function.\n");
+ exit(1);
+ }
+ init_sighandler();
=20
while (1)
sleep(100);
} /* main */
=20
+static void daemonize(void) /* go to background */
+{
+ switch (fork())
+ {
+ case -1: /* fork failed */
+ fprintf(stderr,"fork() failed!\n");
+ syslog(LOG_ERR, "Exit after failure to fork. %m");
+ exit(EXIT_FAILURE);
+ case 0: /* child continues */
+ if (chdir("/"))
+ {
+ syslog(LOG_ERR, "Failed changing working directory to '/': %m");
+ exit(EXIT_FAILURE);
+ }
+ break;
+ default: /* parent quits */
+ exit(EXIT_SUCCESS);
+ }
+ if (setsid() =3D=3D -1)
+ {
+ fprintf(stderr,"setsid() failed!\n");
+ syslog(LOG_ERR, "Exit after failed call to setsid().");
+ exit(EXIT_FAILURE);
+ }
+ fclose(stdin);
+ fclose(stdout);
+ fclose(stderr);
+}
+
/* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */
/* Signal handler */
=20
@@ -345,7 +386,6 @@ sighandler(int sig)
static void init()
{=20
btd_pid =3D write_pidfile(PID_FILE);=20=20
- init_sighandler();
=20=20=20
if ((sdpsrv_pid =3D start_sdp_server()) < 0)
{
|
|
From: Anders J. <and...@us...> - 2003-08-25 11:34:41
|
The following file was modified in apps/bluetooth/experimental:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
modememul.c 1.15 1.16=20=20=20=20=20=20=20=20=20=20=20=20=20=20
The accompanying log:
The emulator now handles packet segmented in any size, no need to receive
a whole ppp-packet in one read anymore. Some implementations insert a delay
between the first frame start byte and the rest of the data in PPP.=20
The diff of the modified file(s):
--- modememul.c 2001/10/16 16:56:25 1.15
+++ modememul.c 2003/08/25 09:03:20 1.16
@@ -65,6 +65,7 @@
#define PPPDCMD "pppd"
=20
/* Modem emulator stuff */
+#define BUFSIZE 128
=20
#define RESTART 0
#define START_PPP 1
@@ -163,8 +164,9 @@ int modem_emulator(int bt_fd)
char *connect =3D "CONNECT\r\n";
char *client_server =3D "CLIENTSERVER\r\n";
char *ok =3D "OK\r\n";
- char data[128];
- int done =3D 0, i;
+ char data[BUFSIZE + 1];
+ int done =3D 0, i, counter =3D 0;
+ int ppp_detected =3D 0;
fd_set rfd;
=20
D(syslog(LOG_INFO, "Modem emulator starting"));
@@ -177,21 +179,32 @@ int modem_emulator(int bt_fd)
=20=20=20=20=20
if (FD_ISSET(bt_fd, &rfd))
{=20
- int len =3D read(bt_fd, &data, 128);=20=20=20=20=20=20
- data[len] =3D 0;
+ int len;
=20=20=20=20=20=20=20
+ if(BUFSIZE - counter <=3D 0)
+ {
+ /* Still nothing detected after reading 128 bytes, restart the
+ modememulator and try again */
+ return RESTART;
+ }
+=20=20=20=20=20=20
+ len =3D read(bt_fd, data + counter, BUFSIZE - counter);
D(syslog(LOG_INFO, "Modem emulator got %d bytes", len));
=20=20=20=20=20=20=20
if (len <=3D 0)
return RESTART;=20=20=20=20=20=20
=20
- /* Check if data is a ppp frame, if so start pppd right away */
+ counter +=3D len;
+ data[counter] =3D 0;
=20
- for (i =3D 0; i < len; i++)
+ /* Check if data is a ppp frame, if so start pppd right away */
+ /* PPP frame detection */
+ for (i =3D 0; i < counter; i++)
{
if ((data[i] =3D=3D PPP_FLAGSEQUENCE))
{
- if ((len - i) >=3D 7)
+ ppp_detected =3D 1;
+ if ((counter - i) >=3D 7)
{
unsigned short prot;
unsigned short type;
@@ -209,7 +222,7 @@ int modem_emulator(int bt_fd)
=20=20=20=20=20=20=20=20=20=20=20=20=20
D(syslog(LOG_INFO, "prot : %x", prot));
=20=20=20=20=20=20=20=20=20=20=20=20=20
- D(print_data("ppp packet : ", data, len));
+ D(print_data("ppp packet : ", data, counter));
=20=20=20=20=20=20=20=20=20=20=20=20=20
if (prot =3D=3D PROT_LCP)
{
@@ -237,6 +250,10 @@ int modem_emulator(int bt_fd)
return RESTART;=20
}
}
+ else
+ {
+ D(syslog(LOG_INFO, "PPP frame detected but need more bytes"));
+ }
}=20=20=20=20=20=20
}
=20=20=20=20=20=20=20
@@ -260,8 +277,13 @@ int modem_emulator(int bt_fd)
}
else
{
+ /* Don't reply if PPP is detected, it's probably
+ not what the other side wants :). */
+ if(!ppp_detected)
+ {
syslog(LOG_INFO, "Modem emulator replies OK");
write(bt_fd, ok, strlen(ok));=20
+ }
}
}
}
|
|
From: Anders J. <and...@us...> - 2003-06-05 12:13:07
|
The following file was modified in linux/drivers/char/bluetooth:
Name Old version New version Tag Comment
---- ----------- ----------- --- -------
bnep.c 1.16 1.16.2.1 change_branch--bnep_fix=20=20
The accompanying log:
Filters are reset after a disconnect.
The diff of the modified file(s):
--- bnep.c 2003/01/09 09:56:19 1.16
+++ bnep.c 2003/06/05 12:13:04 1.16.2.1
@@ -152,6 +152,8 @@ static void bnep_receive_packet(l2cap_co
static int bnep_control(l2cap_con *l2cap, u8 *data, u8 bnep_control_type);
=20
/* Misc functions */
+static void bnep_reset_multicast_filter(struct net_local *local);
+static void bnep_reset_protocol_filter(struct net_local *local);
s32 check_filter(unsigned char *filter1, unsigned char *filter2, u16 size);
=20
=20
@@ -1051,20 +1053,10 @@ bnep_control(l2cap_con *l2cap, u8 *data,
rsp.bnep_control_type =3D BNEP_FILTER_NET_TYPE_RESPONSE_MSG;
rsp.bnep_response_msg =3D cpu_to_be16(SUCCESS);
=20=09=09
-=09=20=20=20=20=20=20=20
- {
/* Reset filter */
- D_MISC("Reset filter\n");
- for (i=3D0;i<BNEP_MAX_PROTOCOL_FILTER_RANGES;i++) {
- local->filter_list[i*2] =3D 0;
- local->filter_list[i*2+1] =3D 0;
- }
-
- /* Accept all packet types */
- local->filter_list[0] =3D 0x0000;
- local->filter_list[1] =3D 0xffff;
+ bnep_reset_protocol_filter(local);
used_filters=3D0;
- }=20
+
if (n =3D=3D 0) {
}=20
else if (n > BNEP_MAX_PROTOCOL_FILTER_RANGES) {
@@ -1154,12 +1146,7 @@ bnep_control(l2cap_con *l2cap, u8 *data,
=20=09=09
/* If no filters are set, reset filter list */
D_MISC(__FUNCTION__" Reset all multicast filters and accep=
t all addresses\n");
- for (i=3D0;i<BNEP_MAX_MCAST_FILTER_RANGES;i++) {
- memset(&local->filter_multi_addr_list[i*2].addr[0],0,6);
- memset(&local->filter_multi_addr_list[i*2+1].addr[0],0,6);
- }
- /* Accept all multicast addresses */
- memset(&local->filter_multi_addr_list[1].addr[0],0xff,6);
+ bnep_reset_multicast_filter(local);
used_filters=3D0;
=20
if (n =3D=3D 0) {
@@ -1440,6 +1427,8 @@ bnep_disconnect_ind(l2cap_con *l2cap)=20
local =3D dev->priv;
local->l2cap =3D NULL;
local->state =3D DISCONNECTED;
+ bnep_reset_multicast_filter(local);
+ bnep_reset_protocol_filter(local);
}
}
=20
@@ -1454,6 +1443,8 @@ bnep_disconnect_cfm(l2cap_con *l2cap)=20
dev =3D (struct net_device *)l2cap->upper_con;
local =3D dev->priv;
local->state =3D DISCONNECTED;
+ bnep_reset_multicast_filter(local);
+ bnep_reset_protocol_filter(local);
=20=09
DSYS(__FUNCTION__": disconnected\n");
local->l2cap =3D NULL;
@@ -1534,6 +1525,32 @@ bnep_disconnect_req(u8 *bd_addr)
}
DSYS("BNEP: bnep_disconnect_req bd_addr no found !!!\n");
return -1;
+}
+
+static void=20
+bnep_reset_multicast_filter(struct net_local *local)
+{
+ int i;
+ for (i =3D 0 ; i < BNEP_MAX_MCAST_FILTER_RANGES ; i++) {
+ memset(&local->filter_multi_addr_list[i*2].addr[0],0,6);
+ memset(&local->filter_multi_addr_list[i*2+1].addr[0],0,6);
+ }
+ /* Accept all multicast addresses */
+ memset(&local->filter_multi_addr_list[1].addr[0],0xff,6);
+}
+
+static void=20
+bnep_reset_protocol_filter(struct net_local *local)
+{
+ int i;
+ for (i=3D0;i<BNEP_MAX_PROTOCOL_FILTER_RANGES;i++) {
+ local->filter_list[i*2] =3D 0;
+ local->filter_list[i*2+1] =3D 0;
+ }
+=09
+ /* Accept all packet types */
+ local->filter_list[0] =3D 0x0000;
+ local->filter_list[1] =3D 0xffff;
}
=20
s32
|
2 messages has been excluded from this view by a project administrator.
