fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 00:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tui: add support for editing DSL connections (rh #1105753)

Browse source
This commit is contained in:
Dan Winship 2014-07-11 12:05:13 -04:00
parent 030dace710
commit 054bf2bb74
7 changed files with 488 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/tui/Makefile.am
View file

@ -73,6 +73,8 @@ nmtui_SOURCES = \
nmt-page-bridge-port.h \
nmt-page-device.c \
nmt-page-device.h \
nmt-page-dsl.c \
nmt-page-dsl.h \
nmt-page-ethernet.c \
nmt-page-ethernet.h \
nmt-page-grid.c \
@ -85,6 +87,8 @@ nmtui_SOURCES = \
nmt-page-ip6.h \
nmt-page-main.c \
nmt-page-main.h \
nmt-page-ppp.c \
nmt-page-ppp.h \
nmt-page-team.c \
nmt-page-team.h \
nmt-page-team-port.c \

2
clients/tui/nm-editor-utils.c
View file

@ -176,6 +176,7 @@ nm_editor_utils_get_connection_type_list (void)
item->id_format = _("Mobile broadband connection %d");
item->no_autoconnect = TRUE;
g_ptr_array_add (array, item);
#endif
item = g_new0 (NMEditorConnectionTypeDataReal, 1);
item->data.name = _("DSL");
@ -185,7 +186,6 @@ nm_editor_utils_get_connection_type_list (void)
item->id_format = _("DSL connection %d");
item->no_autoconnect = TRUE;
g_ptr_array_add (array, item);
#endif
item = g_new0 (NMEditorConnectionTypeDataReal, 1);
item->data.name = _("Bond");

93
clients/tui/nmt-page-dsl.c Normal file
View file

@ -0,0 +1,93 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Copyright 2014 Red Hat, Inc.
*/
/**
* SECTION:nmt-page-dsl
* @short_description: The editor page for DSL connections
*/
#include "config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
#include "nmt-page-dsl.h"
#include "nmt-password-fields.h"
G_DEFINE_TYPE (NmtPageDsl, nmt_page_dsl, NMT_TYPE_EDITOR_PAGE)
NmtNewtWidget *
nmt_page_dsl_new (NMConnection *conn)
{
return g_object_new (NMT_TYPE_PAGE_DSL,
"connection", conn,
"title", _("DSL"),
NULL);
}
static void
nmt_page_dsl_init (NmtPageDsl *dsl)
{
}
static void
nmt_page_dsl_constructed (GObject *object)
{
NmtPageDsl *dsl = NMT_PAGE_DSL (object);
NmtPageGrid *grid;
NMSettingPppoe *s_pppoe;
NmtNewtWidget *widget;
NMConnection *conn;
conn = nmt_editor_page_get_connection (NMT_EDITOR_PAGE (dsl));
s_pppoe = nm_connection_get_setting_pppoe (conn);
if (!s_pppoe) {
nm_connection_add_setting (conn, nm_setting_pppoe_new ());
s_pppoe = nm_connection_get_setting_pppoe (conn);
}
grid = NMT_PAGE_GRID (dsl);
widget = nmt_newt_entry_new (40, 0);
nmt_page_grid_append (grid, _("Username"), widget, NULL);
g_object_bind_property (s_pppoe, NM_SETTING_PPPOE_USERNAME,
widget, "text",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
widget = nmt_password_fields_new (40, NMT_PASSWORD_FIELDS_SHOW_PASSWORD);
g_object_bind_property (s_pppoe, NM_SETTING_PPPOE_PASSWORD,
widget, "password",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
nmt_page_grid_append (grid, _("Password"), widget, NULL);
widget = nmt_newt_entry_new (40, 0);
nmt_page_grid_append (grid, _("Service"), widget, NULL);
g_object_bind_property (s_pppoe, NM_SETTING_PPPOE_SERVICE,
widget, "text",
G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
G_OBJECT_CLASS (nmt_page_dsl_parent_class)->constructed (object);
}
static void
nmt_page_dsl_class_init (NmtPageDslClass *dsl_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (dsl_class);
object_class->constructed = nmt_page_dsl_constructed;
}

49
clients/tui/nmt-page-dsl.h Normal file
View file

@ -0,0 +1,49 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Copyright 2013 Red Hat, Inc.
*/
#ifndef NMT_PAGE_DSL_H
#define NMT_PAGE_DSL_H
#include "nmt-editor-page.h"
G_BEGIN_DECLS
#define NMT_TYPE_PAGE_DSL (nmt_page_dsl_get_type ())
#define NMT_PAGE_DSL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_DSL, NmtPageDsl))
#define NMT_PAGE_DSL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_DSL, NmtPageDslClass))
#define NMT_IS_PAGE_DSL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMT_TYPE_PAGE_DSL))
#define NMT_IS_PAGE_DSL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMT_TYPE_PAGE_DSL))
#define NMT_PAGE_DSL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMT_TYPE_PAGE_DSL, NmtPageDslClass))
typedef struct {
NmtEditorPage parent;
} NmtPageDsl;
typedef struct {
NmtEditorPageClass parent;
} NmtPageDslClass;
GType nmt_page_dsl_get_type (void);
NmtNewtWidget *nmt_page_dsl_new (NMConnection *conn);
G_END_DECLS
#endif /* NMT_PAGE_DSL_H */

8
clients/tui/nmt-page-main.c
View file

@ -41,10 +41,12 @@
#include "nmt-page-bond.h"
#include "nmt-page-bridge.h"
#include "nmt-page-bridge-port.h"
#include "nmt-page-dsl.h"
#include "nmt-page-ethernet.h"
#include "nmt-page-infiniband.h"
#include "nmt-page-ip4.h"
#include "nmt-page-ip6.h"
#include "nmt-page-ppp.h"
#include "nmt-page-team.h"
#include "nmt-page-team-port.h"
#include "nmt-page-vlan.h"
@ -204,7 +206,11 @@ nmt_page_main_constructed (GObject *object)
add_section_for_page (grid, nmt_page_bridge_new (conn, deventry));
else if (nm_connection_is_type (conn, NM_SETTING_INFINIBAND_SETTING_NAME))
add_section_for_page (grid, nmt_page_infiniband_new (conn, deventry));
else if (nm_connection_is_type (conn, NM_SETTING_TEAM_SETTING_NAME))
else if (nm_connection_is_type (conn, NM_SETTING_PPPOE_SETTING_NAME)) {
add_section_for_page (grid, nmt_page_dsl_new (conn));
add_section_for_page (grid, nmt_page_ethernet_new (conn, deventry));
add_section_for_page (grid, nmt_page_ppp_new (conn));
} else if (nm_connection_is_type (conn, NM_SETTING_TEAM_SETTING_NAME))
add_section_for_page (grid, nmt_page_team_new (conn, deventry));
else if (nm_connection_is_type (conn, NM_SETTING_VLAN_SETTING_NAME))
add_section_for_page (grid, nmt_page_vlan_new (conn, deventry));

285
clients/tui/nmt-page-ppp.c Normal file
View file

@ -0,0 +1,285 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Copyright 2014 Red Hat, Inc.
*/
/**
* SECTION:nmt-page-ppp
* @short_description: The editor page for PPP configuration
*/
#include "config.h"
#include <stdlib.h>
#include <glib.h>
#include <glib/gi18n-lib.h>
#include "nmt-page-ppp.h"
#include "nmt-newt-section.h"
#include "nmt-newt-separator.h"
G_DEFINE_TYPE (NmtPagePpp, nmt_page_ppp, NMT_TYPE_EDITOR_PAGE)
typedef struct {
guint32 lcp_echo_failure;
guint32 lcp_echo_interval;
} NmtPagePppPrivate;
#define NMT_PAGE_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMT_TYPE_PAGE_PPP, NmtPagePppPrivate))
NmtNewtWidget *
nmt_page_ppp_new (NMConnection *conn)
{
return g_object_new (NMT_TYPE_PAGE_PPP,
"connection", conn,
"title", _("PPP CONFIGURATION"),
NULL);
}
static void
nmt_page_ppp_init (NmtPagePpp *ppp)
{
}
static gboolean
transform_lcp_echo_properties_to_checkbox (GBinding *binding,
const GValue *from_value,
GValue *to_value,
gpointer user_data)
{
NMSettingPpp *s_ppp = NM_SETTING_PPP (g_binding_get_source (binding));
if ( nm_setting_ppp_get_lcp_echo_interval (s_ppp) != 0
&& nm_setting_ppp_get_lcp_echo_failure (s_ppp) != 0)
g_value_set_boolean (to_value, TRUE);
else
g_value_set_boolean (to_value, FALSE);
return TRUE;
}
static gboolean
transform_checkbox_to_lcp_echo_interval (GBinding *binding,
const GValue *from_value,
GValue *to_value,
gpointer user_data)
{
NmtPagePpp *ppp = user_data;
NmtPagePppPrivate *priv = NMT_PAGE_PPP_GET_PRIVATE (ppp);
if (g_value_get_boolean (from_value))
g_value_set_uint (to_value, priv->lcp_echo_interval);
else
g_value_set_uint (to_value, 0);
return TRUE;
}
static gboolean
transform_checkbox_to_lcp_echo_failure (GBinding *binding,
const GValue *from_value,
GValue *to_value,
gpointer user_data)
{
NmtPagePpp *ppp = user_data;
NmtPagePppPrivate *priv = NMT_PAGE_PPP_GET_PRIVATE (ppp);
if (g_value_get_boolean (from_value))
g_value_set_uint (to_value, priv->lcp_echo_failure);
else
g_value_set_uint (to_value, 0);
return TRUE;
}
static void
nmt_page_ppp_constructed (GObject *object)
{
NmtPagePpp *ppp = NMT_PAGE_PPP (object);
NmtPagePppPrivate *priv = NMT_PAGE_PPP_GET_PRIVATE (ppp);
NmtPageGrid *grid;
NMSettingPpp *s_ppp;
NmtNewtWidget *widget, *use_mppe;
NmtNewtGrid *auth_grid, *mppe_grid;
NmtNewtSection *section;
NMConnection *conn;
conn = nmt_editor_page_get_connection (NMT_EDITOR_PAGE (ppp));
s_ppp = nm_connection_get_setting_ppp (conn);
if (s_ppp) {
priv->lcp_echo_interval = nm_setting_ppp_get_lcp_echo_interval (s_ppp);
priv->lcp_echo_failure = nm_setting_ppp_get_lcp_echo_failure (s_ppp);
} else {
s_ppp = (NMSettingPpp *) nm_setting_ppp_new ();
nm_connection_add_setting (conn, (NMSetting *) s_ppp);
priv->lcp_echo_interval = 30;
priv->lcp_echo_failure = 5;
}
grid = NMT_PAGE_GRID (ppp);
/* Auth methods */
widget = nmt_newt_section_new (FALSE);
section = NMT_NEWT_SECTION (widget);
g_object_set (section, "open", TRUE, NULL);
nmt_page_grid_append (grid, NULL, widget, NULL);
widget = nmt_newt_label_new (_("Allowed authentication methods:"));
nmt_newt_section_set_header (section, widget);
widget = nmt_newt_grid_new ();
auth_grid = NMT_NEWT_GRID (widget);
nmt_newt_section_set_body (section, widget);
widget = nmt_newt_checkbox_new (_("EAP"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_REFUSE_EAP,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_INVERT_BOOLEAN |
G_BINDING_SYNC_CREATE);
nmt_newt_grid_add (auth_grid, widget, 0, 0);
widget = nmt_newt_checkbox_new (_("PAP"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_REFUSE_PAP,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_INVERT_BOOLEAN |
G_BINDING_SYNC_CREATE);
nmt_newt_grid_add (auth_grid, widget, 0, 1);
widget = nmt_newt_checkbox_new (_("CHAP"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_REFUSE_CHAP,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_INVERT_BOOLEAN |
G_BINDING_SYNC_CREATE);
nmt_newt_grid_add (auth_grid, widget, 0, 2);
widget = nmt_newt_checkbox_new (_("MSCHAPv2"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_REFUSE_MSCHAPV2,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_INVERT_BOOLEAN |
G_BINDING_SYNC_CREATE);
nmt_newt_grid_add (auth_grid, widget, 0, 3);
widget = nmt_newt_checkbox_new (_("MSCHAP"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_REFUSE_MSCHAP,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_INVERT_BOOLEAN |
G_BINDING_SYNC_CREATE);
nmt_newt_grid_add (auth_grid, widget, 0, 4);
nmt_page_grid_append (grid, NULL, nmt_newt_separator_new (), NULL);
/* MPPE */
widget = nmt_newt_section_new (FALSE);
section = NMT_NEWT_SECTION (widget);
g_object_set (section, "open", TRUE, NULL);
nmt_page_grid_append (grid, NULL, widget, NULL);
widget = nmt_newt_checkbox_new (_("Use point-to-point encryption (MPPE)"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_REQUIRE_MPPE,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE);
use_mppe = widget;
nmt_newt_section_set_header (section, widget);
widget = nmt_newt_grid_new ();
mppe_grid = NMT_NEWT_GRID (widget);
nmt_newt_section_set_body (section, widget);
widget = nmt_newt_checkbox_new (_("Require 128-bit encryption"));
g_object_bind_property (use_mppe, "active",
widget, "sensitive",
G_BINDING_SYNC_CREATE);
g_object_bind_property (s_ppp, NM_SETTING_PPP_REQUIRE_MPPE_128,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE);
nmt_newt_grid_add (mppe_grid, widget, 0, 0);
widget = nmt_newt_checkbox_new (_("Use stateful MPPE"));
g_object_bind_property (use_mppe, "active",
widget, "sensitive",
G_BINDING_SYNC_CREATE);
g_object_bind_property (s_ppp, NM_SETTING_PPP_MPPE_STATEFUL,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE);
nmt_newt_grid_add (mppe_grid, widget, 0, 1);
nmt_page_grid_append (grid, NULL, nmt_newt_separator_new (), NULL);
widget = nmt_newt_checkbox_new (_("Allow BSD data compression"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_NOBSDCOMP,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_INVERT_BOOLEAN |
G_BINDING_SYNC_CREATE);
nmt_page_grid_append (grid, NULL, widget, NULL);
widget = nmt_newt_checkbox_new (_("Allow Deflate data compression"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_NODEFLATE,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_INVERT_BOOLEAN |
G_BINDING_SYNC_CREATE);
nmt_page_grid_append (grid, NULL, widget, NULL);
widget = nmt_newt_checkbox_new (_("Use TCP header compression"));
g_object_bind_property (s_ppp, NM_SETTING_PPP_NO_VJ_COMP,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_INVERT_BOOLEAN |
G_BINDING_SYNC_CREATE);
nmt_page_grid_append (grid, NULL, widget, NULL);
nmt_page_grid_append (grid, NULL, nmt_newt_separator_new (), NULL);
widget = nmt_newt_checkbox_new (_("Send PPP echo packets"));
g_object_bind_property_full (s_ppp, NM_SETTING_PPP_LCP_ECHO_INTERVAL,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE,
transform_lcp_echo_properties_to_checkbox,
transform_checkbox_to_lcp_echo_interval,
ppp, NULL);
g_object_bind_property_full (s_ppp, NM_SETTING_PPP_LCP_ECHO_FAILURE,
widget, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE,
transform_lcp_echo_properties_to_checkbox,
transform_checkbox_to_lcp_echo_failure,
ppp, NULL);
nmt_page_grid_append (grid, NULL, widget, NULL);
G_OBJECT_CLASS (nmt_page_ppp_parent_class)->constructed (object);
}
static void
nmt_page_ppp_class_init (NmtPagePppClass *ppp_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (ppp_class);
g_type_class_add_private (object_class, sizeof (NmtPagePppPrivate));
object_class->constructed = nmt_page_ppp_constructed;
}

49
clients/tui/nmt-page-ppp.h Normal file
View file

@ -0,0 +1,49 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Copyright 2014 Red Hat, Inc.
*/
#ifndef NMT_PAGE_PPP_H
#define NMT_PAGE_PPP_H
#include "nmt-editor-page.h"
G_BEGIN_DECLS
#define NMT_TYPE_PAGE_PPP (nmt_page_ppp_get_type ())
#define NMT_PAGE_PPP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_PAGE_PPP, NmtPagePpp))
#define NMT_PAGE_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMT_TYPE_PAGE_PPP, NmtPagePppClass))
#define NMT_IS_PAGE_PPP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMT_TYPE_PAGE_PPP))
#define NMT_IS_PAGE_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMT_TYPE_PAGE_PPP))
#define NMT_PAGE_PPP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMT_TYPE_PAGE_PPP, NmtPagePppClass))
typedef struct {
NmtEditorPage parent;
} NmtPagePpp;
typedef struct {
NmtEditorPageClass parent;
} NmtPagePppClass;
GType nmt_page_ppp_get_type (void);
NmtNewtWidget *nmt_page_ppp_new (NMConnection *conn);
G_END_DECLS
#endif /* NMT_PAGE_PPP_H */