2014-07-24 08:53:33 -04:00
|
|
|
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This library 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
|
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
|
* Boston, MA 02110-1301 USA.
|
|
|
|
|
*
|
2018-05-23 18:10:29 +02:00
|
|
|
* Copyright 2007 - 2018 Red Hat, Inc.
|
2014-07-24 08:53:33 -04:00
|
|
|
* Copyright 2007 - 2008 Novell, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
2016-02-19 14:57:48 +01:00
|
|
|
#include "nm-default.h"
|
2014-11-13 10:07:02 -05:00
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
#include "nm-setting-serial.h"
|
|
|
|
|
#include "nm-setting-private.h"
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* SECTION:nm-setting-serial
|
|
|
|
|
* @short_description: Describes connection properties for devices that use
|
|
|
|
|
* serial communications
|
|
|
|
|
*
|
|
|
|
|
* The #NMSettingSerial object is a #NMSetting subclass that describes
|
|
|
|
|
* properties necessary for connections that may use serial communications,
|
|
|
|
|
* such as mobile broadband or analog telephone connections.
|
|
|
|
|
**/
|
|
|
|
|
|
libnm: use NMMetaSettingInfo for tracking setting priority
Previously, each (non abstract) NMSetting class had to register
its name and priority via _nm_register_setting().
Note, that libnm-core.la already links against "nm-meta-setting.c",
which also redundantly keeps track of the settings name and gtype
as well.
Re-use NMMetaSettingInfo also in libnm-core.la, to track this meta
data.
The goal is to get rid of private data structures that track
meta data about NMSetting classes. In this case, "registered_settings"
hash. Instead, we should have one place where all this meta data
is tracked. This was, it is also accessible as internal API,
which can be useful (for keyfile).
Note that NMSettingClass has some overlap with NMMetaSettingInfo.
One difference is, that NMMetaSettingInfo is const, while NMSettingClass
is only initialized during the class_init() method. Appart from that,
it's mostly a matter of taste, whether we attach meta data to
NMSettingClass, to NMMetaSettingInfo, or to a static-array indexed
by NMMetaSettingType.
Note, that previously, _nm_register_setting() was private API. That
means, no user could subclass a functioning NMSetting instance. The same
is still true: NMMetaSettingInfo is internal API and users cannot access
it to create their own NMSetting subclasses. But that is almost desired.
libnm is not designed, to be extensible via subclassing, nor is it
clear why that would be a useful thing to do. One day, we should remove
the NMSetting and NMSettingClass definitions from public headers. Their
only use is subclassing the types, which however does not work.
While libnm-core was linking already against nm-meta-setting.c,
nm_meta_setting_infos was unreferenced. So, this change increases
the binary size of libnm and NetworkManager (1032 bytes). Note however
that roughly the same information was previously allocated at runtime.
2018-07-27 14:08:14 +02:00
|
|
|
G_DEFINE_TYPE (NMSettingSerial, nm_setting_serial, NM_TYPE_SETTING)
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
#define NM_SETTING_SERIAL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_SERIAL, NMSettingSerialPrivate))
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
guint baud;
|
|
|
|
|
guint bits;
|
|
|
|
|
char parity;
|
|
|
|
|
guint stopbits;
|
|
|
|
|
guint64 send_delay;
|
|
|
|
|
} NMSettingSerialPrivate;
|
|
|
|
|
|
2019-01-11 08:28:26 +01:00
|
|
|
NM_GOBJECT_PROPERTIES_DEFINE_BASE (
|
2014-07-24 08:53:33 -04:00
|
|
|
PROP_BAUD,
|
|
|
|
|
PROP_BITS,
|
|
|
|
|
PROP_PARITY,
|
|
|
|
|
PROP_STOPBITS,
|
|
|
|
|
PROP_SEND_DELAY,
|
2019-01-11 08:28:26 +01:00
|
|
|
);
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_serial_new:
|
|
|
|
|
*
|
|
|
|
|
* Creates a new #NMSettingSerial object with default values.
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): the new empty #NMSettingSerial object
|
|
|
|
|
**/
|
|
|
|
|
NMSetting *
|
|
|
|
|
nm_setting_serial_new (void)
|
|
|
|
|
{
|
|
|
|
|
return (NMSetting *) g_object_new (NM_TYPE_SETTING_SERIAL, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_serial_get_baud:
|
|
|
|
|
* @setting: the #NMSettingSerial
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingSerial:baud property of the setting
|
|
|
|
|
**/
|
|
|
|
|
guint
|
|
|
|
|
nm_setting_serial_get_baud (NMSettingSerial *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_SERIAL (setting), 0);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_SERIAL_GET_PRIVATE (setting)->baud;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_serial_get_bits:
|
|
|
|
|
* @setting: the #NMSettingSerial
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingSerial:bits property of the setting
|
|
|
|
|
**/
|
|
|
|
|
guint
|
|
|
|
|
nm_setting_serial_get_bits (NMSettingSerial *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_SERIAL (setting), 0);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_SERIAL_GET_PRIVATE (setting)->bits;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_serial_get_parity:
|
|
|
|
|
* @setting: the #NMSettingSerial
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingSerial:parity property of the setting
|
|
|
|
|
**/
|
2014-09-24 09:12:46 -04:00
|
|
|
NMSettingSerialParity
|
2014-07-24 08:53:33 -04:00
|
|
|
nm_setting_serial_get_parity (NMSettingSerial *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_SERIAL (setting), 0);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_SERIAL_GET_PRIVATE (setting)->parity;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_serial_get_stopbits:
|
|
|
|
|
* @setting: the #NMSettingSerial
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingSerial:stopbits property of the setting
|
|
|
|
|
**/
|
|
|
|
|
guint
|
|
|
|
|
nm_setting_serial_get_stopbits (NMSettingSerial *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_SERIAL (setting), 0);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_SERIAL_GET_PRIVATE (setting)->stopbits;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_setting_serial_get_send_delay:
|
|
|
|
|
* @setting: the #NMSettingSerial
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #NMSettingSerial:send-delay property of the setting
|
|
|
|
|
**/
|
|
|
|
|
guint64
|
|
|
|
|
nm_setting_serial_get_send_delay (NMSettingSerial *setting)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (NM_IS_SETTING_SERIAL (setting), 0);
|
|
|
|
|
|
|
|
|
|
return NM_SETTING_SERIAL_GET_PRIVATE (setting)->send_delay;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
nm_setting_serial_init (NMSettingSerial *setting)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-24 09:12:46 -04:00
|
|
|
static GVariant *
|
|
|
|
|
parity_to_dbus (const GValue *from)
|
|
|
|
|
{
|
|
|
|
|
switch (g_value_get_enum (from)) {
|
|
|
|
|
case NM_SETTING_SERIAL_PARITY_EVEN:
|
|
|
|
|
return g_variant_new_byte ('E');
|
|
|
|
|
case NM_SETTING_SERIAL_PARITY_ODD:
|
|
|
|
|
return g_variant_new_byte ('o');
|
|
|
|
|
case NM_SETTING_SERIAL_PARITY_NONE:
|
|
|
|
|
default:
|
|
|
|
|
return g_variant_new_byte ('n');
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
parity_from_dbus (GVariant *from, GValue *to)
|
|
|
|
|
{
|
|
|
|
|
switch (g_variant_get_byte (from)) {
|
|
|
|
|
case 'E':
|
|
|
|
|
g_value_set_enum (to, NM_SETTING_SERIAL_PARITY_EVEN);
|
|
|
|
|
break;
|
|
|
|
|
case 'o':
|
|
|
|
|
g_value_set_enum (to, NM_SETTING_SERIAL_PARITY_ODD);
|
|
|
|
|
break;
|
|
|
|
|
case 'n':
|
|
|
|
|
default:
|
|
|
|
|
g_value_set_enum (to, NM_SETTING_SERIAL_PARITY_NONE);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-24 08:53:33 -04:00
|
|
|
static void
|
|
|
|
|
set_property (GObject *object, guint prop_id,
|
|
|
|
|
const GValue *value, GParamSpec *pspec)
|
|
|
|
|
{
|
|
|
|
|
NMSettingSerialPrivate *priv = NM_SETTING_SERIAL_GET_PRIVATE (object);
|
|
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_BAUD:
|
|
|
|
|
priv->baud = g_value_get_uint (value);
|
|
|
|
|
break;
|
|
|
|
|
case PROP_BITS:
|
|
|
|
|
priv->bits = g_value_get_uint (value);
|
|
|
|
|
break;
|
|
|
|
|
case PROP_PARITY:
|
2014-09-24 09:12:46 -04:00
|
|
|
priv->parity = g_value_get_enum (value);
|
2014-07-24 08:53:33 -04:00
|
|
|
break;
|
|
|
|
|
case PROP_STOPBITS:
|
|
|
|
|
priv->stopbits = g_value_get_uint (value);
|
|
|
|
|
break;
|
|
|
|
|
case PROP_SEND_DELAY:
|
|
|
|
|
priv->send_delay = g_value_get_uint64 (value);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
get_property (GObject *object, guint prop_id,
|
|
|
|
|
GValue *value, GParamSpec *pspec)
|
|
|
|
|
{
|
|
|
|
|
NMSettingSerial *setting = NM_SETTING_SERIAL (object);
|
|
|
|
|
|
|
|
|
|
switch (prop_id) {
|
|
|
|
|
case PROP_BAUD:
|
|
|
|
|
g_value_set_uint (value, nm_setting_serial_get_baud (setting));
|
|
|
|
|
break;
|
|
|
|
|
case PROP_BITS:
|
|
|
|
|
g_value_set_uint (value, nm_setting_serial_get_bits (setting));
|
|
|
|
|
break;
|
|
|
|
|
case PROP_PARITY:
|
2014-09-24 09:12:46 -04:00
|
|
|
g_value_set_enum (value, nm_setting_serial_get_parity (setting));
|
2014-07-24 08:53:33 -04:00
|
|
|
break;
|
|
|
|
|
case PROP_STOPBITS:
|
|
|
|
|
g_value_set_uint (value, nm_setting_serial_get_stopbits (setting));
|
|
|
|
|
break;
|
|
|
|
|
case PROP_SEND_DELAY:
|
|
|
|
|
g_value_set_uint64 (value, nm_setting_serial_get_send_delay (setting));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
nm_setting_serial_class_init (NMSettingSerialClass *klass)
|
2014-07-24 08:53:33 -04:00
|
|
|
{
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
|
NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
|
libnm: rework setting metadata for property handling
NMSetting internally already tracked a list of all proper GObject properties
and D-Bus-only properties.
Rework the tracking of the list, so that:
- instead of attaching the data to the GType of the setting via
g_type_set_qdata(), it is tracked in a static array indexed by
NMMetaSettingType. This allows to find the setting-data by simple
pointer arithmetic, instead of taking a look and iterating (like
g_type_set_qdata() does).
Note, that this is still thread safe, because the static table entry is
initialized in the class-init function with _nm_setting_class_commit().
And it only accessed by following a NMSettingClass instance, thus
the class constructor already ran (maybe not for all setting classes,
but for the particular one that we look up).
I think this makes initialization of the metadata simpler to
understand.
Previously, in a first phase each class would attach the metadata
to the GType as setting_property_overrides_quark(). Then during
nm_setting_class_ensure_properties() it would merge them and
set as setting_properties_quark(). Now, during the first phase,
we only incrementally build a properties_override GArray, which
we finally hand over during nm_setting_class_commit().
- sort the property infos by name and do binary search.
Also expose this meta data types as internal API in nm-setting-private.h.
While not accessed yet, it can prove beneficial, to have direct (internal)
access to these structures.
Also, rename NMSettingProperty to NMSettInfoProperty to use a distinct
naming scheme. We already have 40+ subclasses of NMSetting that are called
NMSetting*. Likewise, NMMetaSetting* is heavily used already. So, choose a
new, distinct name.
2018-07-28 15:26:03 +02:00
|
|
|
GArray *properties_override = _nm_sett_info_property_override_create_array ();
|
2014-07-24 08:53:33 -04:00
|
|
|
|
libnm/trivial: cleanup variable names in settings' class-init functions
- Don't use @parent_class name. This local variable (and @object_class) is
the class instance up-cast to the pointer types of the parents. The point
here is not that it is the direct parent. The point is, that it's the
NMSettingClass type.
Also, it can only be used inconsistently, in face of NMSettingIP4Config,
who's parent type is NMSettingIPConfig. Clearly, inside
nm-setting-ip4-config.c we wouldn't want to use the "parent_class"
name. Consistently rename @parent_class to @setting_class.
- Also rename the pointer to the own class to @klass. "setting_class" is also the
wrong name for that, because the right name would be something like
"setting_6lowpan_class".
However, "klass" is preferred over the latter, because we commonly create new
GObject implementations by copying an existing one. Generic names like "klass"
and "self" inside a type implementation make that simpler.
- drop useless comments like
/* virtual functions */
/* Properties */
It's better to logically and visually structure the code, and avoid trival
remarks about that. They only end up being used inconsistently. If you
even need a stronger visual separator, then an 80 char /****/ line
should be preferred.
2018-07-28 10:43:21 +02:00
|
|
|
g_type_class_add_private (klass, sizeof (NMSettingSerialPrivate));
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
object_class->set_property = set_property;
|
|
|
|
|
object_class->get_property = get_property;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingSerial:baud:
|
|
|
|
|
*
|
|
|
|
|
* Speed to use for communication over the serial port. Note that this
|
|
|
|
|
* value usually has no effect for mobile broadband modems as they generally
|
|
|
|
|
* ignore speed settings and use the highest available speed.
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_BAUD] =
|
|
|
|
|
g_param_spec_uint (NM_SETTING_SERIAL_BAUD, "", "",
|
|
|
|
|
0, G_MAXUINT, 57600,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingSerial:bits:
|
|
|
|
|
*
|
|
|
|
|
* Byte-width of the serial communication. The 8 in "8n1" for example.
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_BITS] =
|
|
|
|
|
g_param_spec_uint (NM_SETTING_SERIAL_BITS, "", "",
|
|
|
|
|
5, 8, 8,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingSerial:parity:
|
|
|
|
|
*
|
2014-09-24 09:12:46 -04:00
|
|
|
* Parity setting of the serial port.
|
2014-07-24 08:53:33 -04:00
|
|
|
**/
|
libnm, libnm-util: move settings doc generation to libnm-core
Move the settings/plugins doc generation from libnm-util to
libnm-core, since libnm-util isn't being updated for all new
properties.
With this commit, the keyfile and ifcfg-rh documentation is basically
unchanged, except that deprecated properties are now gone, and new
properties have been added, and the sections are in a different order.
(generate-plugin-docs.pl just outputs the settings in Makefile order,
and they were unsorted in libnm-util, but are sorted in libnm-core).
The settings documentation used for nm-settings.5, the D-Bus API docs,
and the nmcli help is changed a bit more at this point, and mostly for
the worse, since the libnm-core setting properties don't match up with
the D-Bus API as well as the libnm-util ones do. To be fixed...
(I also removed the "plugins docs" line in each plugin docs comment
block while moving them, since those blocks will be used for more than
just plugins soon, and it's sort of obvious anyway.)
2014-10-28 09:58:25 -04:00
|
|
|
/* ---keyfile---
|
|
|
|
|
* property: parity
|
|
|
|
|
* format: 'e', 'o', or 'n'
|
|
|
|
|
* description: The connection parity; even, odd, or none. Note that older
|
|
|
|
|
* versions of NetworkManager stored this as an integer: 69 ('E') for even,
|
|
|
|
|
* 111 ('o') for odd, or 110 ('n') for none.
|
|
|
|
|
* example: parity=n
|
|
|
|
|
* ---end---
|
2014-11-16 15:36:18 -05:00
|
|
|
* ---dbus---
|
|
|
|
|
* property: parity
|
|
|
|
|
* format: byte
|
|
|
|
|
* description: The connection parity: 69 (ASCII 'E') for even parity,
|
|
|
|
|
* 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
|
|
|
|
|
* ---end---
|
libnm, libnm-util: move settings doc generation to libnm-core
Move the settings/plugins doc generation from libnm-util to
libnm-core, since libnm-util isn't being updated for all new
properties.
With this commit, the keyfile and ifcfg-rh documentation is basically
unchanged, except that deprecated properties are now gone, and new
properties have been added, and the sections are in a different order.
(generate-plugin-docs.pl just outputs the settings in Makefile order,
and they were unsorted in libnm-util, but are sorted in libnm-core).
The settings documentation used for nm-settings.5, the D-Bus API docs,
and the nmcli help is changed a bit more at this point, and mostly for
the worse, since the libnm-core setting properties don't match up with
the D-Bus API as well as the libnm-util ones do. To be fixed...
(I also removed the "plugins docs" line in each plugin docs comment
block while moving them, since those blocks will be used for more than
just plugins soon, and it's sort of obvious anyway.)
2014-10-28 09:58:25 -04:00
|
|
|
*/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_PARITY] =
|
|
|
|
|
g_param_spec_enum (NM_SETTING_SERIAL_PARITY, "", "",
|
|
|
|
|
NM_TYPE_SETTING_SERIAL_PARITY,
|
|
|
|
|
NM_SETTING_SERIAL_PARITY_NONE,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
libnm: rework setting metadata for property handling
NMSetting internally already tracked a list of all proper GObject properties
and D-Bus-only properties.
Rework the tracking of the list, so that:
- instead of attaching the data to the GType of the setting via
g_type_set_qdata(), it is tracked in a static array indexed by
NMMetaSettingType. This allows to find the setting-data by simple
pointer arithmetic, instead of taking a look and iterating (like
g_type_set_qdata() does).
Note, that this is still thread safe, because the static table entry is
initialized in the class-init function with _nm_setting_class_commit().
And it only accessed by following a NMSettingClass instance, thus
the class constructor already ran (maybe not for all setting classes,
but for the particular one that we look up).
I think this makes initialization of the metadata simpler to
understand.
Previously, in a first phase each class would attach the metadata
to the GType as setting_property_overrides_quark(). Then during
nm_setting_class_ensure_properties() it would merge them and
set as setting_properties_quark(). Now, during the first phase,
we only incrementally build a properties_override GArray, which
we finally hand over during nm_setting_class_commit().
- sort the property infos by name and do binary search.
Also expose this meta data types as internal API in nm-setting-private.h.
While not accessed yet, it can prove beneficial, to have direct (internal)
access to these structures.
Also, rename NMSettingProperty to NMSettInfoProperty to use a distinct
naming scheme. We already have 40+ subclasses of NMSetting that are called
NMSetting*. Likewise, NMMetaSetting* is heavily used already. So, choose a
new, distinct name.
2018-07-28 15:26:03 +02:00
|
|
|
|
|
|
|
|
_properties_override_add_transform (properties_override,
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_PARITY],
|
libnm: rework setting metadata for property handling
NMSetting internally already tracked a list of all proper GObject properties
and D-Bus-only properties.
Rework the tracking of the list, so that:
- instead of attaching the data to the GType of the setting via
g_type_set_qdata(), it is tracked in a static array indexed by
NMMetaSettingType. This allows to find the setting-data by simple
pointer arithmetic, instead of taking a look and iterating (like
g_type_set_qdata() does).
Note, that this is still thread safe, because the static table entry is
initialized in the class-init function with _nm_setting_class_commit().
And it only accessed by following a NMSettingClass instance, thus
the class constructor already ran (maybe not for all setting classes,
but for the particular one that we look up).
I think this makes initialization of the metadata simpler to
understand.
Previously, in a first phase each class would attach the metadata
to the GType as setting_property_overrides_quark(). Then during
nm_setting_class_ensure_properties() it would merge them and
set as setting_properties_quark(). Now, during the first phase,
we only incrementally build a properties_override GArray, which
we finally hand over during nm_setting_class_commit().
- sort the property infos by name and do binary search.
Also expose this meta data types as internal API in nm-setting-private.h.
While not accessed yet, it can prove beneficial, to have direct (internal)
access to these structures.
Also, rename NMSettingProperty to NMSettInfoProperty to use a distinct
naming scheme. We already have 40+ subclasses of NMSetting that are called
NMSetting*. Likewise, NMMetaSetting* is heavily used already. So, choose a
new, distinct name.
2018-07-28 15:26:03 +02:00
|
|
|
G_VARIANT_TYPE_BYTE,
|
|
|
|
|
parity_to_dbus,
|
|
|
|
|
parity_from_dbus);
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingSerial:stopbits:
|
|
|
|
|
*
|
|
|
|
|
* Number of stop bits for communication on the serial port. Either 1 or 2.
|
|
|
|
|
* The 1 in "8n1" for example.
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_STOPBITS] =
|
|
|
|
|
g_param_spec_uint (NM_SETTING_SERIAL_STOPBITS, "", "",
|
|
|
|
|
1, 2, 1,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
2014-07-24 08:53:33 -04:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* NMSettingSerial:send-delay:
|
|
|
|
|
*
|
|
|
|
|
* Time to delay between each byte sent to the modem, in microseconds.
|
|
|
|
|
**/
|
2019-01-11 08:28:26 +01:00
|
|
|
obj_properties[PROP_SEND_DELAY] =
|
|
|
|
|
g_param_spec_uint64 (NM_SETTING_SERIAL_SEND_DELAY, "", "",
|
|
|
|
|
0, G_MAXUINT64, 0,
|
|
|
|
|
G_PARAM_READWRITE |
|
|
|
|
|
G_PARAM_CONSTRUCT |
|
|
|
|
|
G_PARAM_STATIC_STRINGS);
|
|
|
|
|
|
|
|
|
|
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
|
libnm: rework setting metadata for property handling
NMSetting internally already tracked a list of all proper GObject properties
and D-Bus-only properties.
Rework the tracking of the list, so that:
- instead of attaching the data to the GType of the setting via
g_type_set_qdata(), it is tracked in a static array indexed by
NMMetaSettingType. This allows to find the setting-data by simple
pointer arithmetic, instead of taking a look and iterating (like
g_type_set_qdata() does).
Note, that this is still thread safe, because the static table entry is
initialized in the class-init function with _nm_setting_class_commit().
And it only accessed by following a NMSettingClass instance, thus
the class constructor already ran (maybe not for all setting classes,
but for the particular one that we look up).
I think this makes initialization of the metadata simpler to
understand.
Previously, in a first phase each class would attach the metadata
to the GType as setting_property_overrides_quark(). Then during
nm_setting_class_ensure_properties() it would merge them and
set as setting_properties_quark(). Now, during the first phase,
we only incrementally build a properties_override GArray, which
we finally hand over during nm_setting_class_commit().
- sort the property infos by name and do binary search.
Also expose this meta data types as internal API in nm-setting-private.h.
While not accessed yet, it can prove beneficial, to have direct (internal)
access to these structures.
Also, rename NMSettingProperty to NMSettInfoProperty to use a distinct
naming scheme. We already have 40+ subclasses of NMSetting that are called
NMSetting*. Likewise, NMMetaSetting* is heavily used already. So, choose a
new, distinct name.
2018-07-28 15:26:03 +02:00
|
|
|
|
|
|
|
|
_nm_setting_class_commit_full (setting_class, NM_META_SETTING_TYPE_SERIAL,
|
|
|
|
|
NULL, properties_override);
|
2014-07-24 08:53:33 -04:00
|
|
|
}
|