Enhance portal check code to return connectivity_state

include/service.h

 /*
  *
  *  Connection Manager
  *
  *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  *
@@ skipping 60 matching lines @@
         CONNMAN_SERVICE_STATE_ASSOCIATION   = 3,
         CONNMAN_SERVICE_STATE_CONFIGURATION = 4,
         CONNMAN_SERVICE_STATE_READY         = 5,
         CONNMAN_SERVICE_STATE_DISCONNECT    = 6,
         CONNMAN_SERVICE_STATE_FAILURE       = 7,
         CONNMAN_SERVICE_STATE_ACTIVATION_FAILURE  = 8,
 
         CONNMAN_SERVICE_STATE_MAX
 };
 
+enum connman_service_connectivity_state {
+
+        /*
+         * The connectivity state is unknown.  This state is set for a
+         * ready service that is not the default service.  It is also
+         * the state from after the service becomes ready until a
+         * more exact state can be established.
+         */
+        CONNMAN_SERVICE_CONNECTIVITY_STATE_UNKNOWN      = 0,
+
+        /* No known issues making DNS and HTTP requests */
+        CONNMAN_SERVICE_CONNECTIVITY_STATE_UNRESTRICTED = 1,
+
+        /* Can only access a captive portal website */
+        CONNMAN_SERVICE_CONNECTIVITY_STATE_RESTRICTED   = 2,
+
+        /*
+         * Inside a captive portal with an IP address assigned but DNS
+         * and HTTP requests fail.
+         */
+        CONNMAN_SERVICE_CONNECTIVITY_STATE_NONE         = 3,
+
+        CONNMAN_SERVICE_CONNECTIVITY_STATE_MAX
+};
+
 enum connman_service_error {
         CONNMAN_SERVICE_ERROR_UNKNOWN            = 0,
         CONNMAN_SERVICE_ERROR_OUT_OF_RANGE       = 1,
         CONNMAN_SERVICE_ERROR_PIN_MISSING        = 2,
         CONNMAN_SERVICE_ERROR_DHCP_FAILED        = 3,
         CONNMAN_SERVICE_ERROR_CONNECT_FAILED     = 4,
         CONNMAN_SERVICE_ERROR_BAD_PASSPHRASE     = 5,
         CONNMAN_SERVICE_ERROR_BAD_WEPKEY         = 6,
         CONNMAN_SERVICE_ERROR_ACTIVATION_FAILED  = 7,
         CONNMAN_SERVICE_ERROR_NEED_EVDO          = 8,
@@ skipping 15 matching lines @@
 const char *connman_service_get_identifier(const struct connman_service *
                                                 service);
 connman_bool_t connman_service_get_autoconnect(const struct connman_service *
                                                 service);
 void connman_service_auto_connect(struct connman_service *);
 
 connman_bool_t connman_service_get_favorite(const struct connman_service *
                                                 service);
 int connman_service_set_favorite(struct connman_service *service,
                                                 connman_bool_t favorite);
-void connman_service_set_restricted_pool(struct connman_service *service,
-                                                connman_bool_t restricted);
+
+void connman_service_set_connectivity_state(struct connman_service *service,
+                      enum connman_service_connectivity_state connectivity);
 
 struct connman_device;
 struct connman_device *connman_service_get_device(struct connman_service
                                                 *service);
 const char *connman_service_get_state(const struct connman_service *service);
 const char *connman_service_get_type(const struct connman_service *service);
 
 struct connman_network;
 struct connman_service *connman_service_lookup_from_network(struct
                                                 connman_network *network);
@@ skipping 15 matching lines @@
 enum connman_network_phymode connman_service_get_phymode(const struct
                                                 connman_service *service);
 enum connman_service_security connman_service_get_security(const struct
                                                 connman_service *service);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* __CONNMAN_SERVICE_H */