Update

Pixeval · Apr 28, 2024 · 317ad42 · 317ad42
1 parent 6a12aa1
commit 317ad42
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 47 deletions.
diff --git a/src/chrome_ssl_hook.rs b/src/chrome_ssl_hook.rs
@@ -22,9 +22,7 @@ type TargetFunc = unsafe extern "C" fn(s: *mut c_void, name: PCSTR) -> i32;
 
 unsafe extern "C" fn detour(s: *mut c_void, name: PCSTR) -> i32 {
     let name1 = name.to_string().unwrap();
-    if name1.eq("pixiv.net") {
-        return ORIGINAL.lock().unwrap().get_mut().unwrap()(s, PCSTR(null()));
-    } else if name1.eq("www.pixiv.net") {
+    if name1.ends_with("pixiv.net") {
         return ORIGINAL.lock().unwrap().get_mut().unwrap()(s, PCSTR(null()));
     } else if name1.ends_with("pximg.net") {
         return ORIGINAL.lock().unwrap().get_mut().unwrap()(s, PCSTR(null()));

diff --git a/src/ws2_native_dns_hook.rs b/src/ws2_native_dns_hook.rs
@@ -74,12 +74,8 @@ type GetAddrInfoExWFunc = unsafe extern "system" fn(
 ) -> i32;
 
 unsafe fn lookup(name: &str) -> Option<SOCKADDR> {
-    let ipv4 = if name.eq("pixiv.net") {
+    let ipv4 = if name.ends_with("pixiv.net") {
         Some(Ipv4Addr::new(210, 140, 92, 183))
-    } else if name.eq("www.pixiv.net") {
-        Some(Ipv4Addr::new(210, 140, 92, 183))
-    } else if name.ends_with(".pixiv.net") {
-        Some(Ipv4Addr::new(104, 18, 42, 239))
     } else if name.eq("www.recaptcha.net") {
         Some(Ipv4Addr::new(142, 250, 191, 67))
     } else if name.ends_with("pximg.net") {

diff --git a/src/ws2_socket_dns_hook.rs b/src/ws2_socket_dns_hook.rs
@@ -84,7 +84,7 @@ unsafe extern "system" fn detour1(
                     let mut header = message.header().clone();
                     header.set_answer_count(1);
                     message.set_header(header);
-                    if query.name().to_string().eq("pixiv.net.") {
+                    if query.name().to_string().ends_with("pixiv.net.") {
                         message.add_answers([Record::from_rdata(
                             query.name().clone(),
                             1000,
@@ -103,44 +103,6 @@ unsafe extern "system" fn detour1(
                         *lpnumberofbytessent = len as u32;
                         WSASetEvent((*lpoverlapped).hEvent);
                         return 0;
-                    } else if query.name().to_string().eq("www.pixiv.net.") {
-                        message.add_answers([Record::from_rdata(
-                            query.name().clone(),
-                            1000,
-                            A::new(210, 140, 92, 181),
-                        )
-                        .into_record_of_rdata()]);
-                        TX.as_ref()
-                            .unwrap()
-                            .send(Payload {
-                                message: message.to_owned(),
-                                addr,
-                                addr_len: itolen,
-                            })
-                            .ok();
-                        let len = message.to_bytes().unwrap().len();
-                        *lpnumberofbytessent = len as u32;
-                        WSASetEvent((*lpoverlapped).hEvent);
-                        return 0;
-                    } else if query.name().to_string().ends_with(".pixiv.net.") {
-                        message.add_answers([Record::from_rdata(
-                            query.name().clone(),
-                            1000,
-                            A::new(104, 18, 42, 239),
-                        )
-                        .into_record_of_rdata()]);
-                        TX.as_ref()
-                            .unwrap()
-                            .send(Payload {
-                                message: message.to_owned(),
-                                addr,
-                                addr_len: itolen,
-                            })
-                            .ok();
-                        let len = message.to_bytes().unwrap().len();
-                        *lpnumberofbytessent = len as u32;
-                        WSASetEvent((*lpoverlapped).hEvent);
-                        return 0;
                     } else if query.name().to_string().eq("www.recaptcha.net.") {
                         message.add_answers([Record::from_rdata(
                             query.name().clone(),