Use ring and rustls on iOS

.github/workflows/build.yml

@@ -152,15 +152,12 @@ jobs:
       - name: build
         run: |
           # OPENSSL_DIR=/tmp/openssl-ios64 cargo lipo --release -p leaf-mobile --targets aarch64-apple-ios
-          cargo lipo --release -p leaf-mobile --targets aarch64-apple-ios
-
-      - name: generate header
-        run: |
-          cbindgen leaf-mobile/src/lib.rs -l c > leaf.h
+          make ios
 
       - name: zip artifacts
         run: |
           mv target/universal/release/libleaf.a .
+          mv target/universal/release/leaf.h .
           zip libleaf-ios.zip leaf.h libleaf.a
 
       - name: upload assets

.github/workflows/release.yml

@@ -150,21 +150,14 @@ jobs:
       - name: build
         run: |
           # OPENSSL_DIR=/tmp/openssl-ios64 cargo lipo --release -p leaf-mobile --targets aarch64-apple-ios
-          cargo lipo --release -p leaf-mobile --targets aarch64-apple-ios
-
-      - name: generate header
-        run: |
-          cbindgen leaf-mobile/src/lib.rs -l c > leaf.h
+          make ios
 
       - name: zip artifacts
         run: |
           mv target/universal/release/libleaf.a .
+          mv target/universal/release/leaf.h .
           zip libleaf-ios.zip leaf.h libleaf.a
 
-      - name: verify zip artifacts
-        run: |
-          unzip -l libleaf-ios.zip
-
       - name: upload assets
         uses: actions/upload-artifact@v2
         with:

Makefile

@@ -1,8 +1,10 @@
 ios:
-	cargo lipo -p leaf-mobile --release --targets aarch64-apple-ios && cbindgen leaf-mobile/src/lib.rs -l c > target/universal/release/leaf.h
+	cargo lipo -p leaf-mobile --release --targets aarch64-apple-ios --manifest-path leaf-mobile/Cargo.toml --no-default-features --features "common config ring-aead rustls-tls"
+	cbindgen leaf-mobile/src/lib.rs -l c > target/universal/release/leaf.h
 
 ios-dev:
-	cargo lipo -p leaf-mobile --targets aarch64-apple-ios && cbindgen leaf-mobile/src/lib.rs -l c > target/universal/debug/leaf.h
+	cargo lipo -p leaf-mobile --targets aarch64-apple-ios --manifest-path leaf-mobile/Cargo.toml --no-default-features --features "common config ring-aead rustls-tls"
+	cbindgen leaf-mobile/src/lib.rs -l c > target/universal/debug/leaf.h
 
 local:
 	cargo build -p leaf-bin --release

leaf-mobile/Cargo.toml

@@ -10,8 +10,24 @@ name = "leaf"
 path = "src/lib.rs"
 crate-type = ["staticlib"]
 
+[features]
+default = ["common", "config", "ring-aead", "rustls-tls"]
+
+config = ["json-config", "conf-config"]
+
+json-config = ["leaf/json"]
+conf-config = ["leaf/conf"]
+
+ring-aead = ["leaf/ring-aead"]
+openssl-aead = ["leaf/openssl-aead"]
+
+rustls-tls = ["leaf/rustls-tls"]
+openssl-tls = ["leaf/openssl-tls"]
+
+common = ["leaf/endpoint", "leaf/ensemble"]
+
 [dependencies]
-leaf = { path = "../leaf" }
+leaf = { path = "../leaf", default-features = false, optional = true }
 log = "0.4"
 fern = { version = "0.5", features = ["colored"] }
 memchr = "2.3"

leaf/Cargo.toml

@@ -10,7 +10,7 @@ name = "leaf"
 path = "src/lib.rs"
 
 [features]
-default = ["config", "endpoint", "ensemble", "openssl-aead", "openssl-tls"]
+default = ["config", "endpoint", "ensemble", "ring-aead", "rustls-tls"]
 
 ring-aead = ["ring"]
 openssl-aead = ["openssl"]

leaf/src/proxy/tun/netstack/tcp_stream_impl.rs

@@ -178,12 +178,12 @@ impl Drop for TcpStreamImpl {
         unsafe {
             let _g = self.lwip_lock.lock();
             if !self.errored {
-                // tcp_arg(self.pcb, std::ptr::null_mut());
-                // tcp_recv(self.pcb, None);
-                // tcp_sent(self.pcb, None);
-                // tcp_err(self.pcb, None);
-                // tcp_close(self.pcb);
-                tcp_abort(self.pcb);
+                // TODO
+                tcp_close(self.pcb);
+                tcp_arg(self.pcb, std::ptr::null_mut());
+                tcp_recv(self.pcb, None);
+                tcp_sent(self.pcb, None);
+                tcp_err(self.pcb, None);
             }
         }
     }