From 9c76d87b0c0efb97fb32920733fb5b60d4493ad6 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Tue, 19 Jul 2011 19:05:38 +0200
Subject: [PATCH] [Positioning] Add option accept-new-mobiles

The option positioning.accept-new-mobiles allows the program to add
on-line mobiles that are not declared in the mobiles' configuration
file. This was the default till now; now this option is unactivated by
default to avoid unexpected Wi-Fi devices retransmitting positioning
requests.
---
 owlps-positioning/cfg/owlps-positioning.cfg | 7 +++++++
 owlps-positioning/src/inputcsv.cc           | 5 +++++
 owlps-positioning/src/inputudpsocket.cc     | 5 +++++
 owlps-positioning/src/userinterface.cc      | 4 ++++
 4 files changed, 21 insertions(+)

diff --git a/owlps-positioning/cfg/owlps-positioning.cfg b/owlps-positioning/cfg/owlps-positioning.cfg
index bbbcc24..294a580 100644
--- a/owlps-positioning/cfg/owlps-positioning.cfg
+++ b/owlps-positioning/cfg/owlps-positioning.cfg
@@ -79,6 +79,13 @@ csv-file = /tmp/owlps-positioning.log
 # It is unactivated by default for the sake of security.
 #accept-new-aps = false
 
+# This option allows to create a new mobile when a request is sent by
+# a mobile which is not currently in the mobiles' list (i.e. not
+# declared in the mobiles' configuration file). If unset, the requests
+# sent by unknown mobiles will be dropped.
+# It is unactivated by default, mainly to avoid interferent devices.
+#accept-new-mobiles = false
+
 # When receiving a calibration or autocalibration request from an AP,
 # containing the transmiter's coordinates, memorise the new AP's
 # coordinates.
diff --git a/owlps-positioning/src/inputcsv.cc b/owlps-positioning/src/inputcsv.cc
index 47764fe..c4e8d8a 100644
--- a/owlps-positioning/src/inputcsv.cc
+++ b/owlps-positioning/src/inputcsv.cc
@@ -46,6 +46,11 @@ const Request& InputCSV::get_next_request()
       return *current_request ;
     }
   PosUtil::to_upper(mac_mobile) ;
+
+  if (! Configuration::bool_value("positioning.accept-new-mobiles") &&
+      ! Stock::mobile_exists(mac_mobile))
+    return *current_request ;
+
   const Mobile &mobile = Stock::find_create_mobile(mac_mobile) ;
   current_request->set_mobile(&mobile) ;
 
diff --git a/owlps-positioning/src/inputudpsocket.cc b/owlps-positioning/src/inputudpsocket.cc
index b63f1e5..dafe816 100644
--- a/owlps-positioning/src/inputudpsocket.cc
+++ b/owlps-positioning/src/inputudpsocket.cc
@@ -110,6 +110,11 @@ const Request& InputUDPSocket::get_next_request()
   string mac_mobile(
     owl_mac_bytes_to_string(request.mobile_mac_addr_bytes)) ;
   PosUtil::to_upper(mac_mobile) ;
+
+  if (! Configuration::bool_value("positioning.accept-new-mobiles") &&
+      ! Stock::mobile_exists(mac_mobile))
+    return *current_request ;
+
   const Mobile &mobile = Stock::find_create_mobile(mac_mobile) ;
   current_request->set_mobile(&mobile) ;
 
diff --git a/owlps-positioning/src/userinterface.cc b/owlps-positioning/src/userinterface.cc
index 23d144a..377d9cd 100644
--- a/owlps-positioning/src/userinterface.cc
+++ b/owlps-positioning/src/userinterface.cc
@@ -210,6 +210,10 @@ void UserInterface::fill_positioning_options()
    "Allow AP's coordinates to be updated when a calibration request"
    " with new coordinates is received from the AP (default is false,"
    " for security purposes).")
+  ("positioning.accept-new-mobiles",
+   po::value<bool>()->default_value(false),
+   "When receiving requests, add unknown mobiles (mobiles which are not"
+   " declared in the mobiles' configuration file) to the mobiles' list.")
   ;
 
   file_options->add(options) ;