mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-09-10 13:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
935 Commits 32 Branches 35 Tags
dbb26c5ade0c9d67261954e5339dbc3c5cce6133
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Trevisan (Treviño) dbb26c5ade meson: Define enum dependency and ensure we generate them before using 
Avoid setting the headers as sources everywhere, but instead use a dependency
to manage the headers creation in time
 2019-12-17 14:38:20 +01:00
Marco Trevisan (Treviño) 0566f82219 tests: Add a reference to the enrolled print before returning it 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) c8e1269f61 cleanup: Use FPI prefix for all the internal enum types 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) 2158c5e2d1 cleanup: Use #pragma once everywhere 
Remove legacy header guards, and use compiler newer features.
 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) 10945f8546 cleanup: Remove fp_internal.h and update drivers_api.h 
Remove the uneeded internal API, as we can now include each header directly
if needed, while move the assembling stuff to the drivers API.
 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) 806ad10673 meson: Add fp-image-device to public headers 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) 4562f9dae3 meson: Use soversion everywhere 
Don't repeat the 2 version number hard-coding it, so we can easily track
updates
 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) c57defda92 meson: Use more meson's project_name() 
Not that libfprint is long to write, but in case we'll ever change the
basename, we do it once.
 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) c806993cb9 meson: Don't install fpi-enums 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) 95cb62fd3b meson: No need to redefine default pkgconfig install dir 
This value would be the default anyways
 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) d255a91e97 meson: List deps in multiple lines, to have better diffs on changes 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) 9ebb3fd231 meson: Parse all private headers 
So we don't have to list each one in case we add new enums.
Also, as per previous commit we can reorder them alphabetically.
 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) 68b5c5d98f fpi-ssm, fpi-usb-transfer: Use fwd-declarations to avoid headers dependencies 
Don't make headers inclusions dependent on each others, given that FpiSsm
depends on FpiUsbTransfer and vice-versa, so fix the dependency cycle by
using forwarded declarations.
 2019-12-17 14:38:19 +01:00
Marco Trevisan (Treviño) 7e2db8e988 driver_ids.h: Remove the legacy ID file 
This is not used anymore by drivers as they all use GType's, so remove it
and any (dead) reference to it.
 2019-12-14 17:20:47 +01:00
Marco Trevisan (Treviño) 24d388f923 meson: Split single-line dependencies to reduce the diff on changes 
Make it more readable and in case we add something else, it's easier to track
 2019-12-14 17:20:47 +01:00
Marco Trevisan (Treviño) af42b3e468 ci: Increase the timeout multiplier for tests 
Change the FEDORA_TAG to the current date in order to rebuild the image
 2019-12-14 17:20:47 +01:00
Marco Trevisan (Treviño) edb09463f4 ci: Save coverage reports when running tests 2019-12-14 17:20:47 +01:00
Marco Trevisan (Treviño) 42b1deaeea tests: Add unit tests for fpi-ssm 
Verify that the state machine actions are done as we expected, being the
main tool for drivers, better to check that is done as we expect.
 2019-12-14 17:20:47 +01:00
Marco Trevisan (Treviño) fe828d0bb2 fpi-ssm: Clear delayed actions for parent and child on subssm start 
While timeout was already cleared for parent, we didn't properly delete the
cancellable.

Although we'd warn anyways when starting the SSM, is still better to clear
any delayed action also for the sub-SSM
 2019-12-14 17:20:47 +01:00
Marco Trevisan (Treviño) cf5473a55c fpi-ssm: Make clear that the completed callback owns the error 2019-12-14 17:20:47 +01:00
Marco Trevisan (Treviño) 0471edbf10 fpi-ssm: Add debug message when a delayed state change is cancelled 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) 299a797423 fpi-ssm: Bug on wrong state passed to jump_to_state_delayed 
While remove the checks that are already part of the common function
fpi_ssm_set_delayed_action_timeout().
 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) c594863639 fpi-ssm: Define autoptr cleanup function 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) 3bb1840750 fpi-ssm: Use same argument names of header file 
So we can mute a Gtk-doc parser warning
 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) f31b8483d4 tests: Add fpi device tests 
Verify drivers operations simulating a fake driver to check that the lib
interaction is correct.
 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) 324258bc8c tests/meson: Support unit-tests non depending on virtual driver 
Since tests depending on the fake device don't depend on virtual-image
driver anymore, let's change the way we organize the things, by putting
everything in the test lib, but enabling unit-tests depending on what they
depend on.
 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) f578ebe82d test-device-fake: Add fake test driver to verify fpi functions 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) 98fa6efce3 fpi-device: Clarify ownership of parameters for progress call 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) c7b7f78273 fp-device: Call identify device class method on identification 
Identify on device was broken because we were calling verify device method
on devices instead of the right one.

Thank you unit tests! :)
 2019-12-14 17:20:46 +01:00
Marco Trevisan (Treviño) b4c3756ab0 tests: Add fp-device basic unit tests 
Use the virtual image device as base for now, while the new setup allows
to create easily fake device drivers without including the driver in
libfprint itself and test all the fpi_device functionalities.
 2019-12-14 17:20:45 +01:00
Marco Trevisan (Treviño) da46f53e82 tests: Add basic unit tests for fp-context 
Link the tests with the private library using an utils library that will
be useful to share other tests functions
 2019-12-14 17:20:45 +01:00
Marco Trevisan (Treviño) eeddd8c7bc fp-context, tools: Use auto-ptr to handle GTypeClass ownership 
This also fixes a small leak we might have if reffing a type that was not a
virtual one.
 2019-12-14 17:20:45 +01:00
Marco Trevisan (Treviño) 43a8c909bf fp-context: Use an env to define a whitelist of drivers to enable 
This avoids that we pick unwanted drivers when running the tests in a
machine that has some supported device attached.
 2019-12-14 17:20:45 +01:00
Marco Trevisan (Treviño) 09576e5209 fpi-context: Make fpi_get_driver_types to return an array 
No need to create one all the times and the fill it with what we need.
 2019-12-14 16:57:11 +01:00
Marco Trevisan (Treviño) 8184e33dd6 meson: Fix syntax in the auto-generated fpi-drivers file 
Better to be nice everywhere :)
 2019-12-14 16:56:56 +01:00
Marco Trevisan (Treviño) 6f2b1f97da fprint: Move drivers to private internal library 
This allows us to finally remove fpi_get_driver_types from the exported list
of symbols.
 2019-12-12 19:03:57 +01:00
Marco Trevisan (Treviño) c3bf6fe863 meson: Rely on libfprint dependency to get root_include 
No need to redefine it in all our tools
 2019-12-12 18:55:08 +01:00
Marco Trevisan (Treviño) 5bed81025e meson: Use files to track the map file presence 2019-12-11 20:07:13 +01:00
Marco Trevisan (Treviño) d7100e41df fp-image, fp-print: Move private methods to own code units 2019-12-11 20:07:13 +01:00
Marco Trevisan (Treviño) ae7021e529 fp-image-device: Move fpi code into its own unit that can be compiled a part 
In order to be able to test the private device code (used by drivers) we
need to have that split a part in a different .c file so that we can compile
it alone and link with it both the shared library and the test executables.

Redefine fp_image_device_get_instance_private for private usage, not to move
the private struct as part of FpDevice.
 2019-12-11 20:07:12 +01:00
Marco Trevisan (Treviño) d9de941a47 fp-device: Move fpi code into its own unit that can be compiled a part 
In order to be able to test the private device code (used by drivers) we
need to have that split a part in a different .c file so that we can compile
it alone and link with it both the shared library and the test executables.

Redefine fp_device_get_instance_private for private usage, not to move
the private struct as part of FpDevice.
 2019-12-11 20:07:12 +01:00
Marco Trevisan (Treviño) 7114d97f25 libfprint: Introduce libfprint_private static library 
Split the library into a private part with all the symbols that we can use
for unit-test all the fpi functions.
 2019-12-10 20:19:55 +01:00
Marco Trevisan (Treviño) 92a5278a74 fp-device: Add a "open" property and method to check its state 2019-12-10 20:19:55 +01:00
Marco Trevisan (Treviño) d01bb41b7c tests/meson: Set the typelib env var only if we have introspection 2019-12-10 19:20:21 +01:00
Marco Trevisan (Treviño) ad88a5a78f docs: Don't ignore the deprecated API_EXPORTED definition 2019-12-10 19:20:21 +01:00
Marco Trevisan (Treviño) ff0107fc0a fp-device: Use different pointers for device handlers 
A Fp-device use an union to track the handle to the lower-level device, and
the value depends on the object type.

So in case of using a virtual device, the priv->usb_device location matches
the priv->virtual_env string location, and thus we'd end up unreffing a
string location as it was a GObject, while we'd leak the string.

To avoid such errors, instead of just checking the device type when we
finalize the device, let's just use different pointers to avoid other
possible clashes.
 2019-12-10 19:20:21 +01:00
Marco Trevisan (Treviño) bb0ef04b85 ci: Partially hardcode the fedora image path 2019-12-05 17:31:46 +01:00
Marco Trevisan (Treviño) a64ac2296b vfs0051: Use named SSMs for usb async exchanges 2019-12-04 20:43:53 +01:00
Marco Trevisan (Treviño) a522e3fd6f fpi-ssm: Improve debugging of SSM using driver infos 
Always mention the driver that is triggering it
 2019-12-04 20:43:53 +01:00
Marco Trevisan (Treviño) 65828e0e56 fpi-ssm: Support named SSMs and use a fallback macro 
Add fpi_ssm_new_full() that allows to pass a name to the state-machine
constructor, not to change all the drivers, provide a fpi_ssm_new() macro
that stringifies the nr_parameters value (usually an enum value) as the name
so that we can use it for better debugging.
 2019-12-04 20:43:53 +01:00
Marco Trevisan (Treviño) fe967d0ac2 ci: Build flatpak automatically only on master and tagso 
While allowing to build it manually in other cases
 2019-12-04 19:49:40 +01:00
Marco Trevisan (Treviño) 2fcc2deb43 ci: Use --werror by default in meson at build time 2019-12-04 18:52:20 +01:00
Marco Trevisan (Treviño) c678b9021c meson: Use stricter C arguments to compile libfprint 
These are based on what mutter does, being a quite strict project on c code
quality.
 2019-12-04 18:52:20 +01:00
Marco Trevisan (Treviño) b2e55308d6 meson: Move generated source to fpi- prefix and use more readable code 
Instead of concatenating strings, use an array of strings and finally join
them using newline.
 2019-12-04 18:52:20 +01:00
Marco Trevisan (Treviño) a176fa1d34 meson: Include fpi-context.h in generated fp-drivers.c 2019-12-04 18:52:19 +01:00
Marco Trevisan (Treviño) cacce50ef9 vfs0050: Use proper casting summing pointers first 
Cast the pointers as what fpi usb transfer expects.
 2019-12-04 18:52:19 +01:00
Marco Trevisan (Treviño) 5ab4d6c454 vfs5011: Cast gpointer data values to proper type to do math operations 2019-12-04 18:52:19 +01:00
Marco Trevisan (Treviño) 0c655be159 gtk-demo: Use G_DECLARE to avoid missing declarations 2019-12-04 18:52:19 +01:00
Marco Trevisan (Treviño) 2b8c524928 cleanup: Use static functions for non-declared methods 2019-12-04 18:52:19 +01:00
Marco Trevisan (Treviño) 2f2ea65d32 fp-device: Remove unused timeout function and source data 
These were probably added in previous iterations, but they are not uneeded
anymore as the GSource embeds already a callback function.

So make just this clearer in the dispatch function.
 2019-12-04 18:52:18 +01:00
Marco Trevisan (Treviño) 1d48b70f38 storage: Include storage header so that we have declarations 2019-12-04 18:52:18 +01:00
Marco Trevisan (Treviño) 35e9f19c0c nbis: Make the extern global bozworth 'y' variable as bz_y 
Othewise this could create issues with other 'y' variable definitions
shadowing it.

Add a cocci file that performs the change automatically
 2019-12-04 18:52:18 +01:00
Marco Trevisan (Treviño) 70a0d6f0fe nbis/log: Don't use old-style function declarations 2019-12-04 18:52:18 +01:00
Marco Trevisan (Treviño) 7ed9b0c2f9 cleanup: Don't make nbis depend on libfprint built-sources 
Now that nbis is a static library it should be possible to compile it
without any fprint-built dependency, although since it included fp_internal
there was a compile-time dependency on the fp-enums that can be generated at
later times.

So:
 - Move nbis-helpers to nbis includes (and remove inclusion in fp_internal)
 - Move the Minutiae definitions inside a standalone fpi-minutiae header
 - Include fpi-minutiae.h in fp_internal.h
 - Include nbis-hepers.h and fpi-minutiae.h in nbis' lfs.h
 - Adapt missing definitions in libfprint
 2019-12-04 18:50:46 +01:00
Marco Trevisan (Treviño) 6a090656b6 nbis: Add a global include file with all the definitions ignoring erros 
The nbis headers are full of redundant declarations, we can't fix them all
now, so in the mean time let's use an header using pragma to ignore such
errors.

Add the error to nbis private include folder that should be used only by
headers of libfprint-nbis.
 2019-12-04 18:44:39 +01:00
Marco Trevisan (Treviño) e1d181887f meson: Add the include directories to deps 
So we don't have to repeat them everywhere.
 2019-12-04 16:57:39 +01:00
Marco Trevisan (Treviño) e64c18f8de cpp-test: Fix indentation 2019-12-04 16:06:24 +01:00
Marco Trevisan (Treviño) 7e70344b4a meson: Use add_project_arguments for common cflags 
We were passing around the common cflags and setting them for each library
or executable, but this is just a repetition given we can just use
add_project_arguments for this.
 2019-12-04 16:06:24 +01:00
Marco Trevisan (Treviño) 44af2173a8 fp-print: Clear the data not the description when setting the property 2019-12-04 16:06:24 +01:00
Marco Trevisan (Treviño) e7c7f368c9 drivers, examples: Don't use -Wno-pointer-sign and fix relative errors 2019-12-04 16:06:24 +01:00
Marco Trevisan (Treviño) a29586f398 fpi-usb: Use unsigned length for USB async transfers 
Properly follow function signature using a temporary gsize variable address
to make the function use the same pointer type and avoid troubles at
deferencing it, while use automatic-casting to switch to signed one if
transfer succeeded.
 2019-12-04 16:06:24 +01:00
Marco Trevisan (Treviño) 98cd1c2680 ci: Use a docker image for builds and tests 
Avoid repeating the machine updates and deps installation at every stage,
just reuse the docker image

Registered images are at:
  https://gitlab.freedesktop.org/libfprint/libfprint/container_registry
 2019-12-04 14:59:03 +00:00
Marco Trevisan (Treviño) 1e2f19ea3d fpi-ssm: Mark a fpi-ssm completed on delay 2019-12-03 18:28:48 +01:00
Marco Trevisan (Treviño) b0effae990 fpi-ssm: Bug on handler set to a NULL function 
We would crash otherwise, while this is quite obvious there was no code
enforcing this.
 2019-12-03 18:28:48 +01:00
Marco Trevisan (Treviño) ff67bf5a16 fpi-ssm: Make delayed actions cancellable 
Add a GCancellable parameter to fpi_ssm_nex_state_delayed and
fpi_ssm_jump_to_state_delayed() so that it's possible to cancel an action
from the caller and in case the driver wants to cancel a delayed operation
when a device action has been cancelled.
 2019-12-03 18:28:48 +01:00
Marco Trevisan (Treviño) bac6382f67 drivers: Use SSM delayed actions when possible 2019-12-03 17:31:22 +01:00
Marco Trevisan (Treviño) e12978f402 fpi-ssm: Clarify the ownership of error in fpi_ssm_mark_failed 2019-12-03 17:31:22 +01:00
Marco Trevisan (Treviño) 1ba95db379 drivers: Use fpi_ssm_next_state_delayed instead of custom callbacks 
As per this fpi_ssm_next_state_timeout_cb can be removed
 2019-12-03 17:31:22 +01:00
Marco Trevisan (Treviño) 7ec2df2405 fpi-ssm: Add possibility to jump to a state (or next one) with delay 
This allows to have an automatic cleanup of the timeout source when the
the callback is reached and to avoid to do further state changes in the
middle.
 2019-12-03 17:31:22 +01:00
Marco Trevisan (Treviño) 3ed73aa17c fpi-device: Make possible to set a DestroyNotify for timeout data 
Since GSource data can be automatically cleaned up on source destruction, we
can mimic this for the devices timeout easily as well.

Add an extra parameter, and let's use this cocci file to adapt all the
drivers like magic:

	@@
	expression e1, e2, e3, e4;
	@@
	fpi_device_add_timeout (e1, e2, e3, e4
	+  , NULL
  	)
 2019-12-03 17:31:22 +01:00
Marco Trevisan (Treviño) 0241617713 fpi-ssm: Also bug-on negative state value 
Being an integer, anything could happen.
 2019-12-03 17:31:22 +01:00
Marco Trevisan (Treviño) 20a52593eb vfs301: Use a transfer autopointer to cleanup it on sync submission 
Partially revert commit a855c0cc7, since the driver uses a sync transfer
and in such case the caller still keeps the ownership.
 2019-12-03 13:58:42 +00:00
Marco Trevisan (Treviño) 42db16364d synaptics: Close the usb device if reset failed 
If reseting the device failed, we still need to close the usb device before
returning.
 2019-12-03 13:58:42 +00:00
Marco Trevisan (Treviño) ee606ae49e synaptics: Use an autoptr to handle the FpiUsbTransfer sync transfers 
When using fpi_usb_transfer_submit_sync we still need to unref the transfer
once done with it, so let's use an auto pointer so we free it also on
errors and early returns without having to handle this manually.
 2019-12-03 13:58:42 +00:00
Marco Trevisan (Treviño) b9ff75c4e9 fp-print: Set the aligned_data as the data used by the cleanup function 
g_variant_new_from_data() allows to destroy some other user_data passed as
parameter that might be different from the aligned_data itself.

But since in this case they match, pass it to be set as g_free parameter
or it won't be free'd.
 2019-11-28 21:30:17 +01:00
Marco Trevisan (Treviño) 4447a0d183 ci: Add a test case where we run tests with valgrind 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) 545af23536 tests: Use a loop for generating drivers tests and use suites 
So we can just run drivers tests with --suite=drivers
 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) db905a2048 fp-device: Use g_clear_error instead of check + free 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) 712853d1e3 fp-device: Mark user data in FpEnrollProgress as transfer none 
The data has its own DestroyNotify set, so while no generic DestroyNotify
exists for generic data, let's make it clear.
 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) c6298ede72 fp-device: Unref the print once we've notified the progress 
When we notify the enroll progress with a print, this needs to be unreffed
once we're done, but this only was happening in case of error.

Since it's not up to the callback function to free it, let's do it at the
end of the function.

As per this, clarify the docs for FpEnrollProgress marking it as transfer
none.
 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) b1d99e7608 fp-device: Use an autopointer and steal the print when passed 
Make it clearer that we're stealing the print when passing it away, instead
of just doing this silently.
 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) 5927a205e3 virtual-image: Also unref the object when closing a the stream 
While a stream is closed when completely unreffed, the other way around
isn't true, so always unref the object.
 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) 8c05f3b78c fp-print: Unref print data and get static strings when deserializing 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) 92db82e3d4 fp-print: Assert the prints aren't set when initialized 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) f6f689f9cd fp-print: Unref the prints on finalize 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) 5dc3edf07c fp-context: Run dispose on the usb context to deal with circular refs 
Ensure that we dispose the USB context before unreffing it, so that it will
release any reference it has and destroy the internal libusb context.
 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) 71625ec1cf fp-device: Unref the usb device on finalize 
Each device adds a ref to the underlying usb device, but it doesn't remove
the reference on finalization.

So clear the object to fix the leak
 2019-11-27 21:40:44 +01:00
Marco Trevisan (Treviño) c9216cf96c tests: Add setup mode to run tests using valgrind 
In such case we need to ignore the python errors, so including a suppression
file when using --setup=valgrind.
 2019-11-27 21:40:43 +01:00
Marco Trevisan (Treviño) 53713c0098 tests: Add 'gdb' setup to run tests using gdb 
When using --setup=gdb the tests will be running using gdb, however this
as per meson limitation allows only running a test when using verbose mode.
 2019-11-27 21:40:43 +01:00
Marco Trevisan (Treviño) 222c33ec32 virtual-image: Re-run the test using the defined wrapper if any 
In case a LIBFPRINT_TEST_WRAPPER is defined, execute again the script using
the same python processor but using the passed wrapper command.
 2019-11-27 21:40:43 +01:00