Module Name: src
Committed By: plunky
Date: Sun Mar 7 10:58:40 UTC 2010
Modified Files:
src/usr.sbin/sdpd: compat.c record.c server.c service.c
Log Message:
add some LOG_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sdpd/compat.c \
src/usr.sbin/sdpd/record.c src/usr.sbin/sdpd/service.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sdpd/server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sdpd/compat.c
diff -u src/usr.sbin/sdpd/compat.c:1.1 src/usr.sbin/sdpd/compat.c:1.2
--- src/usr.sbin/sdpd/compat.c:1.1 Tue May 12 10:05:06 2009
+++ src/usr.sbin/sdpd/compat.c Sun Mar 7 10:58:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */
+/* $NetBSD: compat.c,v 1.2 2010/03/07 10:58:40 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: compat.c,v 1.1 2009/05/12 10:05:06 plunky Exp $");
+__RCSID("$NetBSD: compat.c,v 1.2 2010/03/07 10:58:40 plunky Exp $");
#include <arpa/inet.h>
@@ -780,6 +780,8 @@
uint16_t class;
int i;
+ log_debug("compat RegisterRequest by client on fd#%d", fd);
+
if (!srv->fdidx[fd].control
|| !srv->fdidx[fd].priv)
return SDP_ERROR_CODE_INVALID_REQUEST_SYNTAX;
@@ -829,6 +831,8 @@
sdp_data_t d, r;
int i;
+ log_debug("compat ChangeRequest by client on fd#%d", fd);
+
if (!srv->fdidx[fd].control
|| !srv->fdidx[fd].priv)
return SDP_ERROR_CODE_INVALID_REQUEST_SYNTAX;
Index: src/usr.sbin/sdpd/record.c
diff -u src/usr.sbin/sdpd/record.c:1.1 src/usr.sbin/sdpd/record.c:1.2
--- src/usr.sbin/sdpd/record.c:1.1 Tue May 12 10:05:07 2009
+++ src/usr.sbin/sdpd/record.c Sun Mar 7 10:58:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: record.c,v 1.1 2009/05/12 10:05:07 plunky Exp $ */
+/* $NetBSD: record.c,v 1.2 2010/03/07 10:58:40 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: record.c,v 1.1 2009/05/12 10:05:07 plunky Exp $");
+__RCSID("$NetBSD: record.c,v 1.2 2010/03/07 10:58:40 plunky Exp $");
#include <bluetooth.h>
#include <sdp.h>
@@ -52,6 +52,8 @@
sdp_data_t seq;
bdaddr_t bdaddr;
+ log_debug("RecordInsertRequest by client on fd#%d", fd);
+
seq.next = srv->ibuf;
seq.end = srv->ibuf + srv->pdu.len;
@@ -104,6 +106,8 @@
record_t *rec;
sdp_data_t seq;
+ log_debug("RecordUpdateRequest by client on fd#%d", fd);
+
seq.next = srv->ibuf;
seq.end = srv->ibuf + srv->pdu.len;
@@ -160,6 +164,8 @@
{
record_t *rec;
+ log_debug("RecordRemoveRequest by client on fd#%d", fd);
+
if (!srv->fdidx[fd].control
|| !srv->fdidx[fd].priv)
return SDP_ERROR_CODE_INVALID_REQUEST_SYNTAX;
Index: src/usr.sbin/sdpd/service.c
diff -u src/usr.sbin/sdpd/service.c:1.1 src/usr.sbin/sdpd/service.c:1.2
--- src/usr.sbin/sdpd/service.c:1.1 Tue May 12 10:05:07 2009
+++ src/usr.sbin/sdpd/service.c Sun Mar 7 10:58:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: service.c,v 1.1 2009/05/12 10:05:07 plunky Exp $ */
+/* $NetBSD: service.c,v 1.2 2010/03/07 10:58:40 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: service.c,v 1.1 2009/05/12 10:05:07 plunky Exp $");
+__RCSID("$NetBSD: service.c,v 1.2 2010/03/07 10:58:40 plunky Exp $");
#include <bluetooth.h>
#include <sdp.h>
@@ -63,6 +63,8 @@
sdp_data_t d, s;
int max, total, count;
+ log_debug("ServiceSearchRequest by client on fd#%d", fd);
+
d.next = srv->ibuf;
d.end = srv->ibuf + srv->pdu.len;
@@ -169,6 +171,8 @@
uint32_t handle;
int max;
+ log_debug("ServiceAttributeRequest by client on fd#%d", fd);
+
d.next = srv->ibuf;
d.end = srv->ibuf + srv->pdu.len;
@@ -292,6 +296,8 @@
uint8_t *tmp;
int max;
+ log_debug("ServiceSearchAttributeRequest by client on fd#%d", fd);
+
d.next = srv->ibuf;
d.end = srv->ibuf + srv->pdu.len;
Index: src/usr.sbin/sdpd/server.c
diff -u src/usr.sbin/sdpd/server.c:1.7 src/usr.sbin/sdpd/server.c:1.8
--- src/usr.sbin/sdpd/server.c:1.7 Tue May 12 10:05:07 2009
+++ src/usr.sbin/sdpd/server.c Sun Mar 7 10:58:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.7 2009/05/12 10:05:07 plunky Exp $ */
+/* $NetBSD: server.c,v 1.8 2010/03/07 10:58:40 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: server.c,v 1.7 2009/05/12 10:05:07 plunky Exp $");
+__RCSID("$NetBSD: server.c,v 1.8 2010/03/07 10:58:40 plunky Exp $");
#include <sys/select.h>
#include <sys/stat.h>
@@ -398,6 +398,9 @@
srv->fdidx[cfd].omtu = (omtu > srv->omtu) ? srv->omtu : omtu;
srv->fdidx[cfd].offset = 0;
bdaddr_copy(&srv->fdidx[cfd].bdaddr, &sa.bt_bdaddr);
+
+ log_debug("new %s client on fd#%d",
+ srv->fdidx[cfd].control ? "control" : "L2CAP", cfd);
}
/*
@@ -511,6 +514,7 @@
srv->pdu.pid = SDP_PDU_ERROR_RESPONSE;
srv->pdu.len = sizeof(error);
be16enc(srv->obuf, error);
+ log_debug("sending ErrorResponse (error=0x%04x)", error);
}
iov[0].iov_base = &srv->pdu;
@@ -566,6 +570,8 @@
srv->fdmax = fd;
}
+
+ log_debug("client on fd#%d closed", fd);
}
/*
