hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ci

Browse Source
This commit is contained in:
rustdesk 2023-05-18 13:06:49 +08:00
parent 19768d8230
commit 8706541aa9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hbb_common/src/lib.rs
View File

@ -287,7 +287,7 @@ pub fn get_time() -> i64 {
#[inline] #[inline]
pub fn is_ipv4_str(id: &str) -> bool { pub fn is_ipv4_str(id: &str) -> bool {
regex::Regex::new(r"^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$") regex::Regex::new(r"^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(:\d+)?$")
.unwrap() .unwrap()
.is_match(id) .is_match(id)
} }
@ -399,6 +399,7 @@ mod test {
#[test] #[test]
fn test_ipv4() { fn test_ipv4() {
assert!(is_ipv4_str("1.2.3.4")); assert!(is_ipv4_str("1.2.3.4"));
assert!(is_ipv4_str("1.2.3.4:90"));
assert!(is_ipv4_str("192.168.0.1")); assert!(is_ipv4_str("192.168.0.1"));
assert!(is_ipv4_str("0.0.0.0")); assert!(is_ipv4_str("0.0.0.0"));
assert!(is_ipv4_str("255.255.255.255")); assert!(is_ipv4_str("255.255.255.255"));

8
libs/hbb_common/src/socket_client.rs
View File

@ -229,10 +229,10 @@ mod tests {
async fn test_nat64_async() { async fn test_nat64_async() {
assert_eq!(ipv4_to_ipv6("1.1.1.1".to_owned(), true), "1.1.1.1"); assert_eq!(ipv4_to_ipv6("1.1.1.1".to_owned(), true), "1.1.1.1");
assert_eq!(ipv4_to_ipv6("1.1.1.1".to_owned(), false), "1.1.1.1.nip.io"); assert_eq!(ipv4_to_ipv6("1.1.1.1".to_owned(), false), "1.1.1.1.nip.io");
// assert_eq!( assert_eq!(
// ipv4_to_ipv6("1.1.1.1:8080".to_owned(), false), ipv4_to_ipv6("1.1.1.1:8080".to_owned(), false),
// "1.1.1.1.nip.io:8080" "1.1.1.1.nip.io:8080"
// ); );
assert_eq!( assert_eq!(
ipv4_to_ipv6("rustdesk.com".to_owned(), false), ipv4_to_ipv6("rustdesk.com".to_owned(), false),
"rustdesk.com" "rustdesk.com"