#31: Support multiple devices per user #177

mcdope · 2022-08-27T14:30:04Z

Feel free to test, basic functionality is now fully working.

It's only tested in a dedicated test VM so far though.

Closes #31

Signed-off-by: McDope <[email protected]>

…ame if they have no revision set (thx cheapo manufacturers)

…n first found connected drive as 'primary' drive that will be used further down

src/conf.c

src/device.c

src/conf.c

…sting users

…al-multidevice-support

…e-support' into issue-31-experimental-multidevice-support

…al-multidevice-support

src/conf.c

 )
 {
 	char *xpath = NULL;
 	size_t xpath_len;
 	int retval;

-	xpath_len = strlen(CONF_DEVICE_XPATH) + strlen(opts->device.name) + strlen(property) + 1;
+	xpath_len = strlen(CONF_DEVICE_XPATH) + strlen(deviceId) + strlen(property) + 1;


src/conf.c

 )
 {
 	char *xpath = NULL;
 	size_t xpath_len;
 	int retval;

-	xpath_len = strlen(CONF_DEVICE_XPATH) + strlen(opts->device.name) + strlen(property) + 1;
+	xpath_len = strlen(CONF_DEVICE_XPATH) + strlen(deviceId) + strlen(property) + 1;


src/conf.c

 )
 {
 	char *xpath = NULL;
 	size_t xpath_len;
 	int retval;

-	xpath_len = strlen(CONF_DEVICE_XPATH) + strlen(opts->device.name) + strlen(property) + 1;
+	xpath_len = strlen(CONF_DEVICE_XPATH) + strlen(deviceId) + strlen(property) + 1;


src/device.c

…al-multidevice-support

src/device.c

+
+				g_object_unref(drive);
+				if (retval) {
+					strcpy(opts->device.name, opts->device_list[currentDevice].name);


src/conf.c

src/device.c

+					strcpy(opts->device.vendor, opts->device_list[currentDevice].vendor);
+					strcpy(opts->device.model, opts->device_list[currentDevice].model);
+					strcpy(opts->device.serial, opts->device_list[currentDevice].serial);
+					strcpy(opts->device.volume_uuid, opts->device_list[currentDevice].volume_uuid);


src/device.c

+					strcpy(opts->device.name, opts->device_list[currentDevice].name);
+					strcpy(opts->device.vendor, opts->device_list[currentDevice].vendor);
+					strcpy(opts->device.model, opts->device_list[currentDevice].model);
+					strcpy(opts->device.serial, opts->device_list[currentDevice].serial);


src/device.c

+				if (retval) {
+					strcpy(opts->device.name, opts->device_list[currentDevice].name);
+					strcpy(opts->device.vendor, opts->device_list[currentDevice].vendor);
+					strcpy(opts->device.model, opts->device_list[currentDevice].model);


src/device.c

+				g_object_unref(drive);
+				if (retval) {
+					strcpy(opts->device.name, opts->device_list[currentDevice].name);
+					strcpy(opts->device.vendor, opts->device_list[currentDevice].vendor);


mcdope · 2024-01-09T18:09:42Z

Note to people interested in this, and my future self: this is verified to work with two usb sticks.

Agent still doesnt support it / broken though

edit: nop, actually - its broken

mcdope · 2024-01-10T16:34:07Z

Note to people interested in this, and my future self: this is verified to work with two usb sticks.

Agent still doesnt support it / broken though

edit: nop, actually - its broken

lmao, actually it's not - my ntfs stick just didnt liked to get unplugged without unmounting.

…al-multidevice-support

src/conf.c

…al-multidevice-support

…currect user

src/device.c

src/xpath.c

mcdope · 2024-07-16T19:03:40Z

Todo: make amount of devices dynamic instead of hardcoded assumptions

mcdope and others added 19 commits August 23, 2022 19:08

Update changelog

13cb6fc

Update AUTHORS

119ff4f

Update version numbers

daeaadc

Update fedora changelog

92e5de2

Update debian changelog

5a84cc5

Fix debian changelog

a9d08e5

Update debian/source/option

50e44a4

Use same name in fedora changes then for debian / realname everywhere

940f19a

Update README.md

5515521

[Docs] Update non-manpage "doc/" files

50cdf61

Signed-off-by: McDope <[email protected]>

[Packaging] [Debian] Fix config script picking up device serials as n…

7c5e976

…ame if they have no revision set (thx cheapo manufacturers)

#165: Update ChangeLog and debian/changelog

61b90c5

Merge remote-tracking branch 'origin/master' into prepare-083

b69db4a

Update changelogs

dc41184

[local.c] Fix tiny memleak

20be5fd

#31: Prepare conf.c/xpath.c for multiple devices per user

5a6d8b8

#31: [device.c] pusb_device_connected() -> loop device_list and assig…

6ea5419

…n first found connected drive as 'primary' drive that will be used further down

#31: Prepare dist/doc config for multi-device

a4a4b0d

#31: [pamusb-agent] add todo

d4d9709

mcdope added the enhancement New feature or request label Aug 27, 2022

mcdope self-assigned this Aug 27, 2022

mcdope marked this pull request as ready for review August 27, 2022 14:32

mcdope changed the base branch from prepare-083 to master August 27, 2022 14:32

#31 CI, plz?

f0a6fd0

github-advanced-security bot found potential problems Aug 27, 2022

View reviewed changes

src/conf.c Fixed Show fixed Hide fixed

src/conf.c Fixed Show fixed Hide fixed

src/conf.c Fixed Show fixed Hide fixed

#31: Fix errors

5538ec6

github-advanced-security bot found potential problems Aug 28, 2022

View reviewed changes

src/device.c Fixed Show fixed Hide fixed

src/device.c Fixed Show fixed Hide fixed

src/device.c Fixed Show fixed Hide fixed

src/device.c Fixed Show fixed Hide fixed

src/device.c Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Aug 28, 2022

View reviewed changes

src/conf.c Fixed Show fixed Hide fixed

mcdope added 2 commits August 29, 2022 16:48

#31: Don't iterate empty devices, fix 'nodevice' output

d2be4dd

#31: Revert ae51375, add support for adding additional devices to exi…

f1f5c9c

…sting users

mcdope added 3 commits March 20, 2023 21:52

Merge remote-tracking branch 'origin/master' into issue-31-experiment…

173234c

…al-multidevice-support

Merge remote-tracking branch 'origin/issue-31-experimental-multidevic…

054ce36

…e-support' into issue-31-experimental-multidevice-support

Merge remote-tracking branch 'origin/master' into issue-31-experiment…

0f32e33

…al-multidevice-support

github-advanced-security bot found potential problems Jan 3, 2024

View reviewed changes

mcdope added 2 commits January 7, 2024 19:35

Merge remote-tracking branch 'origin/master' into issue-31-experiment…

e198f0e

…al-multidevice-support

ä31: Misc

6a30c3d

github-advanced-security bot found potential problems Jan 7, 2024

View reviewed changes

#31: Misc

35fbd34

github-advanced-security bot found potential problems Jan 8, 2024

View reviewed changes

mcdope added 2 commits March 31, 2024 12:46

#31: Update todos

c4aa26d

Merge remote-tracking branch 'origin/master' into issue-31-experiment…

538d50d

…al-multidevice-support

github-advanced-security bot found potential problems Jul 12, 2024

View reviewed changes

src/conf.c Dismissed Show dismissed Hide dismissed

src/conf.c Dismissed Show dismissed Hide dismissed

src/conf.c Dismissed Show dismissed Hide dismissed

mcdope added 8 commits July 14, 2024 12:20

#31: Fix merge derp, make it actually work again

1aca921

#31: Start to adjust agent

914896b

Merge remote-tracking branch 'origin/master' into issue-31-experiment…

4e2d5b0

…al-multidevice-support

#31: Continue work on agent [WIP/Broken]

d2af4a4

#31: [agent] Start a thread for each device

256c630

#31: [agent] Only react to event if no other device is connected for …

0b2d52b

…currect user

#31: [Tests] Give more time for unlock event

97037bd

#31: Run deepseek-coder-v2 over changed C files

5dc323c

github-advanced-security bot found potential problems Jul 16, 2024

View reviewed changes

mcdope added 4 commits July 18, 2024 16:44

#31: Remove debug output

f016b10

#31: Remove even more debug output

c68d079

#31: Remove even more debug output

cd95c82

#31: Remove even more debug output

1e69695

mcdope merged commit 898cfcf into master Jul 20, 2024
9 checks passed

mcdope deleted the issue-31-experimental-multidevice-support branch July 20, 2024 10:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#31: Support multiple devices per user #177

#31: Support multiple devices per user #177

mcdope commented Aug 27, 2022 •

edited

Loading

mcdope commented Jan 9, 2024 •

edited

Loading

mcdope commented Jan 10, 2024

mcdope commented Jul 16, 2024

#31: Support multiple devices per user #177

#31: Support multiple devices per user #177

Conversation

mcdope commented Aug 27, 2022 • edited Loading

mcdope commented Jan 9, 2024 • edited Loading

mcdope commented Jan 10, 2024

mcdope commented Jul 16, 2024

mcdope commented Aug 27, 2022 •

edited

Loading

mcdope commented Jan 9, 2024 •

edited

Loading