diff options
author | Dan Williams <dcbw@redhat.com> | 2016-08-18 09:36:47 -0500 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2016-08-18 09:36:47 -0500 |
commit | 81c213791e794311a01f3f69e763eb9b10c84f4d (patch) | |
tree | df12a9214069a44487ae25e69ad208bf9be6f2e2 /src | |
parent | 2f18f241c6efa34702f2288d1cb205907a247c91 (diff) | |
download | external_libqmi-81c213791e794311a01f3f69e763eb9b10c84f4d.zip external_libqmi-81c213791e794311a01f3f69e763eb9b10c84f4d.tar.gz external_libqmi-81c213791e794311a01f3f69e763eb9b10c84f4d.tar.bz2 |
qmicli: add support for IP type to --wds-start-network
Diffstat (limited to 'src')
-rw-r--r-- | src/qmicli/qmicli-wds.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/qmicli/qmicli-wds.c b/src/qmicli/qmicli-wds.c index b4b1a60..cd1debf 100644 --- a/src/qmicli/qmicli-wds.c +++ b/src/qmicli/qmicli-wds.c @@ -67,7 +67,7 @@ static gboolean noop_flag; static GOptionEntry entries[] = { { "wds-start-network", 0, 0, G_OPTION_ARG_STRING, &start_network_str, - "Start network (allowed keys: apn, 3gpp-profile, 3gpp2-profile, auth (PAP|CHAP|BOTH), username, password, autoconnect=yes)", + "Start network (allowed keys: apn, 3gpp-profile, 3gpp2-profile, auth (PAP|CHAP|BOTH), username, password, autoconnect=yes, ip-type (4|6))", "[\"key=value,...\"]" }, { "wds-follow-network", 0, 0, G_OPTION_ARG_NONE, &follow_network_flag, @@ -336,6 +336,7 @@ typedef struct { guint8 profile_index_3gpp2; QmiWdsAuthentication auth; gboolean auth_set; + QmiWdsIpFamily ip_type; gchar *username; gchar *password; gboolean autoconnect; @@ -410,6 +411,25 @@ start_network_properties_handle (const gchar *key, return TRUE; } + if (g_ascii_strcasecmp (key, "ip-type") == 0 && props->ip_type == 0) { + switch (atoi (value)) { + case 4: + props->ip_type = QMI_WDS_IP_FAMILY_IPV4; + break; + case 6: + props->ip_type = QMI_WDS_IP_FAMILY_IPV6; + break; + default: + g_set_error (error, + QMI_CORE_ERROR, + QMI_CORE_ERROR_FAILED, + "unknown IP type '%s' (not 4 or 6)", + value); + return FALSE; + } + return TRUE; + } + g_set_error (error, QMI_CORE_ERROR, QMI_CORE_ERROR_FAILED, @@ -487,6 +507,10 @@ start_network_input_create (const gchar *str) if (props.profile_index_3gpp2 > 0) qmi_message_wds_start_network_input_set_profile_index_3gpp2 (input, props.profile_index_3gpp2, NULL); + /* Set IP Type */ + if (props.ip_type != QMI_WDS_IP_FAMILY_UNSPECIFIED) + qmi_message_wds_start_network_input_set_ip_family_preference (input, props.ip_type, NULL); + /* Set authentication method */ if (props.auth_set) { aux_auth_str = qmi_wds_authentication_build_string_from_mask (props.auth); |