Merge branch 'ios-wip' of github.com:geph-official/geph5 into ios-wip

geph-official · Dec 30, 2024 · e98add1 · e98add1
2 parents 812a2e6 + ac1ac50
commit e98add1
Show file tree

Hide file tree

Showing 11 changed files with 340 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/binaries/geph5-client/src/vpn.rs b/binaries/geph5-client/src/vpn.rs
@@ -70,8 +70,8 @@ static VPN_CAPTURE: CtxField<ArrayQueue<(Bytes, Instant)>> = |_| ArrayQueue::new
 static VPN_INJECT: CtxField<ArrayQueue<Bytes>> = |_| ArrayQueue::new(100);
 
 pub async fn vpn_loop(ctx: &AnyCtx<Config>) -> anyhow::Result<()> {
-    let (send_captured, recv_captured) = smol::channel::unbounded();
-    let (send_injected, recv_injected) = smol::channel::unbounded();
+    let (send_captured, recv_captured) = smol::channel::bounded(100);
+    let (send_injected, recv_injected) = smol::channel::bounded(100);
 
     let ipstack = IpStack::new(
         #[cfg(target_os = "ios")]
@@ -115,8 +115,6 @@ pub async fn vpn_loop(ctx: &AnyCtx<Config>) -> anyhow::Result<()> {
                     tracing::trace!(len = bts.len(), "vpn shuffling down");
                     ctx.get(VPN_INJECT).push(bts);
                     ctx.get(VPN_EVENT).notify_all();
-
-                    smol::future::yield_now().await;
                 }
             };
             up_loop.race(dn_loop).await

diff --git a/binaries/geph5-exit/Cargo.toml b/binaries/geph5-exit/Cargo.toml
@@ -56,3 +56,10 @@ bytes = "1.8.0"
 simple-dns = "0.9.0"
 dashmap = "6.1.0"
 globset = "0.4.15"
+crossbeam-queue = "0.3.12"
+scopeguard = "1.2.0"
+async-event = "0.2.1"
+ipnet = "2.10.1"
+socket2 = "0.5.8"
+serde_with = "3.12.0"
+futures-concurrency = "7.6.2"
diff --git a/binaries/geph5-exit/src/dns.rs b/binaries/geph5-exit/src/dns.rs
@@ -16,6 +16,7 @@ use simple_dns::Packet;
 use smol::{
     channel::{Receiver, Sender},
     future::FutureExt as _,
+    lock::Semaphore,
     net::UdpSocket,
 };
 
@@ -40,26 +41,31 @@ impl FilterOptions {
                 .time_to_live(Duration::from_secs(86400))
                 .build()
         });
-        let nsfw_list = NSFW_LIST
-            .try_get_with((), async move {
-                anyhow::Ok(Arc::new(
-                    parse_oisd("https://nsfw.oisd.nl/domainswild").await?,
-                ))
-            })
-            .await
-            .map_err(|e| anyhow::anyhow!(e))?;
-        let ads_list = ADS_LIST
-            .try_get_with((), async move {
-                anyhow::Ok(Arc::new(
-                    parse_oisd("https://big.oisd.nl/domainswild").await?,
-                ))
-            })
-            .await
-            .map_err(|e| anyhow::anyhow!(e))?;
-        if self.nsfw && nsfw_list.is_match(name) {
+
+        if self.nsfw
+            && NSFW_LIST
+                .try_get_with((), async move {
+                    anyhow::Ok(Arc::new(
+                        parse_oisd("https://nsfw.oisd.nl/domainswild").await?,
+                    ))
+                })
+                .await
+                .map_err(|e| anyhow::anyhow!(e))?
+                .is_match(name)
+        {
             anyhow::bail!("blocking NSFW domain")
         }
-        if self.ads && ads_list.is_match(name) {
+        if self.ads
+            && ADS_LIST
+                .try_get_with((), async move {
+                    anyhow::Ok(Arc::new(
+                        parse_oisd("https://small.oisd.nl/domainswild").await?,
+                    ))
+                })
+                .await
+                .map_err(|e| anyhow::anyhow!(e))?
+                .is_match(name)
+        {
             anyhow::bail!("blocking ads domain")
         }
         Ok(())
@@ -68,6 +74,8 @@ impl FilterOptions {
 
 async fn parse_oisd(url: &str) -> anyhow::Result<GlobSet> {
     let raw = reqwest::get(url).await?.bytes().await?;
+    tracing::info!(url, "STARTING TO BUILD an oisd blocklist");
+
     let mut builder = GlobSet::builder();
     let mut count = 0;
     for line in String::from_utf8_lossy(&raw)
@@ -77,6 +85,10 @@ async fn parse_oisd(url: &str) -> anyhow::Result<GlobSet> {
         builder.add(Glob::from_str(line)?);
         builder.add(Glob::from_str(&line.replace("*.", ""))?);
         count += 1;
+        if fastrand::f32() < 0.01 {
+            tracing::info!(url, count, "LOADING an oisd blocklist");
+            smol::future::yield_now().await;
+        }
     }
     tracing::info!(url, count, "LOADED an oisd blocklist");
     Ok(builder.build()?)