Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

Implement and use common usb mode selection logic

See merge request !77

When device is booted up with cable connected and device lock code is
not used, usb-mode is left at fallback_charging. This happens because
usb-mode is re-evaluated on device unlock event, which does not occur
when device lock is not used. Due to duplication of mode selection
logic in various notification handlers, similar hard to find corner
cases are likely to occur also when order of events is not as
expected.

Collect all mode selection logic into a single function and refactor
control flow so that all triggers that might require a mode change are
directed there.

Additional changes to existing logic:
- All mode changes are blocked until usb-moded enters mainloop
- When shutdown is initiated, dynamic mode changes are blocked
- Dynamic modes are canceled when user change is started, and
- Re-evaluated / activated after user change is finished
- Exception: already active rescue mode persists over user changes

Reduce the amount of conditional MEEGOLOCK code by adding abstract
helper functions in usb_moded.c and using those instead of functions
that might not be available based on configuration options.

Clean up unnecessary header file includes resulting from these and
earlier changes.
Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

Allow longer delay at usb backend probing

See merge request !76

Usb-moded chooses between android-usb and configfs backends by
periodically polling which kind of control structure shows up in
the device file system. In Xperia 10 II it can happen that usb
setup done by droid-hal-init takes long enough usb-moded to
give up waiting and continue in effectively defunct state.

Increase backend wait time from 10 to 20 seconds by adjusting
sleep time in between probe attempts.

Also adjust usb-moded.service startup timeout so that systemd
tolerates the increased worst case wait time.
Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

[usb-moded] Flush sd login monitor when a new event arrives to avoid using lots of cpu. JB#53147

See merge request !75

[usb-moded] Set mode charging_fallback on user change. Fixes JB#50877

See merge request !73

Bump version to 0.86.0+mer52

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

[configfs] Write correct buffer in configfs. Fixes JB#51896

See merge request !72

Signed-off-by: Matti Lehtimäki <matti.lehtimaki@jolla.com>

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

Ignore legacy config file after settings migration has happened

See merge request !71

Once usb-moded has migrated settings from legacy config file at
/etc/usb-moded/usb-moded.ini, the file is removed. However, if the
file originates from some package, it can get reinstated during
upgrade and override usb-mode selection made by the user.

Instead of relying solely on file removal, ignore legacy config file
altogether if dynamic settings file has already been created.
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

Reload appsync configuration on SIGHUP

See merge request !70

Developer mode does not work immediately after installing related
packages. Developer mode does become available for selecting, but
it does not work as expected because dhcpd is not started on
activation.

This is because usb-moded fails to reload appsync configuration
upon receiving SIGHUP and previous configuration state stays
effective until usb-moded is restarted (or device rebooted).

As appsync config contains state data that is used in worker
thread, existing configuration can't be just discarded and
replaced when processing SIGHUP from control thread.

Refactor appsync logic so that it keeps track of both active and
updated configuration. Load updated configuration on SIGHUP. Then
switch active configuration on the next mode transition - so that
the previous state is retained while it might be needed.
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>

Selection of diagnostic mode is made once during lifetime of usb-moded
process. Passing it around as parameter can only lead to confusion.

Make it so that appsync_read_list() reads configuration files from
directory determined from globally defined diagnostic mode selection
rather than from parameter passed to it.

Use glob pattern for determining list of files to read. As a side effect
this stops usb-moded from reading all files (e.g. editor backup files
accidentally left behind) which could lead into obscure and hard to
figure out problems.
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>

Different config files must be used when diagnostic mode is
selected. In practice diagnostic mode selection is locked early
on during usb-moded startup and never changes. But as long as it
is possible, it would need to be taken into account in situations
where configuration files need to be re-evaluated.

Make it impossible to change diagnostic mode selection once it
has been made.
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>

Adjust pkg-config package list, use dbus-gmain.c from submodule.
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>

Apparently was forgotten at some stage. Rectify the situation.
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>

Use dbus_gmain instead of dbus-glib. JB#51115

See merge request !69

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

As required by dbus-gmain. Also check for specific glib2 version in
spec file.
Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Instead of using those passed by dbus-glib.
Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Check for glib using the prefix GLIB as required by dbus-gmain tests
to prepend the appropriate variable prefix in front cflags and libs.
Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

Require libdbus >= 1.8 as required by dbus-gmain and use
DBUS prefix during pkgconfig in autotools.
Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>

[usb_moded] Add missing ifdef for connman. JB#51296
[usb_moded] Add missing ifdef for sailfishaccesscontrol. JB#51296
[build] Only required dependencies for enabled components. JB#51296
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>

[build] Only required dependencies for enabled components

See merge request !67

[usb_moded] Add missing ifdef for sailfishaccesscontrol

See merge request !66

[usb_moded] Add missing ifdef for connman

See merge request !65

This makes sure we only pkg require dependencies for enabled components.

Note this has not been tested on a system that uses SSU, meegolock and
sailfish-access-control. systemd has been tested

This adds a missing ifdef for sailfishaccesscontrol, as uid here can be
0 (without sailfishaccesscontrol) we don't want to check MIN/MAX values.
Also the MIN/MAX defines are ifdef'ed also, so we do not have them
anyway.