mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
all: replace non-leading tabs with spaces
We commonly only allow tabs at the beginning of a line, not afterwards. The reason for this style is so that the code looks formated right with tabstop=4 and tabstop=8.
This commit is contained in:
parent
ca7273b3e2
commit
e4839accf5
12
Makefile.am
12
Makefile.am
|
@ -623,7 +623,7 @@ endif
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
libnm-core/crypto_gnutls.c \
|
libnm-core/crypto_gnutls.c \
|
||||||
libnm-core/crypto_nss.c \
|
libnm-core/crypto_nss.c \
|
||||||
libnm-core/nm-core-enum-types.c.template \
|
libnm-core/nm-core-enum-types.c.template \
|
||||||
libnm-core/nm-core-enum-types.h.template \
|
libnm-core/nm-core-enum-types.h.template \
|
||||||
libnm-core/meson.build
|
libnm-core/meson.build
|
||||||
|
@ -712,11 +712,11 @@ $(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenu
|
||||||
# test-cert.p12 created with:
|
# test-cert.p12 created with:
|
||||||
#
|
#
|
||||||
# openssl pkcs12 -export \
|
# openssl pkcs12 -export \
|
||||||
# -in test_key_and_cert.pem \
|
# -in test_key_and_cert.pem \
|
||||||
# -inkey test_key_and_cert.pem \
|
# -inkey test_key_and_cert.pem \
|
||||||
# -certfile test_ca_cert.pem \
|
# -certfile test_ca_cert.pem \
|
||||||
# -name "test-pkcs12" \
|
# -name "test-pkcs12" \
|
||||||
# -out test-cert.p12
|
# -out test-cert.p12
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
libnm-core/tests/certs/ca-no-ending-newline.pem \
|
libnm-core/tests/certs/ca-no-ending-newline.pem \
|
||||||
|
|
|
@ -6776,7 +6776,7 @@ confirm_connection_saving (NMConnection *local, NMConnection *remote)
|
||||||
return confirmed;
|
return confirmed;
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
guint level;
|
guint level;
|
||||||
char *main_prompt;
|
char *main_prompt;
|
||||||
NMSetting *curr_setting;
|
NMSetting *curr_setting;
|
||||||
|
|
|
@ -203,21 +203,21 @@ slaves_changed (GObject *object,
|
||||||
nmt_newt_component_set_sensitive (NMT_NEWT_COMPONENT (priv->mode), TRUE);
|
nmt_newt_component_set_sensitive (NMT_NEWT_COMPONENT (priv->mode), TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define WIDGET_CHANGED_FUNC(widget, func, option) \
|
#define WIDGET_CHANGED_FUNC(widget, func, option) \
|
||||||
static void \
|
static void \
|
||||||
widget ## _widget_changed (GObject *object, \
|
widget ## _widget_changed (GObject *object, \
|
||||||
GParamSpec *pspec, \
|
GParamSpec *pspec, \
|
||||||
gpointer user_data) \
|
gpointer user_data) \
|
||||||
{ \
|
{ \
|
||||||
NmtPageBond *bond = NMT_PAGE_BOND (user_data); \
|
NmtPageBond *bond = NMT_PAGE_BOND (user_data); \
|
||||||
NmtPageBondPrivate *priv = NMT_PAGE_BOND_GET_PRIVATE (bond); \
|
NmtPageBondPrivate *priv = NMT_PAGE_BOND_GET_PRIVATE (bond); \
|
||||||
\
|
\
|
||||||
if (priv->updating) \
|
if (priv->updating) \
|
||||||
return; \
|
return; \
|
||||||
\
|
\
|
||||||
priv->updating = TRUE; \
|
priv->updating = TRUE; \
|
||||||
nm_setting_bond_add_option (priv->s_bond, option, func (priv->widget)); \
|
nm_setting_bond_add_option (priv->s_bond, option, func (priv->widget)); \
|
||||||
priv->updating = FALSE; \
|
priv->updating = FALSE; \
|
||||||
}
|
}
|
||||||
|
|
||||||
WIDGET_CHANGED_FUNC (primary, nmt_newt_entry_get_text, NM_SETTING_BOND_OPTION_PRIMARY)
|
WIDGET_CHANGED_FUNC (primary, nmt_newt_entry_get_text, NM_SETTING_BOND_OPTION_PRIMARY)
|
||||||
|
|
|
@ -604,7 +604,7 @@ find_scripts (const char *str_action)
|
||||||
|
|
||||||
while ((filename = g_dir_read_name (dir))) {
|
while ((filename = g_dir_read_name (dir))) {
|
||||||
char *path;
|
char *path;
|
||||||
struct stat st;
|
struct stat st;
|
||||||
int err;
|
int err;
|
||||||
const char *err_msg = NULL;
|
const char *err_msg = NULL;
|
||||||
|
|
||||||
|
|
|
@ -49,18 +49,18 @@ extra_files = libnm-glib.png
|
||||||
|
|
||||||
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
||||||
# if $(DOC_MODULE).types is non-empty.
|
# if $(DOC_MODULE).types is non-empty.
|
||||||
GTKDOC_CFLAGS = \
|
GTKDOC_CFLAGS = \
|
||||||
-I$(top_srcdir)/shared \
|
-I$(top_srcdir)/shared \
|
||||||
-I$(top_builddir)/shared \
|
-I$(top_builddir)/shared \
|
||||||
-I$(top_srcdir)/libnm-util \
|
-I$(top_srcdir)/libnm-util \
|
||||||
-I$(top_builddir)/libnm-util \
|
-I$(top_builddir)/libnm-util \
|
||||||
-I$(top_srcdir)/libnm-glib \
|
-I$(top_srcdir)/libnm-glib \
|
||||||
-I$(top_builddir)/libnm-glib \
|
-I$(top_builddir)/libnm-glib \
|
||||||
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
|
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
|
||||||
$(GLIB_CFLAGS) \
|
$(GLIB_CFLAGS) \
|
||||||
$(DBUS_CFLAGS)
|
$(DBUS_CFLAGS)
|
||||||
|
|
||||||
GTKDOC_LIBS = \
|
GTKDOC_LIBS = \
|
||||||
$(top_builddir)/libnm-glib/libnm-glib.la \
|
$(top_builddir)/libnm-glib/libnm-glib.la \
|
||||||
$(GLIB_LIBS)
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -48,10 +48,10 @@ extra_files =
|
||||||
|
|
||||||
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
||||||
# if $(DOC_MODULE).types is non-empty.
|
# if $(DOC_MODULE).types is non-empty.
|
||||||
GTKDOC_CFLAGS = \
|
GTKDOC_CFLAGS = \
|
||||||
-I$(top_srcdir)/libnm-util \
|
-I$(top_srcdir)/libnm-util \
|
||||||
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
|
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
|
||||||
$(GLIB_CFLAGS) \
|
$(GLIB_CFLAGS) \
|
||||||
$(DBUS_CFLAGS)
|
$(DBUS_CFLAGS)
|
||||||
|
|
||||||
GTKDOC_LIBS = \
|
GTKDOC_LIBS = \
|
||||||
|
|
|
@ -66,15 +66,15 @@ extra_files = libnm.png
|
||||||
|
|
||||||
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
||||||
# if $(DOC_MODULE).types is non-empty.
|
# if $(DOC_MODULE).types is non-empty.
|
||||||
GTKDOC_CFLAGS = \
|
GTKDOC_CFLAGS = \
|
||||||
-I$(top_srcdir)/libnm-core \
|
-I$(top_srcdir)/libnm-core \
|
||||||
-I$(top_builddir)/libnm-core \
|
-I$(top_builddir)/libnm-core \
|
||||||
-I$(top_srcdir)/libnm \
|
-I$(top_srcdir)/libnm \
|
||||||
-I$(top_builddir)/libnm \
|
-I$(top_builddir)/libnm \
|
||||||
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
|
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
|
||||||
$(GLIB_CFLAGS)
|
$(GLIB_CFLAGS)
|
||||||
|
|
||||||
GTKDOC_LIBS = \
|
GTKDOC_LIBS = \
|
||||||
$(top_builddir)/libnm/libnm.la \
|
$(top_builddir)/libnm/libnm.la \
|
||||||
$(GLIB_LIBS)
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ static const char* _link_watcher_name[] = {
|
||||||
struct NMTeamLinkWatcher {
|
struct NMTeamLinkWatcher {
|
||||||
guint refcount;
|
guint refcount;
|
||||||
|
|
||||||
guint8 type; /* LinkWatcherTypes */
|
guint8 type; /* LinkWatcherTypes */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The union is constructed in order to allow mapping the options of all the
|
* The union is constructed in order to allow mapping the options of all the
|
||||||
|
|
|
@ -179,4 +179,4 @@ void nm_vpn_editor_plugin_set_plugin_info (NMVpnEditorPlugin *plugin
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* __NM_VPN_EDITOR_PLUGIN_H__ */
|
#endif /* __NM_VPN_EDITOR_PLUGIN_H__ */
|
||||||
|
|
|
@ -47,12 +47,12 @@ test_wireless_enabled (NMClient *client)
|
||||||
wireless = nm_client_wireless_get_enabled (client);
|
wireless = nm_client_wireless_get_enabled (client);
|
||||||
g_print ("Wireless enabled? %s\n", wireless ? "yes" : "no");
|
g_print ("Wireless enabled? %s\n", wireless ? "yes" : "no");
|
||||||
|
|
||||||
// nm_client_wireless_set_enabled (client, !wireless);
|
// nm_client_wireless_set_enabled (client, !wireless);
|
||||||
|
|
||||||
wireless = nm_client_wireless_hardware_get_enabled (client);
|
wireless = nm_client_wireless_hardware_get_enabled (client);
|
||||||
g_print ("Wireless HW enabled? %s\n", wireless ? "yes" : "no");
|
g_print ("Wireless HW enabled? %s\n", wireless ? "yes" : "no");
|
||||||
|
|
||||||
// nm_client_wireless_set_enabled (client, !wireless);
|
// nm_client_wireless_set_enabled (client, !wireless);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,37 +32,37 @@
|
||||||
#include "NetworkManager.h"
|
#include "NetworkManager.h"
|
||||||
#include "libnm_glib.h"
|
#include "libnm_glib.h"
|
||||||
|
|
||||||
#define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist"
|
#define DBUS_NO_SERVICE_ERROR "org.freedesktop.DBus.Error.ServiceDoesNotExist"
|
||||||
|
|
||||||
|
|
||||||
struct libnm_glib_ctx
|
struct libnm_glib_ctx
|
||||||
{
|
{
|
||||||
unsigned char check;
|
unsigned char check;
|
||||||
|
|
||||||
GMainContext * g_main_ctx;
|
GMainContext * g_main_ctx;
|
||||||
GMainLoop * g_main_loop;
|
GMainLoop * g_main_loop;
|
||||||
DBusConnection * dbus_con;
|
DBusConnection * dbus_con;
|
||||||
guint dbus_watcher;
|
guint dbus_watcher;
|
||||||
guint dbus_watch_interval;
|
guint dbus_watch_interval;
|
||||||
|
|
||||||
gboolean thread_done;
|
gboolean thread_done;
|
||||||
gboolean thread_inited;
|
gboolean thread_inited;
|
||||||
GThread * thread;
|
GThread * thread;
|
||||||
|
|
||||||
GSList * callbacks;
|
GSList * callbacks;
|
||||||
GMutex * callbacks_lock;
|
GMutex * callbacks_lock;
|
||||||
guint callback_id_last;
|
guint callback_id_last;
|
||||||
|
|
||||||
libnm_glib_state nm_state;
|
libnm_glib_state nm_state;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct libnm_glib_callback
|
typedef struct libnm_glib_callback
|
||||||
{
|
{
|
||||||
guint id;
|
guint id;
|
||||||
GMainContext * gmain_ctx;
|
GMainContext * gmain_ctx;
|
||||||
libnm_glib_ctx * libnm_glib_ctx;
|
libnm_glib_ctx * libnm_glib_ctx;
|
||||||
libnm_glib_callback_func func;
|
libnm_glib_callback_func func;
|
||||||
gpointer user_data;
|
gpointer user_data;
|
||||||
} libnm_glib_callback;
|
} libnm_glib_callback;
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,9 +74,9 @@ static void _libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state);
|
||||||
static void
|
static void
|
||||||
_libnm_glib_nm_state_cb (DBusPendingCall *pcall, void *user_data)
|
_libnm_glib_nm_state_cb (DBusPendingCall *pcall, void *user_data)
|
||||||
{
|
{
|
||||||
DBusMessage * reply;
|
DBusMessage *reply;
|
||||||
libnm_glib_ctx * ctx = (libnm_glib_ctx *) user_data;
|
libnm_glib_ctx *ctx = (libnm_glib_ctx *) user_data;
|
||||||
NMState nm_state;
|
NMState nm_state;
|
||||||
|
|
||||||
g_return_if_fail (pcall != NULL);
|
g_return_if_fail (pcall != NULL);
|
||||||
g_return_if_fail (ctx != NULL);
|
g_return_if_fail (ctx != NULL);
|
||||||
|
@ -108,8 +108,8 @@ out:
|
||||||
static void
|
static void
|
||||||
_libnm_glib_get_nm_state (libnm_glib_ctx *ctx)
|
_libnm_glib_get_nm_state (libnm_glib_ctx *ctx)
|
||||||
{
|
{
|
||||||
DBusMessage * message;
|
DBusMessage *message;
|
||||||
DBusPendingCall * pcall = NULL;
|
DBusPendingCall *pcall = NULL;
|
||||||
|
|
||||||
g_return_if_fail (ctx != NULL);
|
g_return_if_fail (ctx != NULL);
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ _libnm_glib_get_nm_state (libnm_glib_ctx *ctx)
|
||||||
static gboolean
|
static gboolean
|
||||||
_libnm_glib_callback_helper (gpointer user_data)
|
_libnm_glib_callback_helper (gpointer user_data)
|
||||||
{
|
{
|
||||||
libnm_glib_callback *cb_data = (libnm_glib_callback *)user_data;
|
libnm_glib_callback *cb_data = (libnm_glib_callback *)user_data;
|
||||||
|
|
||||||
g_return_val_if_fail (cb_data != NULL, FALSE);
|
g_return_val_if_fail (cb_data != NULL, FALSE);
|
||||||
g_return_val_if_fail (cb_data->func != NULL, FALSE);
|
g_return_val_if_fail (cb_data->func != NULL, FALSE);
|
||||||
|
@ -140,7 +140,7 @@ static void
|
||||||
_libnm_glib_schedule_single_callback (libnm_glib_ctx *ctx,
|
_libnm_glib_schedule_single_callback (libnm_glib_ctx *ctx,
|
||||||
libnm_glib_callback *callback)
|
libnm_glib_callback *callback)
|
||||||
{
|
{
|
||||||
GSource *source;
|
GSource *source;
|
||||||
|
|
||||||
g_return_if_fail (ctx != NULL);
|
g_return_if_fail (ctx != NULL);
|
||||||
g_return_if_fail (callback != NULL);
|
g_return_if_fail (callback != NULL);
|
||||||
|
@ -170,7 +170,7 @@ _libnm_glib_unschedule_single_callback (libnm_glib_ctx *ctx,
|
||||||
static void
|
static void
|
||||||
_libnm_glib_call_callbacks (libnm_glib_ctx *ctx)
|
_libnm_glib_call_callbacks (libnm_glib_ctx *ctx)
|
||||||
{
|
{
|
||||||
GSList *elem;
|
GSList *elem;
|
||||||
|
|
||||||
g_return_if_fail (ctx != NULL);
|
g_return_if_fail (ctx != NULL);
|
||||||
|
|
||||||
|
@ -188,7 +188,7 @@ _libnm_glib_call_callbacks (libnm_glib_ctx *ctx)
|
||||||
static void
|
static void
|
||||||
_libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state)
|
_libnm_glib_update_state (libnm_glib_ctx *ctx, NMState state)
|
||||||
{
|
{
|
||||||
libnm_glib_state old_state;
|
libnm_glib_state old_state;
|
||||||
|
|
||||||
g_return_if_fail (ctx != NULL);
|
g_return_if_fail (ctx != NULL);
|
||||||
|
|
||||||
|
@ -221,9 +221,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
|
||||||
DBusMessage *message,
|
DBusMessage *message,
|
||||||
void *user_data)
|
void *user_data)
|
||||||
{
|
{
|
||||||
libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
|
libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
|
||||||
gboolean handled = TRUE;
|
gboolean handled = TRUE;
|
||||||
DBusError error;
|
DBusError error;
|
||||||
|
|
||||||
g_return_val_if_fail (ctx != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
|
g_return_val_if_fail (ctx != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
|
||||||
g_return_val_if_fail (connection != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
|
g_return_val_if_fail (connection != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
|
||||||
|
@ -242,9 +242,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
|
||||||
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
|
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
|
||||||
{
|
{
|
||||||
/* New signal for dbus 0.23... */
|
/* New signal for dbus 0.23... */
|
||||||
char *service;
|
char *service;
|
||||||
char *old_owner;
|
char *old_owner;
|
||||||
char *new_owner;
|
char *new_owner;
|
||||||
|
|
||||||
if ( dbus_message_get_args (message, &error,
|
if ( dbus_message_get_args (message, &error,
|
||||||
DBUS_TYPE_STRING, &service,
|
DBUS_TYPE_STRING, &service,
|
||||||
|
@ -257,9 +257,9 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
|
||||||
gboolean old_owner_good = (old_owner && (strlen (old_owner) > 0));
|
gboolean old_owner_good = (old_owner && (strlen (old_owner) > 0));
|
||||||
gboolean new_owner_good = (new_owner && (strlen (new_owner) > 0));
|
gboolean new_owner_good = (new_owner && (strlen (new_owner) > 0));
|
||||||
|
|
||||||
if (!old_owner_good && new_owner_good) /* Equivalent to old ServiceCreated signal */
|
if (!old_owner_good && new_owner_good) /* Equivalent to old ServiceCreated signal */
|
||||||
_libnm_glib_get_nm_state (ctx);
|
_libnm_glib_get_nm_state (ctx);
|
||||||
else if (old_owner_good && !new_owner_good) /* Equivalent to old ServiceDeleted signal */
|
else if (old_owner_good && !new_owner_good) /* Equivalent to old ServiceDeleted signal */
|
||||||
ctx->nm_state = LIBNM_NO_NETWORKMANAGER;
|
ctx->nm_state = LIBNM_NO_NETWORKMANAGER;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -273,7 +273,7 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
|
||||||
}
|
}
|
||||||
else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "StateChanged"))
|
else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "StateChanged"))
|
||||||
{
|
{
|
||||||
NMState state = NM_STATE_UNKNOWN;
|
NMState state = NM_STATE_UNKNOWN;
|
||||||
|
|
||||||
dbus_message_get_args (message, &error, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID);
|
dbus_message_get_args (message, &error, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID);
|
||||||
_libnm_glib_update_state (ctx, state);
|
_libnm_glib_update_state (ctx, state);
|
||||||
|
@ -297,8 +297,8 @@ _libnm_glib_dbus_filter (DBusConnection *connection,
|
||||||
static DBusConnection *
|
static DBusConnection *
|
||||||
_libnm_glib_dbus_init (gpointer *user_data, GMainContext *context)
|
_libnm_glib_dbus_init (gpointer *user_data, GMainContext *context)
|
||||||
{
|
{
|
||||||
DBusConnection *connection = NULL;
|
DBusConnection *connection = NULL;
|
||||||
DBusError error;
|
DBusError error;
|
||||||
|
|
||||||
dbus_error_init (&error);
|
dbus_error_init (&error);
|
||||||
connection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error);
|
connection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error);
|
||||||
|
@ -349,7 +349,7 @@ _libnm_glib_dbus_init (gpointer *user_data, GMainContext *context)
|
||||||
static gboolean
|
static gboolean
|
||||||
_libnm_glib_dbus_watcher (gpointer user_data)
|
_libnm_glib_dbus_watcher (gpointer user_data)
|
||||||
{
|
{
|
||||||
libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
|
libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
|
||||||
|
|
||||||
g_return_val_if_fail (ctx != NULL, FALSE);
|
g_return_val_if_fail (ctx != NULL, FALSE);
|
||||||
|
|
||||||
|
@ -393,7 +393,7 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx)
|
||||||
|
|
||||||
if (ctx->dbus_watcher == 0)
|
if (ctx->dbus_watcher == 0)
|
||||||
{
|
{
|
||||||
GSource * source = g_timeout_source_new (ctx->dbus_watch_interval);
|
GSource *source = g_timeout_source_new (ctx->dbus_watch_interval);
|
||||||
g_source_set_callback (source, _libnm_glib_dbus_watcher, (gpointer) ctx, NULL);
|
g_source_set_callback (source, _libnm_glib_dbus_watcher, (gpointer) ctx, NULL);
|
||||||
ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx);
|
ctx->dbus_watcher = g_source_attach (source, ctx->g_main_ctx);
|
||||||
g_source_unref (source);
|
g_source_unref (source);
|
||||||
|
@ -410,7 +410,7 @@ _libnm_glib_schedule_dbus_watcher (libnm_glib_ctx *ctx)
|
||||||
static gpointer
|
static gpointer
|
||||||
_libnm_glib_dbus_worker (gpointer user_data)
|
_libnm_glib_dbus_worker (gpointer user_data)
|
||||||
{
|
{
|
||||||
libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
|
libnm_glib_ctx *ctx = (libnm_glib_ctx *)user_data;
|
||||||
|
|
||||||
g_return_val_if_fail (ctx != NULL, NULL);
|
g_return_val_if_fail (ctx != NULL, NULL);
|
||||||
|
|
||||||
|
@ -493,7 +493,7 @@ error:
|
||||||
libnm_glib_ctx *
|
libnm_glib_ctx *
|
||||||
libnm_glib_init (void)
|
libnm_glib_init (void)
|
||||||
{
|
{
|
||||||
libnm_glib_ctx *ctx = NULL;
|
libnm_glib_ctx *ctx = NULL;
|
||||||
|
|
||||||
if (!g_thread_supported ())
|
if (!g_thread_supported ())
|
||||||
g_thread_init (NULL);
|
g_thread_init (NULL);
|
||||||
|
@ -542,12 +542,12 @@ libnm_glib_get_network_state (const libnm_glib_ctx *ctx)
|
||||||
|
|
||||||
|
|
||||||
guint
|
guint
|
||||||
libnm_glib_register_callback (libnm_glib_ctx *ctx,
|
libnm_glib_register_callback (libnm_glib_ctx *ctx,
|
||||||
libnm_glib_callback_func func,
|
libnm_glib_callback_func func,
|
||||||
gpointer user_data,
|
gpointer user_data,
|
||||||
GMainContext *g_main_ctx)
|
GMainContext *g_main_ctx)
|
||||||
{
|
{
|
||||||
libnm_glib_callback *callback = NULL;
|
libnm_glib_callback *callback = NULL;
|
||||||
|
|
||||||
g_return_val_if_fail (ctx != NULL, 0);
|
g_return_val_if_fail (ctx != NULL, 0);
|
||||||
g_return_val_if_fail (func != NULL, 0);
|
g_return_val_if_fail (func != NULL, 0);
|
||||||
|
|
|
@ -78,13 +78,13 @@ nm_vpn_plugin_ui_interface_get_type (void)
|
||||||
if (!vpn_plugin_ui_interface_type) {
|
if (!vpn_plugin_ui_interface_type) {
|
||||||
const GTypeInfo vpn_plugin_ui_interface_info = {
|
const GTypeInfo vpn_plugin_ui_interface_info = {
|
||||||
sizeof (NMVpnPluginUiInterface), /* class_size */
|
sizeof (NMVpnPluginUiInterface), /* class_size */
|
||||||
interface_init, /* base_init */
|
interface_init, /* base_init */
|
||||||
NULL, /* base_finalize */
|
NULL, /* base_finalize */
|
||||||
NULL,
|
NULL,
|
||||||
NULL, /* class_finalize */
|
NULL, /* class_finalize */
|
||||||
NULL, /* class_data */
|
NULL, /* class_data */
|
||||||
0,
|
0,
|
||||||
0, /* n_preallocs */
|
0, /* n_preallocs */
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -197,13 +197,13 @@ nm_vpn_plugin_ui_widget_interface_get_type (void)
|
||||||
if (!vpn_plugin_ui_widget_interface_type) {
|
if (!vpn_plugin_ui_widget_interface_type) {
|
||||||
const GTypeInfo vpn_plugin_ui_widget_interface_info = {
|
const GTypeInfo vpn_plugin_ui_widget_interface_info = {
|
||||||
sizeof (NMVpnPluginUiWidgetInterface), /* class_size */
|
sizeof (NMVpnPluginUiWidgetInterface), /* class_size */
|
||||||
widget_interface_init, /* base_init */
|
widget_interface_init, /* base_init */
|
||||||
NULL, /* base_finalize */
|
NULL, /* base_finalize */
|
||||||
NULL,
|
NULL,
|
||||||
NULL, /* class_finalize */
|
NULL, /* class_finalize */
|
||||||
NULL, /* class_data */
|
NULL, /* class_data */
|
||||||
0,
|
0,
|
||||||
0, /* n_preallocs */
|
0, /* n_preallocs */
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -272,4 +272,4 @@ gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInte
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* NM_VPN_PLUGIN_UI_INTERFACE_H */
|
#endif /* NM_VPN_PLUGIN_UI_INTERFACE_H */
|
||||||
|
|
|
@ -55,7 +55,7 @@ struct EncodingTriplet
|
||||||
|
|
||||||
struct IsoLangToEncodings
|
struct IsoLangToEncodings
|
||||||
{
|
{
|
||||||
const char * lang;
|
const char *lang;
|
||||||
struct EncodingTriplet encodings;
|
struct EncodingTriplet encodings;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -63,13 +63,13 @@ struct IsoLangToEncodings
|
||||||
static const struct IsoLangToEncodings isoLangEntries5[] =
|
static const struct IsoLangToEncodings isoLangEntries5[] =
|
||||||
{
|
{
|
||||||
/* Simplified Chinese */
|
/* Simplified Chinese */
|
||||||
{ "zh_cn", {"euc-cn", "gb2312", "gb18030"} }, /* PRC */
|
{ "zh_cn", {"euc-cn", "gb2312", "gb18030"} }, /* PRC */
|
||||||
{ "zh_sg", {"euc-cn", "gb2312", "gb18030"} }, /* Singapore */
|
{ "zh_sg", {"euc-cn", "gb2312", "gb18030"} }, /* Singapore */
|
||||||
|
|
||||||
/* Traditional Chinese */
|
/* Traditional Chinese */
|
||||||
{ "zh_tw", {"big5", "euc-tw", NULL} }, /* Taiwan */
|
{ "zh_tw", {"big5", "euc-tw", NULL} }, /* Taiwan */
|
||||||
{ "zh_hk", {"big5", "euc-tw", "big5-hkcs"} },/* Hong Kong */
|
{ "zh_hk", {"big5", "euc-tw", "big5-hkcs"} },/* Hong Kong */
|
||||||
{ "zh_mo", {"big5", "euc-tw", NULL} }, /* Macau */
|
{ "zh_mo", {"big5", "euc-tw", NULL} }, /* Macau */
|
||||||
|
|
||||||
/* Table end */
|
/* Table end */
|
||||||
{ NULL, {NULL, NULL, NULL} }
|
{ NULL, {NULL, NULL, NULL} }
|
||||||
|
@ -79,49 +79,49 @@ static const struct IsoLangToEncodings isoLangEntries5[] =
|
||||||
static const struct IsoLangToEncodings isoLangEntries2[] =
|
static const struct IsoLangToEncodings isoLangEntries2[] =
|
||||||
{
|
{
|
||||||
/* Japanese */
|
/* Japanese */
|
||||||
{ "ja", {"euc-jp", "shift_jis", "iso-2022-jp"} },
|
{ "ja", {"euc-jp", "shift_jis", "iso-2022-jp"} },
|
||||||
|
|
||||||
/* Korean */
|
/* Korean */
|
||||||
{ "ko", {"euc-kr", "iso-2022-kr", "johab"} },
|
{ "ko", {"euc-kr", "iso-2022-kr", "johab"} },
|
||||||
|
|
||||||
/* Thai */
|
/* Thai */
|
||||||
{ "th", {"iso-8859-11","windows-874", NULL} },
|
{ "th", {"iso-8859-11","windows-874", NULL} },
|
||||||
|
|
||||||
/* Central European */
|
/* Central European */
|
||||||
{ "hu", {"iso-8859-2", "windows-1250", NULL} }, /* Hungarian */
|
{ "hu", {"iso-8859-2", "windows-1250", NULL} }, /* Hungarian */
|
||||||
{ "cs", {"iso-8859-2", "windows-1250", NULL} }, /* Czech */
|
{ "cs", {"iso-8859-2", "windows-1250", NULL} }, /* Czech */
|
||||||
{ "hr", {"iso-8859-2", "windows-1250", NULL} }, /* Croatian */
|
{ "hr", {"iso-8859-2", "windows-1250", NULL} }, /* Croatian */
|
||||||
{ "pl", {"iso-8859-2", "windows-1250", NULL} }, /* Polish */
|
{ "pl", {"iso-8859-2", "windows-1250", NULL} }, /* Polish */
|
||||||
{ "ro", {"iso-8859-2", "windows-1250", NULL} }, /* Romanian */
|
{ "ro", {"iso-8859-2", "windows-1250", NULL} }, /* Romanian */
|
||||||
{ "sk", {"iso-8859-2", "windows-1250", NULL} }, /* Slovakian */
|
{ "sk", {"iso-8859-2", "windows-1250", NULL} }, /* Slovakian */
|
||||||
{ "sl", {"iso-8859-2", "windows-1250", NULL} }, /* Slovenian */
|
{ "sl", {"iso-8859-2", "windows-1250", NULL} }, /* Slovenian */
|
||||||
{ "sh", {"iso-8859-2", "windows-1250", NULL} }, /* Serbo-Croatian */
|
{ "sh", {"iso-8859-2", "windows-1250", NULL} }, /* Serbo-Croatian */
|
||||||
|
|
||||||
/* Cyrillic */
|
/* Cyrillic */
|
||||||
{ "ru", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Russian */
|
{ "ru", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Russian */
|
||||||
{ "be", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Belorussian */
|
{ "be", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Belorussian */
|
||||||
{ "bg", {"windows-1251","koi8-r", "iso-8859-5"} }, /* Bulgarian */
|
{ "bg", {"windows-1251","koi8-r", "iso-8859-5"} }, /* Bulgarian */
|
||||||
{ "mk", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Macedonian */
|
{ "mk", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Macedonian */
|
||||||
{ "sr", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Serbian */
|
{ "sr", {"koi8-r", "windows-1251", "iso-8859-5"} }, /* Serbian */
|
||||||
{ "uk", {"koi8-u", "koi8-r", "windows-1251"} }, /* Ukranian */
|
{ "uk", {"koi8-u", "koi8-r", "windows-1251"} }, /* Ukranian */
|
||||||
|
|
||||||
/* Arabic */
|
/* Arabic */
|
||||||
{ "ar", {"iso-8859-6", "windows-1256", NULL} },
|
{ "ar", {"iso-8859-6", "windows-1256", NULL} },
|
||||||
|
|
||||||
/* Baltic */
|
/* Baltic */
|
||||||
{ "et", {"iso-8859-4", "windows-1257", NULL} }, /* Estonian */
|
{ "et", {"iso-8859-4", "windows-1257", NULL} }, /* Estonian */
|
||||||
{ "lt", {"iso-8859-4", "windows-1257", NULL} }, /* Lithuanian */
|
{ "lt", {"iso-8859-4", "windows-1257", NULL} }, /* Lithuanian */
|
||||||
{ "lv", {"iso-8859-4", "windows-1257", NULL} }, /* Latvian */
|
{ "lv", {"iso-8859-4", "windows-1257", NULL} }, /* Latvian */
|
||||||
|
|
||||||
/* Greek */
|
/* Greek */
|
||||||
{ "el", {"iso-8859-7", "windows-1253", NULL} },
|
{ "el", {"iso-8859-7", "windows-1253", NULL} },
|
||||||
|
|
||||||
/* Hebrew */
|
/* Hebrew */
|
||||||
{ "he", {"iso-8859-8", "windows-1255", NULL} },
|
{ "he", {"iso-8859-8", "windows-1255", NULL} },
|
||||||
{ "iw", {"iso-8859-8", "windows-1255", NULL} },
|
{ "iw", {"iso-8859-8", "windows-1255", NULL} },
|
||||||
|
|
||||||
/* Turkish */
|
/* Turkish */
|
||||||
{ "tr", {"iso-8859-9", "windows-1254", NULL} },
|
{ "tr", {"iso-8859-9", "windows-1254", NULL} },
|
||||||
|
|
||||||
/* Table end */
|
/* Table end */
|
||||||
{ NULL, {NULL, NULL, NULL} }
|
{ NULL, {NULL, NULL, NULL} }
|
||||||
|
@ -166,9 +166,9 @@ get_encodings_for_lang (const char *lang,
|
||||||
char **encoding2,
|
char **encoding2,
|
||||||
char **encoding3)
|
char **encoding3)
|
||||||
{
|
{
|
||||||
struct EncodingTriplet * encodings;
|
struct EncodingTriplet *encodings;
|
||||||
gboolean success = FALSE;
|
gboolean success = FALSE;
|
||||||
char * tmp_lang;
|
char *tmp_lang;
|
||||||
|
|
||||||
g_return_val_if_fail (lang != NULL, FALSE);
|
g_return_val_if_fail (lang != NULL, FALSE);
|
||||||
g_return_val_if_fail (encoding1 != NULL, FALSE);
|
g_return_val_if_fail (encoding1 != NULL, FALSE);
|
||||||
|
|
|
@ -83,4 +83,4 @@ gboolean nm_vpn_editor_update_connection (NMVpnEditor *editor,
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* __NM_VPN_EDITOR_H__ */
|
#endif /* __NM_VPN_EDITOR_H__ */
|
||||||
|
|
|
@ -24,12 +24,12 @@
|
||||||
|
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
|
|
||||||
#define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ())
|
#define NM_TYPE_DEVICE_ETHERNET (nm_device_ethernet_get_type ())
|
||||||
#define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet))
|
#define NM_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernet))
|
||||||
#define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
|
#define NM_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
|
||||||
#define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET))
|
#define NM_IS_DEVICE_ETHERNET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_ETHERNET))
|
||||||
#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET))
|
#define NM_IS_DEVICE_ETHERNET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_ETHERNET))
|
||||||
#define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
|
#define NM_DEVICE_ETHERNET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_ETHERNET, NMDeviceEthernetClass))
|
||||||
|
|
||||||
#define NM_DEVICE_ETHERNET_SPEED "speed"
|
#define NM_DEVICE_ETHERNET_SPEED "speed"
|
||||||
#define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
|
#define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
|
||||||
|
@ -37,12 +37,12 @@
|
||||||
struct _NMDeviceEthernetPrivate;
|
struct _NMDeviceEthernetPrivate;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
NMDevice parent;
|
NMDevice parent;
|
||||||
struct _NMDeviceEthernetPrivate *_priv;
|
struct _NMDeviceEthernetPrivate *_priv;
|
||||||
} NMDeviceEthernet;
|
} NMDeviceEthernet;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
NMDeviceClass parent;
|
NMDeviceClass parent;
|
||||||
} NMDeviceEthernetClass;
|
} NMDeviceEthernetClass;
|
||||||
|
|
||||||
GType nm_device_ethernet_get_type (void);
|
GType nm_device_ethernet_get_type (void);
|
||||||
|
|
|
@ -141,4 +141,4 @@ gboolean nm_device_match_hwaddr (NMDevice *device,
|
||||||
NMConnection *connection,
|
NMConnection *connection,
|
||||||
gboolean fail_if_no_hwaddr);
|
gboolean fail_if_no_hwaddr);
|
||||||
|
|
||||||
#endif /* NM_DEVICE_PRIVATE_H */
|
#endif /* NM_DEVICE_PRIVATE_H */
|
||||||
|
|
|
@ -436,7 +436,7 @@ typedef struct _NMDevicePrivate {
|
||||||
};
|
};
|
||||||
NMIP6Config * con_ip6_config; /* config from the setting */
|
NMIP6Config * con_ip6_config; /* config from the setting */
|
||||||
AppliedConfig wwan_ip6_config;
|
AppliedConfig wwan_ip6_config;
|
||||||
AppliedConfig ac_ip6_config; /* config from IPv6 autoconfiguration */
|
AppliedConfig ac_ip6_config; /* config from IPv6 autoconfiguration */
|
||||||
NMIP6Config * ext_ip6_config; /* Stuff added outside NM */
|
NMIP6Config * ext_ip6_config; /* Stuff added outside NM */
|
||||||
NMIP6Config * ext_ip6_config_captured; /* Configuration captured from platform. */
|
NMIP6Config * ext_ip6_config_captured; /* Configuration captured from platform. */
|
||||||
GSList * vpn6_configs; /* VPNs which use this device */
|
GSList * vpn6_configs; /* VPNs which use this device */
|
||||||
|
@ -10899,7 +10899,7 @@ start_ping (NMDevice *self,
|
||||||
priv->gw_ping.log_domain = log_domain;
|
priv->gw_ping.log_domain = log_domain;
|
||||||
priv->gw_ping.address = g_strdup (address);
|
priv->gw_ping.address = g_strdup (address);
|
||||||
priv->gw_ping.binary = g_strdup (binary);
|
priv->gw_ping.binary = g_strdup (binary);
|
||||||
priv->gw_ping.deadline = timeout + 10; /* the proper termination is enforced by a timer */
|
priv->gw_ping.deadline = timeout + 10; /* the proper termination is enforced by a timer */
|
||||||
|
|
||||||
if (spawn_ping (self)) {
|
if (spawn_ping (self)) {
|
||||||
priv->gw_ping.watch = g_child_watch_add (priv->gw_ping.pid, ip_check_ping_watch_cb, self);
|
priv->gw_ping.watch = g_child_watch_add (priv->gw_ping.pid, ip_check_ping_watch_cb, self);
|
||||||
|
|
|
@ -439,19 +439,19 @@ dhclient_start (NMDhcpClient *client,
|
||||||
while (prefixes--)
|
while (prefixes--)
|
||||||
g_ptr_array_add (argv, (gpointer) "-P");
|
g_ptr_array_add (argv, (gpointer) "-P");
|
||||||
}
|
}
|
||||||
g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
|
g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
|
||||||
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
|
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
|
||||||
|
|
||||||
if (pid_file) {
|
if (pid_file) {
|
||||||
g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
|
g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
|
||||||
g_ptr_array_add (argv, (gpointer) pid_file);
|
g_ptr_array_add (argv, (gpointer) pid_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
g_ptr_array_add (argv, (gpointer) "-lf"); /* Set lease file */
|
g_ptr_array_add (argv, (gpointer) "-lf"); /* Set lease file */
|
||||||
g_ptr_array_add (argv, (gpointer) priv->lease_file);
|
g_ptr_array_add (argv, (gpointer) priv->lease_file);
|
||||||
|
|
||||||
if (priv->conf_file) {
|
if (priv->conf_file) {
|
||||||
g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
|
g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
|
||||||
g_ptr_array_add (argv, (gpointer) priv->conf_file);
|
g_ptr_array_add (argv, (gpointer) priv->conf_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -118,16 +118,16 @@ dhcpcanon_start (NMDhcpClient *client,
|
||||||
argv = g_ptr_array_new ();
|
argv = g_ptr_array_new ();
|
||||||
g_ptr_array_add (argv, (gpointer) dhcpcanon_path);
|
g_ptr_array_add (argv, (gpointer) dhcpcanon_path);
|
||||||
|
|
||||||
g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
|
g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */
|
||||||
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
|
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
|
||||||
|
|
||||||
if (pid_file) {
|
if (pid_file) {
|
||||||
g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
|
g_ptr_array_add (argv, (gpointer) "-pf"); /* Set pid file */
|
||||||
g_ptr_array_add (argv, (gpointer) pid_file);
|
g_ptr_array_add (argv, (gpointer) pid_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (priv->conf_file) {
|
if (priv->conf_file) {
|
||||||
g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
|
g_ptr_array_add (argv, (gpointer) "-cf"); /* Set interface config file */
|
||||||
g_ptr_array_add (argv, (gpointer) priv->conf_file);
|
g_ptr_array_add (argv, (gpointer) priv->conf_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -114,18 +114,18 @@ ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last
|
||||||
argv = g_ptr_array_new ();
|
argv = g_ptr_array_new ();
|
||||||
g_ptr_array_add (argv, (gpointer) dhcpcd_path);
|
g_ptr_array_add (argv, (gpointer) dhcpcd_path);
|
||||||
|
|
||||||
g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */
|
g_ptr_array_add (argv, (gpointer) "-B"); /* Don't background on lease (disable fork()) */
|
||||||
|
|
||||||
g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */
|
g_ptr_array_add (argv, (gpointer) "-K"); /* Disable built-in carrier detection */
|
||||||
|
|
||||||
g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL */
|
g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL */
|
||||||
|
|
||||||
/* --noarp. Don't request or claim the address by ARP; this also disables IPv4LL. */
|
/* --noarp. Don't request or claim the address by ARP; this also disables IPv4LL. */
|
||||||
g_ptr_array_add (argv, (gpointer) "-A");
|
g_ptr_array_add (argv, (gpointer) "-A");
|
||||||
|
|
||||||
g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */
|
g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */
|
||||||
|
|
||||||
g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */
|
g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */
|
||||||
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
|
g_ptr_array_add (argv, (gpointer) nm_dhcp_helper_path);
|
||||||
|
|
||||||
#ifdef DHCPCD_SUPPORTS_IPV6
|
#ifdef DHCPCD_SUPPORTS_IPV6
|
||||||
|
|
|
@ -304,7 +304,7 @@ activate:
|
||||||
&local_error)) {
|
&local_error)) {
|
||||||
_LOGW ("rollback: reactivation of connection %s/%s failed: %s",
|
_LOGW ("rollback: reactivation of connection %s/%s failed: %s",
|
||||||
nm_connection_get_id ((NMConnection *) connection),
|
nm_connection_get_id ((NMConnection *) connection),
|
||||||
nm_connection_get_uuid ((NMConnection * ) connection),
|
nm_connection_get_uuid ((NMConnection *) connection),
|
||||||
local_error->message);
|
local_error->message);
|
||||||
g_clear_error (&local_error);
|
g_clear_error (&local_error);
|
||||||
result = NM_ROLLBACK_RESULT_ERR_FAILED;
|
result = NM_ROLLBACK_RESULT_ERR_FAILED;
|
||||||
|
|
|
@ -404,7 +404,7 @@ struct nl80211_bss_info {
|
||||||
gboolean valid;
|
gboolean valid;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define WLAN_EID_SSID 0
|
#define WLAN_EID_SSID 0
|
||||||
|
|
||||||
static void
|
static void
|
||||||
find_ssid (guint8 *ies, guint32 ies_len,
|
find_ssid (guint8 *ies, guint32 ies_len,
|
||||||
|
|
|
@ -129,8 +129,8 @@ _recursive_ifparser (const char *eni_file, int quiet)
|
||||||
|
|
||||||
while (!feof(inp))
|
while (!feof(inp))
|
||||||
{
|
{
|
||||||
char *token[128]; /* 255 chars can only be split into 127 tokens */
|
char *token[128]; /* 255 chars can only be split into 127 tokens */
|
||||||
char value[255]; /* large enough to join previously split tokens */
|
char value[255]; /* large enough to join previously split tokens */
|
||||||
char *safeptr;
|
char *safeptr;
|
||||||
int toknum;
|
int toknum;
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
@ -169,7 +169,7 @@ _recursive_ifparser (const char *eni_file, int quiet)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define SPACES " \t"
|
#define SPACES " \t"
|
||||||
/* tokenize input; */
|
/* tokenize input; */
|
||||||
for (toknum = 0, token[toknum] = strtok_r(line, SPACES, &safeptr);
|
for (toknum = 0, token[toknum] = strtok_r(line, SPACES, &safeptr);
|
||||||
token[toknum] != NULL;
|
token[toknum] != NULL;
|
||||||
|
|
|
@ -222,10 +222,10 @@ validate_type_keyword (const struct Opt * opt,
|
||||||
const char * value,
|
const char * value,
|
||||||
const guint32 len)
|
const guint32 len)
|
||||||
{
|
{
|
||||||
char ** allowed;
|
char **allowed;
|
||||||
gchar ** candidates = NULL;
|
gchar **candidates = NULL;
|
||||||
char ** candidate;
|
char **candidate;
|
||||||
gboolean found = FALSE;
|
gboolean found = FALSE;
|
||||||
|
|
||||||
g_return_val_if_fail (opt != NULL, FALSE);
|
g_return_val_if_fail (opt != NULL, FALSE);
|
||||||
g_return_val_if_fail (value != NULL, FALSE);
|
g_return_val_if_fail (value != NULL, FALSE);
|
||||||
|
|
|
@ -21,9 +21,9 @@
|
||||||
#ifndef __NETWORKMANAGER_SUPPLICANT_TYPES_H__
|
#ifndef __NETWORKMANAGER_SUPPLICANT_TYPES_H__
|
||||||
#define __NETWORKMANAGER_SUPPLICANT_TYPES_H__
|
#define __NETWORKMANAGER_SUPPLICANT_TYPES_H__
|
||||||
|
|
||||||
#define WPAS_DBUS_SERVICE "fi.w1.wpa_supplicant1"
|
#define WPAS_DBUS_SERVICE "fi.w1.wpa_supplicant1"
|
||||||
#define WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1"
|
#define WPAS_DBUS_PATH "/fi/w1/wpa_supplicant1"
|
||||||
#define WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1"
|
#define WPAS_DBUS_INTERFACE "fi.w1.wpa_supplicant1"
|
||||||
|
|
||||||
typedef struct _NMSupplicantManager NMSupplicantManager;
|
typedef struct _NMSupplicantManager NMSupplicantManager;
|
||||||
typedef struct _NMSupplicantInterface NMSupplicantInterface;
|
typedef struct _NMSupplicantInterface NMSupplicantInterface;
|
||||||
|
|
Loading…
Reference in a new issue