Minor error reporting improvements.

git-svn-id: http://nohands.svn.sourceforge.net/svnroot/nohands/trunk@22 126591fb-c623-4b62-a76d-97a8e4f34109

2 files changed, 12 insertions, 2 deletions

diff --git a/libhfp/bt.cpp b/libhfp/bt.cpp
index 3b1ee29..22a9b21 100644
--- a/libhfp/bt.cpp
+++ b/libhfp/bt.cpp
@@ -1013,6 +1013,16 @@ Start(void)
 	if (IsStarted())
 		return true;
 
+	/*
+	 * Simple test for Bluetooth protocol support
+	 */
+	if ((hci_get_route(NULL) < 0) && (errno == EAFNOSUPPORT)) {
+		m_ei->LogError("Your kernel is not configured with support "
+			       "for Bluetooth.\n");
+		SetAutoRestart(false);
+		return false;
+	}
+
 	m_sdp = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY);
 	if (m_sdp == NULL) {
 		/* Common enough to put in the debug pile */
@@ -1029,7 +1039,7 @@ Start(void)
 
 	res = m_hci_handler.HciInit();
 	if (res) {
-		m_ei->LogWarn("Could not create HCI raw socket: %s\n",
+		m_ei->LogWarn("Could not create HCI task handler: %s\n",
 			      strerror(-res));
 		goto failed;
 	}
diff --git a/libhfp/rfcomm.cpp b/libhfp/rfcomm.cpp
index 8740734..9e849fa 100644
--- a/libhfp/rfcomm.cpp
+++ b/libhfp/rfcomm.cpp
@@ -171,7 +171,7 @@ RfcommListen(uint8_t channel)
 			GetHub()->SetAutoRestart(false);
 			return false;
 		}
-		GetDi()->LogWarn("Create RFCOMM socket: %s", strerror(errno));
+		GetDi()->LogWarn("Create RFCOMM socket: %s", strerror(rsock));
 		return false;
 	}