Revert "Register mac address changed event"

This reverts commit 0a13934f9b2f356b8828b5f81b360c199744cfc1.

diff --git a/include/NanDbusHandler.h b/include/NanDbusHandler.h
index 65451cc80a29f2f7ad6b0c33501fb7e946552cc7..9abc4e9ae53a51635d7b70a73adbd0f3b08ef4b0 100644 (file)
--- a/include/NanDbusHandler.h
+++ b/include/NanDbusHandler.h
@@ -112,8 +112,6 @@ public:
 
        static void disabledEvent(NanError error);
        static void macAddressChangedEvent(unsigned char *mac);
-       static void macAddressChangedEvent(const std::string &clientPath,
-                       unsigned char *mac);
        static void serviceDiscoveredEvent(const std::string &clientPath,
                        uint16_t subscribeId, uint32_t peerId, const uint8_t *mac,
                        const uint8_t *specificInfo, uint16_t specificInfoLen, int distance);

diff --git a/include/NanEvent.h b/include/NanEvent.h
index da16bf5bbae884ff9065c4fd3a0f6c9dd0cea551..b7b8bdc255d9e983d37bf4eff6415843e021213d 100644 (file)
--- a/include/NanEvent.h
+++ b/include/NanEvent.h
@@ -90,10 +90,4 @@ public:
        uint32_t *dataPathIds;
 };
 
-class NanMacAddressChangedEvent
-{
-public:
-       uint8_t addr[NAN_MAC_ADDR_LEN];
-};
-
 NAN_NAMESPACE_END

diff --git a/include/NanEventCallback.h b/include/NanEventCallback.h
index b5804ccf13d8ff44a8e94505ecc1e8c3ff570de3..e96bae629b3670152fe41f30a0efc5540a52b1bc 100644 (file)
--- a/include/NanEventCallback.h
+++ b/include/NanEventCallback.h
@@ -50,7 +50,6 @@ struct NanEventCallback {
 
        std::function<void(uint16_t, NanError)> on_notify_publish_terminated_event;
        std::function<void(uint16_t, NanError)> on_notify_subscribe_terminated_event;
-       std::function<void(unsigned char *)> on_notify_mac_address_changed_event;
 };
 
 NAN_NAMESPACE_END

diff --git a/src/NanDbusHandler.cpp b/src/NanDbusHandler.cpp
index 8e9a7f6beece2f0068b070af6dc5530985931124..f4f7b501d8b7478bf5fe4cb98fe01ee4d5880cec 100644 (file)
--- a/src/NanDbusHandler.cpp
+++ b/src/NanDbusHandler.cpp
@@ -771,20 +771,11 @@ void NanDbusHandler::disabledEvent(NanError error)
 
 void NanDbusHandler::macAddressChangedEvent(unsigned char *mac)
 {
-       NAN_LOGD("Broadcast MacAddressChanged Event");
        nan_dbus_discovery_emit_mac_address_changed(
                        NanDbusManager::getDbusDiscoveryHandle(),
                        (const gchar*)mac);
 }
 
-void NanDbusHandler::macAddressChangedEvent(const std::string &clientPath,
-               unsigned char *mac)
-{
-       NAN_LOGD("Unicast MacAddressChanged Event to %s", clientPath.c_str());
-       GVariant *params = g_variant_new("s", (const gchar *)mac);
-       emitUnicastEvent(clientPath.c_str(), "MacAddressChanged", params);
-}
-
 void NanDbusHandler::emitUnicastEvent(const char *clientPath,
                const char *eventName, GVariant *parameters)
 {

diff --git a/src/NanHalEventCallbackHandler.cpp b/src/NanHalEventCallbackHandler.cpp
index e43a72390d0bf819026f844d98cb3d531b4be314..3a1b0b75028fcf650670455c5ce08e94fcc2e41e 100644 (file)
--- a/src/NanHalEventCallbackHandler.cpp
+++ b/src/NanHalEventCallbackHandler.cpp
@@ -54,7 +54,6 @@ std::function<void(const NanDataPathConfirmEvent&)> on_notify_data_path_confirm_
 std::function<void(const NanDataPathEndEvent&)> on_notify_data_path_end_event;
 std::function<void(uint16_t, NanError)> on_notify_publish_terminated_event;
 std::function<void(uint16_t, NanError)> on_notify_subscribe_terminated_event;
-std::function<void(uint8_t *)> on_notify_mac_address_changed_event;
 
 typedef enum {
        NAN_EVENT_PUBLISH_TERMINATED,
@@ -65,7 +64,6 @@ typedef enum {
        NAN_EVENT_DATA_PATH_CONFIRMED,
        NAN_EVENT_DATA_PATH_END,
        NAN_EVENT_DISABLED,
-       NAN_EVENT_MAC_ADDRESS_CHANGED,
 
 } NanEventType;
 
@@ -413,22 +411,6 @@ void raiseDataPathEndEvent(NanDataPathEndInd *event)
        __NAN_LOG_FUNC_EXIT__;
 }
 
-void raiseMacAddressChangedEvent(uint8_t *addr)
-{
-       __NAN_LOG_FUNC_ENTER__;
-       if (!on_notify_mac_address_changed_event) {
-               NAN_LOGE("on_notify_mac_address_changed_event doesn't exist");
-               return;
-       }
-
-       NAN_LOGI("NMI is changed: %02x:%02x:%02x:%02x:%02x:%02x",
-                       addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-       on_notify_mac_address_changed_event(addr);
-
-       __NAN_LOG_FUNC_EXIT__;
-}
-
 gboolean handleEvent(gpointer event)
 {
        __NAN_LOG_FUNC_ENTER__;
@@ -478,9 +460,6 @@ gboolean handleEvent(gpointer event)
                raiseDataPathEndEvent((NanDataPathEndInd *) eventData->data);
                delete (NanDataPathEndInd *)eventData->data;
                break;
-       case NAN_EVENT_MAC_ADDRESS_CHANGED:
-               raiseMacAddressChangedEvent((uint8_t *) eventData->data);
-               delete [] (uint8_t *)eventData->data;
        default:
                NAN_LOGI("Unhandled Event.");
                break;
@@ -575,30 +554,12 @@ void onEventFollowup(NanFollowupInd *event)
        __NAN_LOG_FUNC_EXIT__;
 }
 
-void onEventMacAddress(NanDiscEngEventInd *event)
+void onEventDiscEngEvent(NanDiscEngEventInd *event)
 {
        __NAN_LOG_FUNC_ENTER__;
-       uint8_t *addr = new uint8_t[NAN_MAC_ADDR_LEN];
-       memcpy(addr, event->data.mac_addr.addr, NAN_MAC_ADDR_LEN);
-       attachEventSource(NAN_EVENT_MAC_ADDRESS_CHANGED, (void *)addr);
        __NAN_LOG_FUNC_EXIT__;
 }
 
-void onEventDiscEngEvent(NanDiscEngEventInd *event)
-{
-       //__NAN_LOG_FUNC_ENTER__;
-       switch (event->event_type) {
-       case NAN_EVENT_ID_DISC_MAC_ADDR:
-               onEventMacAddress(event);
-               break;
-       case NAN_EVENT_ID_STARTED_CLUSTER:
-       case NAN_EVENT_ID_JOINED_CLUSTER:
-       default:
-               break;
-       }
-       //__NAN_LOG_FUNC_EXIT__;
-}
-
 void onEventDisabled(NanDisabledInd *event)
 {
        __NAN_LOG_FUNC_ENTER__;

diff --git a/src/NanServiceProvider.cpp b/src/NanServiceProvider.cpp
index 8fb01ebf21117a557bdd8bb0daf5f4d6bb6476b8..b9ef1455a4265514298c73d7b0988ceb1e86b829 100644 (file)
--- a/src/NanServiceProvider.cpp
+++ b/src/NanServiceProvider.cpp
@@ -158,11 +158,6 @@ void NanServiceProvider::registerCallbacks()
                        receiveSessionTerminatedEvent(subscribeId, error);
                };
 
-       callbacks.on_notify_mac_address_changed_event
-               = [=](unsigned char *addr) {
-                       receiveMacAddressChangedEvent(addr);
-               };
-
        mHal->registerCallbackHandler(callbacks);
 }
 
@@ -676,6 +671,8 @@ void NanServiceProvider::receiveEnableResponse(NanError error)
        case NAN_ERROR_NONE:
                setEnabled(true);
                createAllNanInterfaces(true);
+               // TODO: NMI information
+               // NanDbusHandler::macAddressChangedEvent
                break;
        case NAN_ERROR_ALREADY_ENABLED:
                NAN_LOGD("Already Enabled");
@@ -691,10 +688,6 @@ void NanServiceProvider::receiveEnableResponse(NanError error)
                mClientManager.removeClient(mCurrentCommand->getClientId());
        }
 
-       NanClient *client = mClientManager.getClient(mCurrentCommand->getClientId());
-       if (client != nullptr && error == NAN_ERROR_NONE)
-               NanDbusHandler::macAddressChangedEvent(client->getClientPath(), mDiscoveryMacAddress);
-
        mCurrentCommand->response(error);
 
        deleteCurrentCommand();