Link key handling rewrite. Remove max link key limit.

Keep key database updated.
Minor cleanup.

1 files changed, 30 insertions, 35 deletions

diff --git a/hcid/hcid.h b/hcid/hcid.h
index 677a02dd..40dc6ad0 100644
--- a/hcid/hcid.h
+++ b/hcid/hcid.h
@@ -1,24 +1,24 @@
 /* 
-	BlueZ - Bluetooth protocol stack for Linux
-	Copyright (C) 2000-2001 Qualcomm Incorporated
-
-	Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License version 2 as
-	published by the Free Software Foundation;
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-	IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY CLAIM,
-	OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-	RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-	NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-	USE OR PERFORMANCE OF THIS SOFTWARE.
-
-	ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, COPYRIGHTS,
-	TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS SOFTWARE IS DISCLAIMED.
+   BlueZ - Bluetooth protocol stack for Linux
+   Copyright (C) 2000-2001 Qualcomm Incorporated
+   
+   Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 as
+   published by the Free Software Foundation;
+   
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY CLAIM,
+   OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
+   RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+   NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
+   USE OR PERFORMANCE OF THIS SOFTWARE.
+   
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, COPYRIGHTS,
+   TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS SOFTWARE IS DISCLAIMED.
 */
 /*
  * $Id$
@@ -34,8 +34,6 @@
 #define HCID_PIN_FILE    "/etc/bluetooth/pin"
 #define HCID_KEY_FILE    "/etc/bluetooth/link_key"
 #define HCID_PIN_HELPER  "/bin/bluepin"
-#define HCID_KEY_NUM     20
-#define HCID_KEY_TTL     172800 /* 2 days */
 
 struct device_opts {
 	char  *name;
@@ -58,22 +56,20 @@ struct link_key {
 };
 
 struct hcid_opts {
-	char  *host_name;
-	int    auto_init;
-	int    security;
+	char   *host_name;
+	int     auto_init;
+	int     security;
 
-	char  *config_file;
+	char   *config_file;
 
-	uint8_t   pin_code[16];
-	int    pin_len;
-	char  *pin_helper;
-	char  *pin_file;
+	uint8_t pin_code[16];
+	int     pin_len;
+	char   *pin_helper;
+	char   *pin_file;
 
-	struct link_key **link_key;
-	int    key_num;
-	char  *key_file;
+	char   *key_file;
 
-	int    sock;
+	int     sock;
 };
 extern struct hcid_opts hcid;
 
@@ -88,5 +84,4 @@ gboolean io_security_event(GIOChannel *chan, GIOCondition cond, gpointer data);
 
 void start_security_manager(int hdev);
 void stop_security_manager(int hdev);
-void save_link_keys(void);
 void flush_link_keys(void);