diff options
| -rw-r--r-- | src/hcid.h | 10 | ||||
| -rw-r--r-- | src/main.c | 13 |
2 files changed, 4 insertions, 19 deletions
@@ -95,8 +95,6 @@ struct device_list { struct hcid_opts { char host_name[40]; int auto_init; - int security; - int pairing; int offmode; char deviceid[15]; @@ -124,14 +122,6 @@ struct hci_req_data *hci_req_data_new(int dev_id, const bdaddr_t *dba, uint16_t void hci_req_queue_append(struct hci_req_data *data); void hci_req_queue_remove(int dev_id, bdaddr_t *dba); -#define HCID_SEC_NONE 0 -#define HCID_SEC_AUTO 1 -#define HCID_SEC_USER 2 - -#define HCID_PAIRING_NONE 0 -#define HCID_PAIRING_MULTI 1 -#define HCID_PAIRING_ONCE 2 - #define HCID_OFFMODE_DEVDOWN 0 #define HCID_OFFMODE_NOSCAN 1 @@ -705,8 +705,7 @@ static void device_devup_setup(int dev_id) if (hcid.auto_init) configure_device(dev_id); manager_start_adapter(dev_id); - if (hcid.security) - start_security_manager(dev_id); + start_security_manager(dev_id); } static void init_all_devices(int ctl) @@ -746,7 +745,6 @@ static void init_all_devices(int ctl) static void init_defaults(void) { hcid.auto_init = 1; - hcid.security = HCID_SEC_AUTO; init_device_defaults(&default_device); } @@ -774,8 +772,7 @@ static inline void device_event(GIOChannel *chan, evt_stack_internal *si) case HCI_DEV_DOWN: info("HCI dev %d down", sd->dev_id); manager_stop_adapter(sd->dev_id); - if (hcid.security) - stop_security_manager(sd->dev_id); + stop_security_manager(sd->dev_id); break; } } @@ -858,10 +855,8 @@ int main(int argc, char *argv[]) /* Default HCId settings */ memset(&hcid, 0, sizeof(hcid)); - hcid.auto_init = 1; - hcid.security = HCID_SEC_AUTO; - hcid.pairing = HCID_PAIRING_MULTI; - hcid.offmode = HCID_OFFMODE_NOSCAN; + hcid.auto_init = 1; + hcid.offmode = HCID_OFFMODE_NOSCAN; if (gethostname(hcid.host_name, sizeof(hcid.host_name) - 1) < 0) strcpy(hcid.host_name, "noname"); |