139 lines
3.9 KiB
Diff
139 lines
3.9 KiB
Diff
From a80c106764c771a7fa3f135dfb4b3bbd11f2f9fc Mon Sep 17 00:00:00 2001
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
Date: Fri, 3 Oct 2014 10:46:18 +0200
|
|
Subject: [PATCH 1/3] pathnames: Bluetooth stuff is now in debugfs
|
|
|
|
Yay for the ABI breakage.
|
|
---
|
|
lib/pathnames.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/lib/pathnames.h b/lib/pathnames.h
|
|
index 14b051c..045b04a 100644
|
|
--- a/lib/pathnames.h
|
|
+++ b/lib/pathnames.h
|
|
@@ -53,8 +53,8 @@
|
|
#define _PATH_PROCNET_X25_ROUTE "/proc/net/x25/route"
|
|
#define _PATH_PROCNET_DEV_MCAST "/proc/net/dev_mcast"
|
|
#define _PATH_PROCNET_ATALK_ROUTE "/proc/net/atalk_route"
|
|
-#define _PATH_SYS_BLUETOOTH_L2CAP "/sys/class/bluetooth/l2cap"
|
|
-#define _PATH_SYS_BLUETOOTH_RFCOMM "/sys/class/bluetooth/rfcomm"
|
|
+#define _PATH_SYS_BLUETOOTH_L2CAP "/sys/kernel/debug/bluetooth/l2cap"
|
|
+#define _PATH_SYS_BLUETOOTH_RFCOMM "/sys/kernel/debug/bluetooth/rfcomm"
|
|
|
|
/* pathname for the netlink device */
|
|
#define _PATH_DEV_ROUTE "/dev/route"
|
|
--
|
|
1.9.3
|
|
|
|
From 6cfde210b8d51b209802ec1ff3738eba189a810c Mon Sep 17 00:00:00 2001
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
Date: Fri, 3 Oct 2014 10:46:41 +0200
|
|
Subject: [PATCH 2/3] netstat: Fix short options for --l2cap and --rfcomm
|
|
|
|
---
|
|
netstat.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/netstat.c b/netstat.c
|
|
index 4f4ba12..9171401 100644
|
|
--- a/netstat.c
|
|
+++ b/netstat.c
|
|
@@ -2157,7 +2157,7 @@ int main
|
|
getroute_init(); /* Set up AF routing support */
|
|
|
|
afname[0] = '\0';
|
|
- while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF)
|
|
+ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF)
|
|
switch (i) {
|
|
case -1:
|
|
break;
|
|
--
|
|
1.9.3
|
|
|
|
From 25db8db512f960ce371a5035867ad84d3303b3d4 Mon Sep 17 00:00:00 2001
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
Date: Fri, 3 Oct 2014 10:46:56 +0200
|
|
Subject: [PATCH 3/3] man: Document Bluetooth options
|
|
|
|
---
|
|
man/en_US/netstat.8 | 21 ++++++++++++++++++---
|
|
1 file changed, 18 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/man/en_US/netstat.8 b/man/en_US/netstat.8
|
|
index 7fcd41b..2877515 100644
|
|
--- a/man/en_US/netstat.8
|
|
+++ b/man/en_US/netstat.8
|
|
@@ -23,6 +23,8 @@ netstat \- Print network connections, routing tables, interface statistics, masq
|
|
.RB [ \-\-udplite | \-U ]
|
|
.RB [ \-\-sctp | \-S ]
|
|
.RB [ \-\-raw | \-w ]
|
|
+.RB [ \-\-l2cap | \-2 ]
|
|
+.RB [ \-\-rfcomm | \-f ]
|
|
.RB [ \-\-listening | \-l ]
|
|
.RB [ \-\-all | \-a ]
|
|
.RB [ \-\-numeric | \-n ]
|
|
@@ -91,13 +93,14 @@ netstat \- Print network connections, routing tables, interface statistics, masq
|
|
.PP
|
|
.RB [ -4 | \-\-inet ]
|
|
.RB [ -6 | \-\-inet6 ]
|
|
-.RB [ \-\-protocol= { inet , inet6 , unix , ipx , ax25 , netrom , ddp ", ... } ]"
|
|
+.RB [ \-\-protocol= { inet , inet6 , unix , ipx , ax25 , netrom , ddp , bluetooth ", ... } ]"
|
|
.RB [ \-\-unix | \-x ]
|
|
.RB [ \-\-inet | \-\-ip | \-\-tcpip ]
|
|
.RB [ \-\-ax25 ]
|
|
.RB [ \-\-x25 ]
|
|
.RB [ \-\-rose ]
|
|
.RB [ \-\-ash ]
|
|
+.RB [ \-\-bluetooth ]
|
|
.RB [ \-\-ipx ]
|
|
.RB [ \-\-netrom ]
|
|
.RB [ \-\-ddp | \-\-appletalk ]
|
|
@@ -169,8 +172,9 @@ is a comma (',') separated list of address family keywords like
|
|
.BR ax25 ,
|
|
.BR netrom ,
|
|
.BR econet ,
|
|
+.BR ddp ,
|
|
and
|
|
-.BR ddp .
|
|
+.BR bluetooth .
|
|
This has the same effect as using the
|
|
.BR \-\-inet | -4 ,
|
|
.BR \-\-inet6 | -6 ,
|
|
@@ -178,13 +182,18 @@ This has the same effect as using the
|
|
.BR \-\-ipx ,
|
|
.BR \-\-ax25 ,
|
|
.BR \-\-netrom ,
|
|
+.B \-\-ddp ,
|
|
and
|
|
-.B \-\-ddp
|
|
+.B \-\-bluetooth
|
|
options.
|
|
.P
|
|
The address family
|
|
.B inet
|
|
(Iv4) includes raw, udp, udplite and tcp protocol sockets.
|
|
+.P
|
|
+The address family
|
|
+.B bluetooth
|
|
+(Iv4) includes l2cap and rfcomm protocol sockets.
|
|
.SS "\-c, \-\-continuous"
|
|
This will cause
|
|
.B netstat
|
|
@@ -458,6 +467,12 @@ status information via the following files.
|
|
.I /proc/net/ip_masquerade
|
|
-- masqueraded connections
|
|
|
|
+.I /sys/kernel/debug/bluetooth/l2cap
|
|
+-- Bluetooth L2CAP information
|
|
+
|
|
+.I /sys/kernel/debug/bluetooth/rfcomm
|
|
+-- Bluetooth serial connections
|
|
+
|
|
.I /proc/net/snmp
|
|
-- statistics
|
|
.fi
|
|
--
|
|
1.9.3
|
|
|