Skip to content

[PW_SID:1099573] main: make developer mode more configurable #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IWDTestBot wants to merge 1 commit into
base: workflow
Choose a base branch
from
Open

[PW_SID:1099573] main: make developer mode more configurable #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/iwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
struct l_genl;
struct l_genl_family;

enum iwd_mode {
IWD_MODE_NO_AUTOCONNECT = 1 << 0,
IWD_MODE_DEBUG_INTERFACE = 1 << 1,
};

const struct l_settings *iwd_get_config(void);
struct l_genl *iwd_get_genl(void);
struct l_netlink *iwd_get_rtnl(void);
Expand All @@ -41,7 +46,7 @@ const char *iwd_get_iface_blacklist(void);

const char *iwd_get_phy_whitelist(void);
const char *iwd_get_phy_blacklist(void);
bool iwd_is_developer_mode(void);
uint32_t iwd_get_developer_modes(void);

#define IWD_NOTICE_STATE "state"
#define IWD_NOTICE_CONNECT_INFO "connect-info"
Expand Down
48 changes: 42 additions & 6 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <sys/mman.h>
#include <linux/rtnetlink.h>
#include <ell/ell.h>
#include <linux/limits.h>

#include <ell/useful.h>

Expand Down Expand Up @@ -64,7 +65,7 @@ static const char *phys;
static const char *nophys;
static const char *debugopt;
static const char *logger;
static bool developeropt;
static uint32_t iwd_developer_mode;
static bool terminating;
static bool nl80211_complete;

Expand Down Expand Up @@ -137,9 +138,23 @@ const char *iwd_get_phy_blacklist(void)
return nophys;
}

bool iwd_is_developer_mode(void)
uint32_t iwd_get_developer_modes(void)
{
return developeropt;
return iwd_developer_mode;
}

static const char *iwd_mode_to_string(uint32_t mode)
{
static char str[PATH_MAX];
int idx = 0;

if (mode & IWD_MODE_NO_AUTOCONNECT)
idx = sprintf(str, "no-autoconnect ");

if (mode & IWD_MODE_DEBUG_INTERFACE)
idx += sprintf(str + idx, "debug-interface ");

return str;
}

static void usage(void)
Expand All @@ -160,7 +175,7 @@ static void usage(void)
}

static const struct option main_options[] = {
{ "developer", no_argument, NULL, 'E' },
{ "developer", optional_argument, NULL, 'E' },
{ "version", no_argument, NULL, 'v' },
{ "interfaces", required_argument, NULL, 'i' },
{ "nointerfaces", required_argument, NULL, 'I' },
Expand Down Expand Up @@ -473,14 +488,31 @@ int main(int argc, char *argv[])
for (;;) {
int opt;

opt = getopt_long(argc, argv, "Ei:I:p:P:d::vhl:",
opt = getopt_long(argc, argv, "E::i:I:p:P:d::vhl:",
main_options, NULL);
if (opt < 0)
break;

switch (opt) {
case 'E':
developeropt = true;
if (optarg)
if (!strcmp(optarg, "test"))
iwd_developer_mode =
IWD_MODE_DEBUG_INTERFACE |
IWD_MODE_NO_AUTOCONNECT;
else if (!strcmp(optarg, "debug"))
iwd_developer_mode =
IWD_MODE_DEBUG_INTERFACE;
else {
fprintf(stderr,
"Invalid developer mode '%s'\n",
optarg);
return EXIT_FAILURE;
}
else
iwd_developer_mode = IWD_MODE_DEBUG_INTERFACE |
IWD_MODE_NO_AUTOCONNECT;

break;
case 'i':
interfaces = optarg;
Expand Down Expand Up @@ -539,6 +571,10 @@ int main(int argc, char *argv[])
if (debugopt)
l_debug_enable(debugopt);

if (iwd_developer_mode)
l_debug("Developer mode enabled: %s",
iwd_mode_to_string(iwd_developer_mode));

#ifdef HAVE_BACKTRACE
__iwd_backtrace_init();
#endif
Expand Down
16 changes: 9 additions & 7 deletions src/station.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ static bool station_debug_event(struct station *station, const char *name)
{
struct l_dbus_message *signal;

if (!iwd_is_developer_mode())
if (!(iwd_get_developer_modes() & IWD_MODE_DEBUG_INTERFACE))
return true;

l_debug("StationDebug.Event(%s)", name);
Expand Down Expand Up @@ -1921,7 +1921,7 @@ bool station_set_autoconnect(struct station *station, bool autoconnect)
if (station_is_autoconnecting(station) && !autoconnect)
station_enter_state(station, STATION_STATE_DISCONNECTED);

if (iwd_is_developer_mode())
if (iwd_get_developer_modes() & IWD_MODE_DEBUG_INTERFACE)
l_dbus_property_changed(dbus_get_bus(),
netdev_get_path(station->netdev),
IWD_STATION_DEBUG_INTERFACE, "AutoConnect");
Expand Down Expand Up @@ -5144,6 +5144,7 @@ static struct station *station_create(struct netdev *netdev)
struct station *station;
struct l_dbus *dbus = dbus_get_bus();
bool autoconnect = true;
uint32_t iwd_mode = iwd_get_developer_modes();

station = l_new(struct station, 1);
watchlist_init(&station->state_watches, NULL);
Expand Down Expand Up @@ -5175,13 +5176,14 @@ static struct station *station_create(struct netdev *netdev)

station_fill_scan_freq_subsets(station);

if (iwd_is_developer_mode()) {
if (iwd_mode & IWD_MODE_DEBUG_INTERFACE)
l_dbus_object_add_interface(dbus,
netdev_get_path(station->netdev),
IWD_STATION_DEBUG_INTERFACE,
station);

if (iwd_mode & IWD_MODE_NO_AUTOCONNECT)
autoconnect = false;
}

station_set_autoconnect(station, autoconnect);

Expand All @@ -5201,7 +5203,7 @@ static void station_free(struct station *station)
l_dbus_object_remove_interface(dbus_get_bus(),
netdev_get_path(station->netdev),
IWD_STATION_DIAGNOSTIC_INTERFACE);
if (iwd_is_developer_mode())
if (iwd_get_developer_modes() & IWD_MODE_DEBUG_INTERFACE)
l_dbus_object_remove_interface(dbus_get_bus(),
netdev_get_path(station->netdev),
IWD_STATION_DEBUG_INTERFACE);
Expand Down Expand Up @@ -5995,7 +5997,7 @@ static int station_init(void)
station_setup_diagnostic_interface,
station_destroy_diagnostic_interface,
false);
if (iwd_is_developer_mode())
if (iwd_get_developer_modes() & IWD_MODE_DEBUG_INTERFACE)
l_dbus_register_interface(dbus_get_bus(),
IWD_STATION_DEBUG_INTERFACE,
station_setup_debug_interface,
Expand Down Expand Up @@ -6062,7 +6064,7 @@ static void station_exit(void)
{
l_dbus_unregister_interface(dbus_get_bus(),
IWD_STATION_DIAGNOSTIC_INTERFACE);
if (iwd_is_developer_mode())
if (iwd_get_developer_modes() & IWD_MODE_DEBUG_INTERFACE)
l_dbus_unregister_interface(dbus_get_bus(),
IWD_STATION_DEBUG_INTERFACE);
l_dbus_unregister_interface(dbus_get_bus(), IWD_STATION_INTERFACE);
Expand Down
Loading