summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-08-04 20:02:01 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-08-04 20:02:01 +0200
commit8f0965f1091a7ecf5f315108b7d7876dc0a68f3b (patch)
treecd2c70c72ad8252e9ab9efce8210ac026b859371 /src
parent837961ae742fd6b18f3846683f76a5a58ecae034 (diff)
Remove SDP server and experimental option
Diffstat (limited to 'src')
-rw-r--r--src/adapter.c6
-rw-r--r--src/dbus-common.c12
-rw-r--r--src/dbus-hci.h2
-rw-r--r--src/main.c15
4 files changed, 4 insertions, 31 deletions
diff --git a/src/adapter.c b/src/adapter.c
index 5cba591b..cd14b2b7 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2320,10 +2320,8 @@ int adapter_start(struct adapter *adapter)
if (!(features[6] & LMP_SIMPLE_PAIR))
goto setup;
- if (hcid_dbus_use_experimental()) {
- if (ioctl(dd, HCIGETAUTHINFO, NULL) < 0 && errno != EINVAL)
- hci_write_simple_pairing_mode(dd, 0x01, 2000);
- }
+ if (ioctl(dd, HCIGETAUTHINFO, NULL) < 0 && errno != EINVAL)
+ hci_write_simple_pairing_mode(dd, 0x01, 2000);
if (hci_read_simple_pairing_mode(dd, &dev->ssp_mode, 1000) < 0) {
err = errno;
diff --git a/src/dbus-common.c b/src/dbus-common.c
index 02edd683..530f432e 100644
--- a/src/dbus-common.c
+++ b/src/dbus-common.c
@@ -55,8 +55,6 @@
#define RECONNECT_RETRY_TIMEOUT 5000
-static int experimental = 0;
-
int l2raw_connect(const char *local, const bdaddr_t *remote)
{
struct sockaddr_l2 addr;
@@ -108,16 +106,6 @@ failed:
return -1;
}
-void hcid_dbus_set_experimental(void)
-{
- experimental = 1;
-}
-
-int hcid_dbus_use_experimental(void)
-{
- return experimental;
-}
-
static gboolean system_bus_reconnect(void *data)
{
DBusConnection *conn = get_dbus_connection();
diff --git a/src/dbus-hci.h b/src/dbus-hci.h
index f141d664..18de81b7 100644
--- a/src/dbus-hci.h
+++ b/src/dbus-hci.h
@@ -22,8 +22,6 @@
*
*/
-void hcid_dbus_set_experimental();
-int hcid_dbus_use_experimental();
int hcid_dbus_request_pin(int dev, bdaddr_t *sba, struct hci_conn_info *ci);
void hcid_dbus_inquiry_start(bdaddr_t *local);
diff --git a/src/main.c b/src/main.c
index fbd776a6..1ae7dc46 100644
--- a/src/main.c
+++ b/src/main.c
@@ -784,7 +784,7 @@ int main(int argc, char *argv[])
struct sigaction sa;
GIOChannel *ctl_io, *child_io;
uint16_t mtu = 0;
- int opt, daemonize = 1, debug = 0, sdp = 1, experimental = 0;
+ int opt, daemonize = 1, debug = 0;
GKeyFile *config;
/* Default HCId settings */
@@ -803,7 +803,7 @@ int main(int argc, char *argv[])
init_defaults();
- while ((opt = getopt(argc, argv, "ndsm:xf:")) != EOF) {
+ while ((opt = getopt(argc, argv, "ndm:f:")) != EOF) {
switch (opt) {
case 'n':
daemonize = 0;
@@ -813,18 +813,10 @@ int main(int argc, char *argv[])
debug = 1;
break;
- case 's':
- sdp = 1;
- break;
-
case 'm':
mtu = atoi(optarg);
break;
- case 'x':
- experimental = 1;
- break;
-
case 'f':
hcid.config_file = g_strdup(optarg);
break;
@@ -907,9 +899,6 @@ int main(int argc, char *argv[])
agent_init();
- if (experimental)
- hcid_dbus_set_experimental();
-
if (hcid_dbus_init() < 0) {
error("Unable to get on D-Bus");
exit(1);