fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 17:30:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
NetworkManager/src/core/nm-rfkill-manager.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

445 lines
13 KiB
C
Raw Permalink Normal View History

all: update deprecated SPDX license identifiers These SPDX license identifiers are deprecated ([1]). Update them. [1] https://spdx.org/licenses/ sed \ -e '1 s%^/\* SPDX-License-Identifier: \(GPL-2.0\|LGPL-2.1\)+ \*/$%/* SPDX-License-Identifier: \1-or-later */%' \ -e '1,2 s%^\(--\|#\|//\) SPDX-License-Identifier: \(GPL-2.0\|LGPL-2.1\)+$%\1 SPDX-License-Identifier: \2-or-later%' \ -i \ $(git grep -l SPDX-License-Identifier -- \ ':(exclude)shared/c-*/' \ ':(exclude)shared/n-*/' \ ':(exclude)shared/systemd/src' \ ':(exclude)src/systemd/src')
2020-12-23 22:21:36 +01:00
/* SPDX-License-Identifier: GPL-2.0-or-later */
all: manually drop code comments with file description
2019-09-25 13:13:40 +02:00
/*
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
* Copyright (C) 2009 - 2013 Red Hat, Inc.
*/
all: add "src/core/nm-default-daemon.h" as replacement for "nm-default.h"
2021-02-04 18:04:13 +01:00
#include "src/core/nm-default-daemon.h"
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
#include "nm-rfkill-manager.h"
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
#include <libudev.h>
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
#include "c-list/src/c-list.h"
build: move "shared/nm-{base,udev-aux}" to "src/libnm-{base,udev-aux}"
2021-02-18 08:13:35 +01:00
#include "libnm-udev-aux/nm-udev-utils.h"
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
/*****************************************************************************/
enum {
RFKILL_CHANGED,
LAST_SIGNAL,
};
static guint signals[LAST_SIGNAL] = {0};
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
typedef struct {
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
NMUdevClient *udev_client;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
/* Authoritative rfkill state (RFKILL_* enum) */
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
NMRfkillState rfkill_states[NM_RFKILL_TYPE_MAX];
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
CList killswitch_lst_head;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
} NMRfkillManagerPrivate;
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
struct _NMRfkillManager {
GObject parent;
NMRfkillManagerPrivate _priv;
};
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
struct _NMRfkillManagerClass {
GObjectClass parent;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
};
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
G_DEFINE_TYPE(NMRfkillManager, nm_rfkill_manager, G_TYPE_OBJECT)
#define NM_RFKILL_MANAGER_GET_PRIVATE(self) \
_NM_GET_PRIVATE(self, NMRfkillManager, NM_IS_RFKILL_MANAGER)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
/*****************************************************************************/
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
typedef struct {
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
CList killswitch_lst;
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
char *name;
char *path;
char *driver;
core/rfkill: cleanup initializing Killswitch struct - use slice allocator - use designated initializers - first determine all parameters in killswitch_new() before setting ks. - drop unnecessary memset().
2022-02-01 22:46:27 +01:00
guint64 seqnum;
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
NMRfkillType rtype;
int state;
core/rfkill: cleanup initializing Killswitch struct - use slice allocator - use designated initializers - first determine all parameters in killswitch_new() before setting ks. - drop unnecessary memset().
2022-02-01 22:46:27 +01:00
bool platform : 1;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
} Killswitch;
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
NMRfkillState
nm_rfkill_manager_get_rfkill_state(NMRfkillManager *self, NMRfkillType rtype)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
{
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
g_return_val_if_fail(self != NULL, NM_RFKILL_STATE_UNBLOCKED);
g_return_val_if_fail(rtype < NM_RFKILL_TYPE_MAX, NM_RFKILL_STATE_UNBLOCKED);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
return NM_RFKILL_MANAGER_GET_PRIVATE(self)->rfkill_states[rtype];
}
core/rfkill: add nm_rfkill_type_to_string() helper
2022-02-01 22:32:46 +01:00
const char *
nm_rfkill_type_to_string(NMRfkillType type)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
{
core/rfkill: add nm_rfkill_type_to_string() helper
2022-02-01 22:32:46 +01:00
switch (type) {
case NM_RFKILL_TYPE_WLAN:
all: say Wi-Fi instead of "wifi" or "WiFi" Correct the spelling across the *entire* tree, including translations, comments, etc. It's easier that way. Even the places where it's not exposed to the user, such as tests, so that we learn how is it spelled correctly.
2018-11-21 11:32:38 +01:00
return "Wi-Fi";
core/rfkill: add nm_rfkill_type_to_string() helper
2022-02-01 22:32:46 +01:00
case NM_RFKILL_TYPE_WWAN:
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
return "WWAN";
core/rfkill: add nm_rfkill_type_to_string() helper
2022-02-01 22:32:46 +01:00
case NM_RFKILL_TYPE_UNKNOWN:
break;
}
return nm_assert_unreachable_val("unknown");
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
static const char *
core/rfkill: rename rfkill_state_to_desc() to nm_rfkill_state_to_string()
2022-02-01 22:38:26 +01:00
nm_rfkill_state_to_string(NMRfkillState state)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
{
core/rfkill: rename rfkill_state_to_desc() to nm_rfkill_state_to_string()
2022-02-01 22:38:26 +01:00
switch (state) {
case NM_RFKILL_STATE_UNBLOCKED:
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
return "unblocked";
core/rfkill: rename rfkill_state_to_desc() to nm_rfkill_state_to_string()
2022-02-01 22:38:26 +01:00
case NM_RFKILL_STATE_SOFT_BLOCKED:
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
return "soft-blocked";
core/rfkill: rename rfkill_state_to_desc() to nm_rfkill_state_to_string()
2022-02-01 22:38:26 +01:00
case NM_RFKILL_STATE_HARD_BLOCKED:
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
return "hard-blocked";
core/rfkill: rename rfkill_state_to_desc() to nm_rfkill_state_to_string()
2022-02-01 22:38:26 +01:00
}
return nm_assert_unreachable_val("unknown");
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
static Killswitch *
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
killswitch_new(struct udev_device *device, NMRfkillType rtype)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
{
format: reformat source tree with clang-format 13.0 We use clang-format for automatic formatting of our source files. Since clang-format is actively maintained software, the actual formatting depends on the used version of clang-format. That is unfortunate and painful, but really unavoidable unless clang-format would be strictly bug-compatible. So the version that we must use is from the current Fedora release, which is also tested by our gitlab-ci. Previously, we were using Fedora 34 with clang-tools-extra-12.0.1-1.fc34.x86_64. As Fedora 35 comes along, we need to update our formatting as Fedora 35 comes with version "13.0.0~rc1-1.fc35". An alternative would be to freeze on version 12, but that has different problems (like, it's cumbersome to rebuild clang 12 on Fedora 35 and it would be cumbersome for our developers which are on Fedora 35 to use a clang that they cannot easily install). The (differently painful) solution is to reformat from time to time, as we switch to a new Fedora (and thus clang) version. Usually we would expect that such a reformatting brings minor changes. But this time, the changes are huge. That is mentioned in the release notes [1] as Makes PointerAligment: Right working with AlignConsecutiveDeclarations. (Fixes https://llvm.org/PR27353) [1] https://releases.llvm.org/13.0.0/tools/clang/docs/ReleaseNotes.html#clang-format
2021-11-09 13:28:54 +01:00
Killswitch *ks;
core/rfkill: cleanup initializing Killswitch struct - use slice allocator - use designated initializers - first determine all parameters in killswitch_new() before setting ks. - drop unnecessary memset().
2022-02-01 22:46:27 +01:00
struct udev_device *parent = NULL;
struct udev_device *grandparent = NULL;
const char *driver;
const char *subsys;
const char *parent_subsys = NULL;
gboolean platform;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
driver = udev_device_get_property_value(device, "DRIVER");
subsys = udev_device_get_subsystem(device);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
/* Check parent for various attributes */
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
parent = udev_device_get_parent(device);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
if (parent) {
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
parent_subsys = udev_device_get_subsystem(parent);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
if (!driver)
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
driver = udev_device_get_property_value(parent, "DRIVER");
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
if (!driver) {
/* Sigh; try the grandparent */
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
grandparent = udev_device_get_parent(parent);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
if (grandparent)
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
driver = udev_device_get_property_value(grandparent, "DRIVER");
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
}
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
if (!driver)
driver = "(unknown)";
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core/rfkill: cleanup initializing Killswitch struct - use slice allocator - use designated initializers - first determine all parameters in killswitch_new() before setting ks. - drop unnecessary memset().
2022-02-01 22:46:27 +01:00
platform = FALSE;
if (nm_streq0(subsys, "platform") || nm_streq0(parent_subsys, "platform")
|| nm_streq0(subsys, "acpi") || nm_streq0(parent_subsys, "acpi"))
platform = TRUE;
ks = g_slice_new(Killswitch);
*ks = (Killswitch){
.name = g_strdup(udev_device_get_sysname(device)),
.seqnum = udev_device_get_seqnum(device),
.path = g_strdup(udev_device_get_syspath(device)),
.rtype = rtype,
.driver = g_strdup(driver),
.platform = platform,
};
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
return ks;
}
static void
killswitch_destroy(Killswitch *ks)
{
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
c_list_unlink_stale(&ks->killswitch_lst);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
g_free(ks->name);
g_free(ks->path);
g_free(ks->driver);
core/rfkill: cleanup initializing Killswitch struct - use slice allocator - use designated initializers - first determine all parameters in killswitch_new() before setting ks. - drop unnecessary memset().
2022-02-01 22:46:27 +01:00
nm_g_slice_free(ks);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
static NMRfkillState
all: don't use gchar/gshort/gint/glong but C types We commonly don't use the glib typedefs for char/short/int/long, but their C types directly. $ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l 587 $ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l 21114 One could argue that using the glib typedefs is preferable in public API (of our glib based libnm library) or where it clearly is related to glib, like during g_object_set (obj, PROPERTY, (gint) value, NULL); However, that argument does not seem strong, because in practice we don't follow that argument today, and seldomly use the glib typedefs. Also, the style guide for this would be hard to formalize, because "using them where clearly related to a glib" is a very loose suggestion. Also note that glib typedefs will always just be typedefs of the underlying C types. There is no danger of glib changing the meaning of these typedefs (because that would be a major API break of glib). A simple style guide is instead: don't use these typedefs. No manual actions, I only ran the bash script: FILES=($(git ls-files '*.[hc]')) sed -i \ -e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \ -e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \ -e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \ "${FILES[@]}"
2018-07-11 07:40:19 +02:00
sysfs_state_to_nm_state(int sysfs_state)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
{
switch (sysfs_state) {
case 0:
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
return NM_RFKILL_STATE_SOFT_BLOCKED;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
case 1:
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
return NM_RFKILL_STATE_UNBLOCKED;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
case 2:
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
return NM_RFKILL_STATE_HARD_BLOCKED;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
default:
nm_log_warn(LOGD_RFKILL, "unhandled rfkill state %d", sysfs_state);
break;
}
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
return NM_RFKILL_STATE_UNBLOCKED;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
static void
recheck_killswitches(NMRfkillManager *self)
{
NMRfkillManagerPrivate *priv = NM_RFKILL_MANAGER_GET_PRIVATE(self);
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
Killswitch *ks;
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
NMRfkillState poll_states[NM_RFKILL_TYPE_MAX];
NMRfkillState platform_states[NM_RFKILL_TYPE_MAX];
gboolean platform_checked[NM_RFKILL_TYPE_MAX];
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
int i;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
/* Default state is unblocked */
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
for (i = 0; i < NM_RFKILL_TYPE_MAX; i++) {
poll_states[i] = NM_RFKILL_STATE_UNBLOCKED;
platform_states[i] = NM_RFKILL_STATE_UNBLOCKED;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
platform_checked[i] = FALSE;
}
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
/* Poll the states of all killswitches */
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
c_list_for_each_entry (ks, &priv->killswitch_lst_head, killswitch_lst) {
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
struct udev_device *device;
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
NMRfkillState dev_state;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
int sysfs_state;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
device = udev_device_new_from_subsystem_sysname(nm_udev_client_get_udev(priv->udev_client),
"rfkill",
ks->name);
if (!device)
continue;
sysfs_state =
_nm_utils_ascii_str_to_int64(udev_device_get_property_value(device, "RFKILL_STATE"),
10,
G_MININT,
G_MAXINT,
-1);
dev_state = sysfs_state_to_nm_state(sysfs_state);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
nm_log_dbg(LOGD_RFKILL,
"%s rfkill%s switch %s state now %d/%u",
core/rfkill: add nm_rfkill_type_to_string() helper
2022-02-01 22:32:46 +01:00
nm_rfkill_type_to_string(ks->rtype),
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
ks->platform ? " platform" : "",
ks->name,
sysfs_state,
dev_state);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
if (ks->platform == FALSE) {
if (dev_state > poll_states[ks->rtype])
poll_states[ks->rtype] = dev_state;
} else {
platform_checked[ks->rtype] = TRUE;
if (dev_state > platform_states[ks->rtype])
platform_states[ks->rtype] = dev_state;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
udev_device_unref(device);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
/* Log and emit change signal for final rfkill states */
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
for (i = 0; i < NM_RFKILL_TYPE_MAX; i++) {
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
if (platform_checked[i] == TRUE) {
/* blocked platform switch state overrides device state, otherwise
* let the device state stand. (bgo #655773)
*/
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
if (platform_states[i] != NM_RFKILL_STATE_UNBLOCKED)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
poll_states[i] = platform_states[i];
}
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
if (poll_states[i] != priv->rfkill_states[i]) {
nm_log_dbg(LOGD_RFKILL,
"%s rfkill state now '%s'",
core/rfkill: add nm_rfkill_type_to_string() helper
2022-02-01 22:32:46 +01:00
nm_rfkill_type_to_string(i),
core/rfkill: rename rfkill_state_to_desc() to nm_rfkill_state_to_string()
2022-02-01 22:38:26 +01:00
nm_rfkill_state_to_string(poll_states[i]));
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
priv->rfkill_states[i] = poll_states[i];
core/rfkill: cleanup arguments for "rfkill-changed" signal The signal parameters are G_TYPE_UINT. We should not assume that our enums are a compatible integer type. In practice of course they always were. Let's just be clear about when we have an integer and when we have an enum.
2022-02-02 12:04:27 +01:00
g_signal_emit(self,
signals[RFKILL_CHANGED],
0,
(guint) i,
(guint) priv->rfkill_states[i]);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
}
}
static Killswitch *
killswitch_find_by_name(NMRfkillManager *self, const char *name)
{
NMRfkillManagerPrivate *priv = NM_RFKILL_MANAGER_GET_PRIVATE(self);
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
Killswitch *ks;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
nm_assert(name);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
c_list_for_each_entry (ks, &priv->killswitch_lst_head, killswitch_lst) {
if (nm_streq(name, ks->name))
return ks;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
return NULL;
}
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
static NMRfkillType
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
rfkill_type_to_enum(const char *str)
{
core/rfkill: don't assert for valid string in rfkill_type_to_enum() "str" comes from udev. This is not a trusted component, and we must not assert for valid input.
2022-02-01 22:41:27 +01:00
if (str) {
if (nm_streq(str, "wlan"))
return NM_RFKILL_TYPE_WLAN;
if (nm_streq(str, "wwan"))
return NM_RFKILL_TYPE_WWAN;
}
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
return NM_RFKILL_TYPE_UNKNOWN;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
static void
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
add_one_killswitch(NMRfkillManager *self, struct udev_device *device)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
{
NMRfkillManagerPrivate *priv = NM_RFKILL_MANAGER_GET_PRIVATE(self);
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
NMRfkillType rtype;
format: reformat source tree with clang-format 13.0 We use clang-format for automatic formatting of our source files. Since clang-format is actively maintained software, the actual formatting depends on the used version of clang-format. That is unfortunate and painful, but really unavoidable unless clang-format would be strictly bug-compatible. So the version that we must use is from the current Fedora release, which is also tested by our gitlab-ci. Previously, we were using Fedora 34 with clang-tools-extra-12.0.1-1.fc34.x86_64. As Fedora 35 comes along, we need to update our formatting as Fedora 35 comes with version "13.0.0~rc1-1.fc35". An alternative would be to freeze on version 12, but that has different problems (like, it's cumbersome to rebuild clang 12 on Fedora 35 and it would be cumbersome for our developers which are on Fedora 35 to use a clang that they cannot easily install). The (differently painful) solution is to reformat from time to time, as we switch to a new Fedora (and thus clang) version. Usually we would expect that such a reformatting brings minor changes. But this time, the changes are huge. That is mentioned in the release notes [1] as Makes PointerAligment: Right working with AlignConsecutiveDeclarations. (Fixes https://llvm.org/PR27353) [1] https://releases.llvm.org/13.0.0/tools/clang/docs/ReleaseNotes.html#clang-format
2021-11-09 13:28:54 +01:00
Killswitch *ks;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core/rfkill: don't assert for valid string in rfkill_type_to_enum() "str" comes from udev. This is not a trusted component, and we must not assert for valid input.
2022-02-01 22:41:27 +01:00
rtype = rfkill_type_to_enum(udev_device_get_property_value(device, "RFKILL_TYPE"));
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
if (rtype == NM_RFKILL_TYPE_UNKNOWN)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
return;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
ks = killswitch_new(device, rtype);
c_list_link_front(&priv->killswitch_lst_head, &ks->killswitch_lst);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
nm_log_info(LOGD_RFKILL,
"%s: found %s radio killswitch (at %s) (%sdriver %s)",
ks->name,
core/rfkill: add nm_rfkill_type_to_string() helper
2022-02-01 22:32:46 +01:00
nm_rfkill_type_to_string(rtype),
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
ks->path,
ks->platform ? "platform " : "",
all: use the elvis operator wherever possible Coccinelle: @@ expression a, b; @@ -a ? a : b +a ?: b Applied with: spatch --sp-file ternary.cocci --in-place --smpl-spacing --dir . With some manual adjustments on spots that Cocci didn't catch for reasons unknown. Thanks to the marvelous effort of the GNU compiler developer we can now spare a couple of bits that could be used for more important things, like this commit message. Standards commitees yet have to catch up.
2018-04-24 11:20:03 +02:00
ks->driver ?: "<unknown>");
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
static void
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
rfkill_add(NMRfkillManager *self, struct udev_device *device)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
{
const char *name;
g_return_if_fail(device != NULL);
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
name = udev_device_get_sysname(device);
core/rfkill: use nm_streq() in "nm-rfkill-manager.c"
2022-02-01 23:00:58 +01:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
g_return_if_fail(name != NULL);
if (!killswitch_find_by_name(self, name))
add_one_killswitch(self, device);
}
static void
rfkill_remove(NMRfkillManager *self, struct udev_device *device)
{
NMRfkillManagerPrivate *priv = NM_RFKILL_MANAGER_GET_PRIVATE(self);
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
Killswitch *ks;
format: reformat source tree with clang-format 13.0 We use clang-format for automatic formatting of our source files. Since clang-format is actively maintained software, the actual formatting depends on the used version of clang-format. That is unfortunate and painful, but really unavoidable unless clang-format would be strictly bug-compatible. So the version that we must use is from the current Fedora release, which is also tested by our gitlab-ci. Previously, we were using Fedora 34 with clang-tools-extra-12.0.1-1.fc34.x86_64. As Fedora 35 comes along, we need to update our formatting as Fedora 35 comes with version "13.0.0~rc1-1.fc35". An alternative would be to freeze on version 12, but that has different problems (like, it's cumbersome to rebuild clang 12 on Fedora 35 and it would be cumbersome for our developers which are on Fedora 35 to use a clang that they cannot easily install). The (differently painful) solution is to reformat from time to time, as we switch to a new Fedora (and thus clang) version. Usually we would expect that such a reformatting brings minor changes. But this time, the changes are huge. That is mentioned in the release notes [1] as Makes PointerAligment: Right working with AlignConsecutiveDeclarations. (Fixes https://llvm.org/PR27353) [1] https://releases.llvm.org/13.0.0/tools/clang/docs/ReleaseNotes.html#clang-format
2021-11-09 13:28:54 +01:00
const char *name;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
g_return_if_fail(device != NULL);
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
name = udev_device_get_sysname(device);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
g_return_if_fail(name != NULL);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
c_list_for_each_entry (ks, &priv->killswitch_lst_head, killswitch_lst) {
if (nm_streq(ks->name, name)) {
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
nm_log_info(LOGD_RFKILL, "radio killswitch %s disappeared", ks->path);
killswitch_destroy(ks);
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
return;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
}
}
static void
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
handle_uevent(NMUdevClient *client, struct udev_device *device, gpointer user_data)
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
{
NMRfkillManager *self = NM_RFKILL_MANAGER(user_data);
format: reformat source tree with clang-format 13.0 We use clang-format for automatic formatting of our source files. Since clang-format is actively maintained software, the actual formatting depends on the used version of clang-format. That is unfortunate and painful, but really unavoidable unless clang-format would be strictly bug-compatible. So the version that we must use is from the current Fedora release, which is also tested by our gitlab-ci. Previously, we were using Fedora 34 with clang-tools-extra-12.0.1-1.fc34.x86_64. As Fedora 35 comes along, we need to update our formatting as Fedora 35 comes with version "13.0.0~rc1-1.fc35". An alternative would be to freeze on version 12, but that has different problems (like, it's cumbersome to rebuild clang 12 on Fedora 35 and it would be cumbersome for our developers which are on Fedora 35 to use a clang that they cannot easily install). The (differently painful) solution is to reformat from time to time, as we switch to a new Fedora (and thus clang) version. Usually we would expect that such a reformatting brings minor changes. But this time, the changes are huge. That is mentioned in the release notes [1] as Makes PointerAligment: Right working with AlignConsecutiveDeclarations. (Fixes https://llvm.org/PR27353) [1] https://releases.llvm.org/13.0.0/tools/clang/docs/ReleaseNotes.html#clang-format
2021-11-09 13:28:54 +01:00
const char *subsys;
const char *action;
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
action = udev_device_get_action(device);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
g_return_if_fail(action != NULL);
/* A bit paranoid */
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
subsys = udev_device_get_subsystem(device);
core/rfkill: use nm_streq() in "nm-rfkill-manager.c"
2022-02-01 23:00:58 +01:00
g_return_if_fail(nm_streq0(subsys, "rfkill"));
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
logging: remove LOGD_HW alias for LOGD_PLATFORM Since commit 1495853e01299d1eb33d4eb10b91e37dcf855cc8, LOGD_HW is renamed to LOGD_PLATFORM. Remove the internal usage of the deprecated name.
2016-10-06 21:28:40 +02:00
nm_log_dbg(LOGD_PLATFORM,
"udev rfkill event: action '%s' device '%s'",
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
action,
udev_device_get_sysname(device));
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core/rfkill: use nm_streq() in "nm-rfkill-manager.c"
2022-02-01 23:00:58 +01:00
if (nm_streq(action, "add"))
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
rfkill_add(self, device);
core/rfkill: use nm_streq() in "nm-rfkill-manager.c"
2022-02-01 23:00:58 +01:00
else if (nm_streq(action, "remove"))
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
rfkill_remove(self, device);
recheck_killswitches(self);
}
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
/*****************************************************************************/
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
static void
nm_rfkill_manager_init(NMRfkillManager *self)
{
NMRfkillManagerPrivate *priv = NM_RFKILL_MANAGER_GET_PRIVATE(self);
format: reformat source tree with clang-format 13.0 We use clang-format for automatic formatting of our source files. Since clang-format is actively maintained software, the actual formatting depends on the used version of clang-format. That is unfortunate and painful, but really unavoidable unless clang-format would be strictly bug-compatible. So the version that we must use is from the current Fedora release, which is also tested by our gitlab-ci. Previously, we were using Fedora 34 with clang-tools-extra-12.0.1-1.fc34.x86_64. As Fedora 35 comes along, we need to update our formatting as Fedora 35 comes with version "13.0.0~rc1-1.fc35". An alternative would be to freeze on version 12, but that has different problems (like, it's cumbersome to rebuild clang 12 on Fedora 35 and it would be cumbersome for our developers which are on Fedora 35 to use a clang that they cannot easily install). The (differently painful) solution is to reformat from time to time, as we switch to a new Fedora (and thus clang) version. Usually we would expect that such a reformatting brings minor changes. But this time, the changes are huge. That is mentioned in the release notes [1] as Makes PointerAligment: Right working with AlignConsecutiveDeclarations. (Fixes https://llvm.org/PR27353) [1] https://releases.llvm.org/13.0.0/tools/clang/docs/ReleaseNotes.html#clang-format
2021-11-09 13:28:54 +01:00
struct udev_enumerate *enumerate;
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
struct udev_list_entry *iter;
guint i;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
c_list_init(&priv->killswitch_lst_head);
core/rfkill: add "nm" prefix to RfKillState and RfKillType enums Names in header files should have an "nm" prefix. We do that pretty consistently. Fix the offenders RfKillState and RfKillType. Also, rename the RfKillState enums to follow the type name. For example, NM_RFKILL_STATE_SOFT_BLOCKED instead of RFKILL_SOFT_BLOCKED. Also, when we camel-case a typedef (NMRfKillState) we would want that the lower-case names use underscore between the words. So it should be `nm_rf_kill_state_to_string()`. But that looks awkward. So the right solution here is to also rename "RfKill" to "Rfkill". That make is consistent with the spelling of the existing `NMRfkillManager` type and the `nm-rfkill-manager.h` file.
2022-02-01 20:21:34 +01:00
for (i = 0; i < NM_RFKILL_TYPE_MAX; i++)
priv->rfkill_states[i] = NM_RFKILL_STATE_UNBLOCKED;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
all/udev: use NM_MAKE_STRV() for arguments of nm_udev_client_new()
2021-02-03 14:43:48 +01:00
priv->udev_client = nm_udev_client_new(NM_MAKE_STRV("rfkill"), handle_uevent, self);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
enumerate = nm_udev_client_enumerate_new(priv->udev_client);
udev_enumerate_scan_devices(enumerate);
iter = udev_enumerate_get_list_entry(enumerate);
for (; iter; iter = udev_list_entry_get_next(iter)) {
struct udev_device *udevice;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
udevice = udev_device_new_from_syspath(udev_enumerate_get_udev(enumerate),
udev_list_entry_get_name(iter));
if (!udevice)
continue;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
add_one_killswitch(self, udevice);
udev_device_unref(udevice);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
udev_enumerate_unref(enumerate);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
recheck_killswitches(self);
}
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
NMRfkillManager *
nm_rfkill_manager_new(void)
{
all: drop unnecessary cast of g_object_new() Our cast macros (like NM_AUTH_SUBJECT()) are plain C pointer casts, unless when building with more asserts enabled. Still, they are unnecessary and even their ability to check the type (with more asserts) is not needed, because we must trust glib's g_object_new() to return reasonable objects. That is a basic requirement, that we don't need to assert against. Also, in the majority of cases we don't do this either.
2021-02-08 16:55:35 +01:00
return g_object_new(NM_TYPE_RFKILL_MANAGER, NULL);
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
}
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
static void
dispose(GObject *object)
{
format: reformat source tree with clang-format 13.0 We use clang-format for automatic formatting of our source files. Since clang-format is actively maintained software, the actual formatting depends on the used version of clang-format. That is unfortunate and painful, but really unavoidable unless clang-format would be strictly bug-compatible. So the version that we must use is from the current Fedora release, which is also tested by our gitlab-ci. Previously, we were using Fedora 34 with clang-tools-extra-12.0.1-1.fc34.x86_64. As Fedora 35 comes along, we need to update our formatting as Fedora 35 comes with version "13.0.0~rc1-1.fc35". An alternative would be to freeze on version 12, but that has different problems (like, it's cumbersome to rebuild clang 12 on Fedora 35 and it would be cumbersome for our developers which are on Fedora 35 to use a clang that they cannot easily install). The (differently painful) solution is to reformat from time to time, as we switch to a new Fedora (and thus clang) version. Usually we would expect that such a reformatting brings minor changes. But this time, the changes are huge. That is mentioned in the release notes [1] as Makes PointerAligment: Right working with AlignConsecutiveDeclarations. (Fixes https://llvm.org/PR27353) [1] https://releases.llvm.org/13.0.0/tools/clang/docs/ReleaseNotes.html#clang-format
2021-11-09 13:28:54 +01:00
NMRfkillManager *self = NM_RFKILL_MANAGER(object);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
NMRfkillManagerPrivate *priv = NM_RFKILL_MANAGER_GET_PRIVATE(self);
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
Killswitch *ks;
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
core/rfkill: use CList to track Rfkill killswitches GSList is almost always the wrong choice. We can just embed the next pointers in the structure using the intrusive CList.
2022-02-01 22:55:15 +01:00
while ((ks = c_list_first_entry(&priv->killswitch_lst_head, Killswitch, killswitch_lst)))
killswitch_destroy(ks);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
udev/trivial: rename nm_udev_client_unref() to nm_udev_client_destory() NMUdevClient does not actually implement ref-counting, because it's not used. Still, the destroy function was named nm_udev_client_unref(), because theoretically then we could later, as the need arises, make the type ref-counted. Then unref function already had the right name. However, NMUdevClient also has a callback function that emits monitor events. Again for simplicity, this callback function cannot be reset, it can only be set once (in the constructor) and can also not be unset nor disabled. When the user of NMUdevClient is done with the instance and calls "unref", then it must be sure that the callback is no longer invoked afterwards. In practice that is already the case, but "unref" makes it sound as if somebody else could also still hold a reference -- in which case the user would have to first unset/disable the callback. Rename the function to "destroy()", so that it's clear that the instance is gone afterwards and that the callback will not be invoked anymore.
2021-02-03 14:48:01 +01:00
priv->udev_client = nm_udev_client_destroy(priv->udev_client);
udev: drop libgudev in favor of libudev libgudev is just a wrapper around libudev. We can use libudev directly and drop the dependency for libgudev.
2017-03-12 15:54:02 +01:00
core: use #define for "rfkill-changed" signal name (cherry picked from commit 640fbec855907b19952c8f0411f8500f1008fd7d)
2016-08-23 11:45:51 +02:00
G_OBJECT_CLASS(nm_rfkill_manager_parent_class)->dispose(object);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
static void
nm_rfkill_manager_class_init(NMRfkillManagerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
object_class->dispose = dispose;
all: reformat all with new clang-format style Run: ./contrib/scripts/nm-code-format.sh -i ./contrib/scripts/nm-code-format.sh -i Yes, it needs to run twice because the first run doesn't yet produce the final result. Signed-off-by: Antonio Cardace <acardace@redhat.com>
2020-09-28 16:03:33 +02:00
core: refactor private data in "src" - use _NM_GET_PRIVATE() and _NM_GET_PRIVATE_PTR() everywhere. - reorder statements, to have GObject related functions (init, dispose, constructed) at the bottom of each file and in a consistent order w.r.t. each other. - unify whitespaces in signal and properties declarations. - use NM_GOBJECT_PROPERTIES_DEFINE() and _notify() - drop unused signal slots in class structures - drop unused header files for device factories
2016-09-29 13:49:01 +02:00
signals[RFKILL_CHANGED] = g_signal_new(NM_RFKILL_MANAGER_SIGNAL_RFKILL_CHANGED,
G_OBJECT_CLASS_TYPE(object_class),
G_SIGNAL_RUN_FIRST,
0,
NULL,
NULL,
NULL,
G_TYPE_NONE,
2,
core/rfkill: cleanup arguments for "rfkill-changed" signal The signal parameters are G_TYPE_UINT. We should not assume that our enums are a compatible integer type. In practice of course they always were. Let's just be clear about when we have an integer and when we have an enum.
2022-02-02 12:04:27 +01:00
G_TYPE_UINT /* NMRfkillType */,
G_TYPE_UINT /* NMRfkillState */);
core: split NMRfkillManager out of NMUdevManager Split the rfkill-monitoring parts of NMUdevManager into a separate class. Now NMUdevManager only handles device enumeration.
2013-05-09 10:24:08 -04:00
}
Reference in a new issue Copy permalink