Set ingress/egress distance

diff --git a/include/SubscribeConfig.h b/include/SubscribeConfig.h
index 9651261a0ff73cfa246bf66640664080c405c3a8..6a3b7287f378c091f4c703f429bf5669ea9fb610 100644 (file)
--- a/include/SubscribeConfig.h
+++ b/include/SubscribeConfig.h
@@ -43,8 +43,8 @@ public:
        bool enableMatchExpiredEvent;
        bool enableFollowupReceivedEvent;
 
-       int max_distance;
-       int min_distance;
+       int maxDistance;
+       int minDistance;
 
        // TODO: Need to add member variables
        virtual ~SubscribeConfig() {}

diff --git a/src/NanDbusHandler.cpp b/src/NanDbusHandler.cpp
index 68dfe59a1717acf3dcfcf088540f9c505997354c..1a26ab057c6224707cb724e7f9804ccd1137f308 100644 (file)
--- a/src/NanDbusHandler.cpp
+++ b/src/NanDbusHandler.cpp
@@ -696,9 +696,9 @@ void NanDbusHandler::addSubscribeConfig(GVariant *param, std::shared_ptr<Subscri
                } else if (!g_strcmp0(key, "match_filter_len")) {
                        g_variant_get(var, "q", &(config->matchFilterLen));
                } else if (!g_strcmp0(key, "max_distance")) {
-                       g_variant_get(var, "i", &(config->max_distance));
+                       g_variant_get(var, "i", &(config->maxDistance));
                } else if (!g_strcmp0(key, "min_distance")) {
-                       g_variant_get(var, "i", &(config->min_distance));
+                       g_variant_get(var, "i", &(config->minDistance));
                } else {
                        // Nothing
                }

diff --git a/src/NanHal.cpp b/src/NanHal.cpp
index 0e1da8d615ad5b6e35ebf61b10267e9a4e9d2968..91c92f85628b7d1eab567482bb92a3c9a6068463 100644 (file)
--- a/src/NanHal.cpp
+++ b/src/NanHal.cpp
@@ -877,7 +877,7 @@ NanSubscribeRequest* NanHal::convertSubscribeConfigToLegacy(std::shared_ptr<Subs
        nanSubscribeReq->ranging_auto_response = NAN_RANGING_AUTO_RESPONSE_DISABLE;
        nanSubscribeReq->sdea_service_specific_info_len = 0;
 
-       if (config->max_distance > -1 || config->min_distance > -1) {
+       if (config->maxDistance > -1 || config->minDistance > -1) {
                nanSubscribeReq->sdea_params.ranging_state = NAN_RANGING_ENABLE;
                nanSubscribeReq->ranging_auto_response = NAN_RANGING_AUTO_RESPONSE_ENABLE;
        }
@@ -886,10 +886,14 @@ NanSubscribeRequest* NanHal::convertSubscribeConfigToLegacy(std::shared_ptr<Subs
                nanSubscribeReq->ranging_auto_response = NAN_RANGING_AUTO_RESPONSE_DISABLE;
        }
        nanSubscribeReq->ranging_cfg.config_ranging_indications = 0;
-       if (config->max_distance > -1)
+       if (config->maxDistance > -1) {
                nanSubscribeReq->ranging_cfg.config_ranging_indications |= NAN_RANGING_INDICATE_INGRESS_MET_MASK;
-       if (config->min_distance > -1)
+               nanSubscribeReq->ranging_cfg.distance_ingress_mm = config->maxDistance;
+       }
+       if (config->minDistance > -1) {
                nanSubscribeReq->ranging_cfg.config_ranging_indications |= NAN_RANGING_INDICATE_EGRESS_MET_MASK;
+               nanSubscribeReq->ranging_cfg.distance_egress_mm = config->minDistance;
+       }
 
        // Don't need to set
        //NanSecurityKeyInfo key_info;

diff --git a/src/SubscribeConfig.cpp b/src/SubscribeConfig.cpp
index 6217f31efccf01cefd51e4976be90317107e8ce3..c8b7e2ba231b66d67e97f9f89bd369a7cb9c02fd 100644 (file)
--- a/src/SubscribeConfig.cpp
+++ b/src/SubscribeConfig.cpp
@@ -27,8 +27,8 @@ void SubscribeConfig::setDefaultValues()
        enableTerminationEvent = true;
        enableMatchExpiredEvent = true;
        enableFollowupReceivedEvent = true;
-       max_distance = -1;
-       min_distance = -1;
+       maxDistance = -1;
+       minDistance = -1;
 }
 
 std::shared_ptr<SubscribeConfig> SubscribeConfig::createDefaultConfig()
@@ -64,4 +64,6 @@ void SubscribeConfig::logConfigurations()
        NAN_LOGD("SubscribeConfig");
        NAN_LOGD("\t- service name: %s", serviceName);;
        NAN_LOGD("\t- subscribe type: %s", convertSubscribeType(subscribeType));
+       NAN_LOGD("\t- max distance: %d", maxDistance);;
+       NAN_LOGD("\t- min distance: %d", minDistance);;
 }