Merge "Append AssocStatusCode Property for Wi-Fi Manager Layer" into tizen

diff --combined src/service.c
index a678e0d,1b6d3ba..003b629
--- 1/src/service.c
--- 2/src/service.c
+++ b/src/service.c
@@@ -3248,14 -3248,6 +3248,14 @@@ static void append_properties(DBusMessa
                connman_dbus_dict_append_basic(dict, "Frequency",
                                DBUS_TYPE_UINT16, &frequency);
        }
 +      const void *wifi_vsie;
 +      unsigned int wifi_vsie_len;
 +      wifi_vsie = connman_network_get_blob(service->network, "WiFi.Vsie", &wifi_vsie_len);
 +      if(wifi_vsie_len > 0) {
 +              DBG("ConnMan, service->path=%s vsie length=%d", service->path, wifi_vsie_len);
 +      }
 +      connman_dbus_dict_append_fixed_array(dict, "Vsie", DBUS_TYPE_BYTE,
 +                      &wifi_vsie, wifi_vsie_len);
  #endif
  
        str = __connman_service_type2string(service->type);
@@@ -3333,6 -3325,9 +3333,9 @@@
                connman_dbus_dict_append_basic(dict, "DisconnectReason",
                                DBUS_TYPE_INT32, &service->disconnect_reason);
  
+               connman_dbus_dict_append_basic(dict, "AssocStatusCode",
+                               DBUS_TYPE_INT32, &service->assoc_status_code);
+ 
                break;
  #endif
        case CONNMAN_SERVICE_TYPE_ETHERNET:
@@@ -3430,6 -3425,53 +3433,6 @@@ void __connman_service_list_struct(DBus
        g_list_foreach(service_list, append_struct, iter);
  }
  
 -#if defined TIZEN_EXT
 -static void append_wifi_vsie_properties(DBusMessageIter *iter,
 -                                      struct connman_service *service)
 -{
 -      DBusMessageIter dict;
 -      const void *wifi_vsie;
 -      unsigned int wifi_vsie_len;
 -
 -      connman_dbus_dict_open(iter, &dict);
 -
 -      wifi_vsie = connman_network_get_blob(service->network, "WiFi.Vsie", &wifi_vsie_len);
 -
 -      if(wifi_vsie_len > 0) {
 -              DBG("ConnMan, service->path=%s vsie length=%d", service->path, wifi_vsie_len);
 -      }
 -
 -      connman_dbus_dict_append_fixed_array(&dict, "Vsie", DBUS_TYPE_BYTE,
 -                      &wifi_vsie, wifi_vsie_len);
 -
 -      connman_dbus_dict_close(iter, &dict);
 -}
 -
 -void __connman_wifi_vsie_list_struct(DBusMessageIter *iter)
 -{
 -      GList *list;
 -      DBusMessageIter entry;
 -
 -      DBG("ConnMan, __connman_wifi_vsie_list_struct API called");
 -
 -      for (list = service_list; list; list = list->next) {
 -              struct connman_service *service = list->data;
 -
 -              if (!service->path ||
 -                              service->type !=  CONNMAN_SERVICE_TYPE_WIFI ||
 -                              service->network == NULL)
 -                      continue;
 -
 -              dbus_message_iter_open_container(iter, DBUS_TYPE_STRUCT,
 -                              NULL, &entry);
 -              dbus_message_iter_append_basic(&entry, DBUS_TYPE_OBJECT_PATH,
 -                              &service->path);
 -              append_wifi_vsie_properties(&entry, service);
 -              dbus_message_iter_close_container(iter, &entry);
 -      }
 -}
 -#endif
 -
  bool __connman_service_is_hidden(struct connman_service *service)
  {
        return service->hidden;
@@@ -5220,6 -5262,9 +5223,9 @@@ static DBusMessage *connect_service(DBu
  
        /*Reset the Disconnect Reason while issue connect request*/
        service->disconnect_reason = 0;
+ 
+       /*Reset the association status code while issue connect request*/
+       service->assoc_status_code = 0;
  #endif
  
        if (service->pending)
@@@ -7094,6 -7139,7 +7100,7 @@@ static int service_indicate_state(struc
  
                def_service = __connman_service_get_default();
                service->disconnect_reason = connman_network_get_disconnect_reason(service->network);
+               service->assoc_status_code = connman_network_get_assoc_status_code(service->network);
  
                if (!__connman_notifier_is_connected() &&
                        def_service &&