diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-11-29 20:33:09 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-11-29 20:33:09 +0100 |
| commit | 3f85bd180b7afbee747273fba194f89ee792d2c6 (patch) | |
| tree | 20e1ac6a582cf4ee2a68633b9851ba560207d0c1 /src | |
| parent | 9959195bb4cc8632f77de23a6e7dd2aa44f1b2e4 (diff) | |
| download | connman-3f85bd180b7afbee747273fba194f89ee792d2c6.tar.gz connman-3f85bd180b7afbee747273fba194f89ee792d2c6.tar.bz2 connman-3f85bd180b7afbee747273fba194f89ee792d2c6.zip | |
Add network type for cable/carrier detection
Diffstat (limited to 'src')
| -rw-r--r-- | src/network.c | 6 | ||||
| -rw-r--r-- | src/service.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/network.c b/src/network.c index 727cfa31..c885122b 100644 --- a/src/network.c +++ b/src/network.c @@ -75,6 +75,8 @@ static const char *type2string(enum connman_network_type type) case CONNMAN_NETWORK_TYPE_UNKNOWN: case CONNMAN_NETWORK_TYPE_VENDOR: break; + case CONNMAN_NETWORK_TYPE_CABLE: + return "cable"; case CONNMAN_NETWORK_TYPE_WIFI: return "wifi"; case CONNMAN_NETWORK_TYPE_WIMAX: @@ -552,6 +554,7 @@ void connman_network_set_group(struct connman_network *network, switch (network->type) { case CONNMAN_NETWORK_TYPE_UNKNOWN: + case CONNMAN_NETWORK_TYPE_CABLE: case CONNMAN_NETWORK_TYPE_VENDOR: return; case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: @@ -609,6 +612,7 @@ connman_bool_t __connman_network_get_weakness(struct connman_network *network) switch (network->type) { case CONNMAN_NETWORK_TYPE_UNKNOWN: case CONNMAN_NETWORK_TYPE_VENDOR: + case CONNMAN_NETWORK_TYPE_CABLE: case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: @@ -1336,6 +1340,7 @@ static int network_probe(struct connman_element *element) case CONNMAN_NETWORK_TYPE_UNKNOWN: case CONNMAN_NETWORK_TYPE_VENDOR: break; + case CONNMAN_NETWORK_TYPE_CABLE: case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: @@ -1367,6 +1372,7 @@ static void network_remove(struct connman_element *element) case CONNMAN_NETWORK_TYPE_UNKNOWN: case CONNMAN_NETWORK_TYPE_VENDOR: break; + case CONNMAN_NETWORK_TYPE_CABLE: case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: case CONNMAN_NETWORK_TYPE_CELLULAR: diff --git a/src/service.c b/src/service.c index a3a6cf3d..31754712 100644 --- a/src/service.c +++ b/src/service.c @@ -1595,6 +1595,7 @@ static connman_bool_t prepare_network(struct connman_service *service) connman_network_set_string(service->network, "WiFi.Passphrase", service->passphrase); break; + case CONNMAN_NETWORK_TYPE_CABLE: case CONNMAN_NETWORK_TYPE_WIMAX: case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: @@ -2207,6 +2208,8 @@ static enum connman_service_type convert_network_type(struct connman_network *ne case CONNMAN_NETWORK_TYPE_UNKNOWN: case CONNMAN_NETWORK_TYPE_VENDOR: break; + case CONNMAN_NETWORK_TYPE_CABLE: + return CONNMAN_SERVICE_TYPE_ETHERNET; case CONNMAN_NETWORK_TYPE_WIFI: return CONNMAN_SERVICE_TYPE_WIFI; case CONNMAN_NETWORK_TYPE_WIMAX: |