Implement `ac:u` and `ac:i` services (Wi-Fi info) + example #140

adryzz · 2023-10-27T20:01:50Z

Implements the ac service, both ac:u (user) and ac:i methods (intended for mset).

Did this because i needed some of these methods for an app

Methods implemented:

(screenshot didnt work)

ian-h-chamberlain

Mostly looks reasonable to me! Couple clippy lints that could use fixing and a few comments about error handling / enum types but mostly fine I think

ctru-rs/examples/wifi-info.rs

ctru-rs/src/services/ac.rs

adryzz · 2023-10-30T10:27:55Z

also, will add that 2 days ago libctru 2.3.0 released, adding the 2 methods needed for this.

adryzz · 2023-10-30T17:56:13Z

fixed a few of the issues, will now investigate the bindings, as that's the main issue apart from the libctru version bump

adryzz · 2023-10-30T21:49:48Z

never mind, i got the enum issue sorted out.

All that remains now is the libctru version bump for the load_network_slot setting.

also cleaned up the history a bit, now all commits build

ian-h-chamberlain

Sorry for the long wait on a review! The new changes look good to me, but I think you have a few leftover comments that aren't relevant anymore, and you probably need to merge in the latest master since a couple things (in particular use_panic_handler()) have changed recently. If you have a chance to clean up some of those bits then I think this should be good to merge!

adryzz · 2023-11-25T11:09:11Z

will do right now!

ctru-rs/src/services/ac.rs

adryzz · 2024-02-16T20:11:30Z

time to rebase this

adryzz · 2024-02-16T20:33:59Z

perfect! the unit tests failing have nothing to do with this PR afaik, so it all works now!

Jhynjhiruu · 2024-02-16T22:28:38Z

Seems like, once this and #156 get merged, all 3DS networking functionality besides Download Play is done - that'll be neat to see!

ian-h-chamberlain

LGTM, @rust3ds/active if anyone else would like to have a look I'll wait a little but I think this is ready to merge!

CI may be completely broken due to rust3ds/actions#16 but the linter passed at least so I think we can merge and fix up any test issues that might show up once that's resolved

adryzz · 2024-02-17T00:21:22Z

Seems like, once this and #156 get merged, all 3DS networking functionality besides Download Play is done - that'll be neat to see!

what other parts of libctru/3ds services are missing? i may just try implementing other stuff too

Jhynjhiruu · 2024-02-17T00:43:48Z

Seems like, once this and #156 get merged, all 3DS networking functionality besides Download Play is done - that'll be neat to see!

what other parts of libctru/3ds services are missing? i may just try implementing other stuff too

I think at this point it's mostly less important stuff like boss, news, qtm etc. - though ir still needs some work, since the Circle Pad Pro code doesn't work properly on New 3DS. I don't think irrst is done, either, though that should probably be merged into hid in my opinion.
Just go to the libctru repo and compare the source files with what's done on the ctru-rs side.

ctru-rs/src/services/ac.rs

Meziu · 2024-02-23T15:35:02Z

ctru-rs/src/services/ac.rs

+
+    /// Load the selected network slot, if present.
+    ///
+    /// Note: this method requires `ac:i` access


Is this access given by the normal Ac::new() implementation, or should the user do something more to gain it? Reimplementing IPS calls isn't exactly a straightforward process.

the rosalina loader (e.g. the default) already gives all the arm11 permissions, but if using the hax2 loader, these permissions are missing unless ran from mset. can probably remove this, only thing is it may fail in the Citra CI because of permissions, although i haven't checked.

I think normally Citra grants basically all permissions since it's just emulated, although it's possible some methods are just unimplemented / stubs, I don't think permissions are usually denied.

Meziu · 2024-02-23T15:37:58Z

ctru-rs/src/services/ac.rs

+            // we don't really need space for the terminator
+            let mut vec = vec![0u8; len as usize];
+            ResultCode(ctru_sys::ACU_GetSSID(vec.as_mut_ptr()))?;
+            Ok(String::from_utf8(vec)?)


Rather than returning the String's error, it might be wiser to check for Ac::get_wifi_status() and return an error based on that. We could try to do that in every case needed, such as proxy getters. Otherwise, we could write a custom ac::Error to hold those errors.

I'd like to avoid implementing Error::Utf8.

Meziu · 2024-02-23T15:38:13Z

ctru-rs/src/error.rs

@@ -96,6 +96,8 @@ pub enum Error {
    },
    /// An error that doesn't fit into the other categories.
    Other(String),
+    /// UTF-8 buffer to [String] conversion error
+    Utf8(std::string::FromUtf8Error),


Refer to my other comment about this.

ctru-rs/src/services/ac.rs

Meziu · 2024-02-23T15:46:23Z

ctru-rs/src/services/ac.rs

+    /// # }
+    /// ```
+    #[doc(alias = "acWaitInternetConnection")]
+    pub fn wait_internet_connection(&self) -> crate::Result<()> {


This function completely locks the thread until a connection is established, without a timeout. It's a bit... radical. We should probably suggest users to implement their own connection checks.

adryzz · 2024-02-23T22:46:56Z

uhh good news. i tested around the get_wifi_status function, and there are definitely more values.

3dbrew has very little information on this, and i was only able to confirm these:

0: Hardware Wi-Fi switch is disabled
1: Enabled but not connected
2: LAN connected
3: WAN connected

I also was able to get in a few occasions the values 102 and 300 while turning on/off the Wi-Fi network, although i have no clue what they actually mean, and this suggests there may be even more values.

#[non_exhaustive] works i guess

ian-h-chamberlain

LGTM other than fixing linter. CI should be up and working now again!

ctru-rs/src/services/ac.rs

Meziu

The PR is done, but I really can't merge without these last few changes 🙏

ctru-rs/src/services/ac.rs

adryzz · 2024-03-28T12:43:49Z

oh, i completely forgot this was still open, will update asap

i don't know how this didn't work before, but it now does, i guess

adryzz · 2024-03-28T13:49:41Z

okay, one small issue: how do we deal with errors related to UTF-8 now? i checked and you can still run into those while being connected (e.g. a proxy username not being valid UTF-8, set from a homebrew app), so the wifi_status()-based error approach wouldn't work.

so do we create a custom AC error instead of propagating FromUtf8Error?

Meziu · 2024-03-28T14:26:26Z

so do we create a custom AC error instead of propagating FromUtf8Error?

Yeah, that should be a good choice.

ctru-rs/src/services/ac.rs

adryzz · 2024-03-28T15:20:31Z

also, since we know the contents of the buffer are invalid text, we could still return the buffer as a Vec<u8>

and problem: the functions can return both crate::Error and ac::Error. how do we handle that? i see that crate::Error does not propagate any module-specific errors

ian-h-chamberlain approved these changes Oct 30, 2023

View reviewed changes

adryzz force-pushed the acu branch 2 times, most recently from aa611c4 to 66c884d Compare October 30, 2023 21:49

adryzz marked this pull request as ready for review October 30, 2023 21:50

adryzz requested a review from a team as a code owner October 30, 2023 21:50

adryzz requested review from AzureMarker and Meziu October 30, 2023 21:50

ian-h-chamberlain approved these changes Nov 24, 2023

View reviewed changes

adryzz force-pushed the acu branch from 66c884d to 52d07fb Compare November 25, 2023 11:11

ian-h-chamberlain reviewed Nov 26, 2023

View reviewed changes

ctru-rs/src/services/ac.rs Show resolved Hide resolved

adryzz force-pushed the acu branch from 126d13d to a32d79f Compare February 16, 2024 20:26

ian-h-chamberlain approved these changes Feb 16, 2024

View reviewed changes

adryzz force-pushed the acu branch from 3fa3579 to f885e26 Compare February 23, 2024 09:55

Meziu requested changes Feb 23, 2024

View reviewed changes

ian-h-chamberlain approved these changes Feb 26, 2024

View reviewed changes

ctru-rs/src/services/ac.rs Show resolved Hide resolved

Meziu requested changes Mar 28, 2024

View reviewed changes

ctru-rs/src/services/ac.rs Outdated Show resolved Hide resolved

ctru-rs/src/services/ac.rs Outdated Show resolved Hide resolved

adryzz added 3 commits March 28, 2024 14:33

do a first pass on the AC service

9c650f4

add more methods and examples

7d3c581

add load_network_slot (commented out atm)

3f6beae

adryzz and others added 7 commits March 28, 2024 14:34

implement suggestions + cleanup

208abd1

add docs to struct

2e494ac

auto implement from on the network security enum

5530f22

i don't know how this didn't work before, but it now does, i guess

uncomment out load_network_slot

c750033

remove use_panic_handler

b2f8aef

add more docs and fix camel case warning

649103b

apply suggestions, remove get_ prefixes

e1db5b9

adryzz force-pushed the acu branch from 737c6dc to e1db5b9 Compare March 28, 2024 13:36

adryzz added 2 commits March 28, 2024 14:41

use ServiceReference

614aa5e

run cargo fmt

b3f37d1

Meziu reviewed Mar 28, 2024

View reviewed changes

ctru-rs/src/services/ac.rs Outdated Show resolved Hide resolved

remove Drop impl

37e8c8e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement `ac:u` and `ac:i` services (Wi-Fi info) + example #140

Implement `ac:u` and `ac:i` services (Wi-Fi info) + example #140

adryzz commented Oct 27, 2023 •

edited

Loading

ian-h-chamberlain left a comment

adryzz commented Oct 30, 2023

adryzz commented Oct 30, 2023

adryzz commented Oct 30, 2023

ian-h-chamberlain left a comment

adryzz commented Nov 25, 2023

adryzz commented Feb 16, 2024

adryzz commented Feb 16, 2024

Jhynjhiruu commented Feb 16, 2024

ian-h-chamberlain left a comment •

edited

Loading

adryzz commented Feb 17, 2024

Jhynjhiruu commented Feb 17, 2024

Meziu Feb 23, 2024

adryzz Feb 23, 2024

ian-h-chamberlain Feb 25, 2024

Meziu Feb 23, 2024 •

edited

Loading

Meziu Feb 23, 2024

Meziu Feb 23, 2024

adryzz commented Feb 23, 2024

ian-h-chamberlain left a comment

Meziu left a comment •

edited

Loading

adryzz commented Mar 28, 2024

adryzz commented Mar 28, 2024

Meziu commented Mar 28, 2024

adryzz commented Mar 28, 2024 •

edited

Loading

Implement ac:u and ac:i services (Wi-Fi info) + example #140

Are you sure you want to change the base?

Implement ac:u and ac:i services (Wi-Fi info) + example #140

Conversation

adryzz commented Oct 27, 2023 • edited Loading

ian-h-chamberlain left a comment

Choose a reason for hiding this comment

adryzz commented Oct 30, 2023

adryzz commented Oct 30, 2023

adryzz commented Oct 30, 2023

ian-h-chamberlain left a comment

Choose a reason for hiding this comment

adryzz commented Nov 25, 2023

adryzz commented Feb 16, 2024

adryzz commented Feb 16, 2024

Jhynjhiruu commented Feb 16, 2024

ian-h-chamberlain left a comment • edited Loading

Choose a reason for hiding this comment

adryzz commented Feb 17, 2024

Jhynjhiruu commented Feb 17, 2024

Meziu Feb 23, 2024

Choose a reason for hiding this comment

adryzz Feb 23, 2024

Choose a reason for hiding this comment

ian-h-chamberlain Feb 25, 2024

Choose a reason for hiding this comment

Meziu Feb 23, 2024 • edited Loading

Choose a reason for hiding this comment

Meziu Feb 23, 2024

Choose a reason for hiding this comment

Meziu Feb 23, 2024

Choose a reason for hiding this comment

adryzz commented Feb 23, 2024

ian-h-chamberlain left a comment

Choose a reason for hiding this comment

Meziu left a comment • edited Loading

Choose a reason for hiding this comment

adryzz commented Mar 28, 2024

adryzz commented Mar 28, 2024

Meziu commented Mar 28, 2024

adryzz commented Mar 28, 2024 • edited Loading

Implement `ac:u` and `ac:i` services (Wi-Fi info) + example #140

Implement `ac:u` and `ac:i` services (Wi-Fi info) + example #140

adryzz commented Oct 27, 2023 •

edited

Loading

ian-h-chamberlain left a comment •

edited

Loading

Meziu Feb 23, 2024 •

edited

Loading

Meziu left a comment •

edited

Loading

adryzz commented Mar 28, 2024 •

edited

Loading