Add C Swift Bindings
This adds C Swift bindings for burrow via compiling burrow with a matching header file.
This commit is contained in:
parent
d821f3d03c
commit
3ef13b09a3
4 changed files with 85 additions and 4 deletions
|
|
@ -1,7 +1,22 @@
|
||||||
|
import libburrow
|
||||||
import NetworkExtension
|
import NetworkExtension
|
||||||
|
import OSLog
|
||||||
|
|
||||||
class PacketTunnelProvider: NEPacketTunnelProvider {
|
class PacketTunnelProvider: NEPacketTunnelProvider {
|
||||||
|
let logger = Logger(subsystem: "com.hackclub.burrow", category: "General")
|
||||||
override func startTunnel(options: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) {
|
override func startTunnel(options: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) {
|
||||||
|
let fild = libburrow.retrieve()
|
||||||
|
if fild == -1 {
|
||||||
|
// Not sure if this is the right way to return an error
|
||||||
|
logger.error("Failed to retrieve file descriptor for burrow.")
|
||||||
|
let err = NSError(
|
||||||
|
domain: "com.hackclub.burrow",
|
||||||
|
code: 1_010,
|
||||||
|
userInfo: [NSLocalizedDescriptionKey: "Failed to find TunInterface"]
|
||||||
|
)
|
||||||
|
completionHandler(err)
|
||||||
|
}
|
||||||
|
logger.info("fd: \(fild)")
|
||||||
completionHandler(nil)
|
completionHandler(nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
|
int retrieve();
|
||||||
|
|
|
||||||
|
|
@ -1 +1,32 @@
|
||||||
pub mod ensureroot;
|
pub mod ensureroot;
|
||||||
|
|
||||||
|
#[cfg(any(target_os = "linux", target_vendor = "apple"))]
|
||||||
|
use std::{
|
||||||
|
mem,
|
||||||
|
os::fd::{AsRawFd, FromRawFd},
|
||||||
|
};
|
||||||
|
|
||||||
|
use tun::TunInterface;
|
||||||
|
|
||||||
|
// TODO Separate start and retrieve functions
|
||||||
|
|
||||||
|
#[cfg(any(target_os = "linux", target_vendor = "apple"))]
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn retrieve() -> i32 {
|
||||||
|
let iface2 = (1..100)
|
||||||
|
.filter_map(|i| {
|
||||||
|
let iface = unsafe { TunInterface::from_raw_fd(i) };
|
||||||
|
match iface.name() {
|
||||||
|
Ok(_name) => Some(iface),
|
||||||
|
Err(_) => {
|
||||||
|
mem::forget(iface);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.next();
|
||||||
|
match iface2 {
|
||||||
|
Some(iface) => iface.as_raw_fd(),
|
||||||
|
None => -1,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,11 @@
|
||||||
|
use std::mem;
|
||||||
|
#[cfg(any(target_os = "linux", target_vendor = "apple"))]
|
||||||
|
use std::os::fd::FromRawFd;
|
||||||
|
|
||||||
use clap::{Args, Parser, Subcommand};
|
use clap::{Args, Parser, Subcommand};
|
||||||
use tokio::io::Result;
|
use tokio::io::Result;
|
||||||
|
#[cfg(any(target_os = "linux", target_vendor = "apple"))]
|
||||||
|
use burrow::retrieve;
|
||||||
use tun::TunInterface;
|
use tun::TunInterface;
|
||||||
|
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
|
|
@ -22,17 +28,41 @@ struct Cli {
|
||||||
enum Commands {
|
enum Commands {
|
||||||
/// Start Burrow
|
/// Start Burrow
|
||||||
Start(StartArgs),
|
Start(StartArgs),
|
||||||
|
/// Retrieve the file descriptor of the tun interface
|
||||||
|
Retrieve(RetrieveArgs),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Args)]
|
#[derive(Args)]
|
||||||
struct StartArgs {}
|
struct StartArgs {}
|
||||||
|
|
||||||
async fn try_main() -> Result<()> {
|
#[derive(Args)]
|
||||||
burrow::ensureroot::ensure_root();
|
struct RetrieveArgs {}
|
||||||
|
|
||||||
|
#[cfg(any(target_os = "linux", target_vendor = "apple"))]
|
||||||
|
async fn try_start() -> Result<()> {
|
||||||
|
burrow::ensureroot::ensure_root();
|
||||||
let iface = TunInterface::new()?;
|
let iface = TunInterface::new()?;
|
||||||
println!("{:?}", iface.name());
|
println!("{:?}", iface.name());
|
||||||
|
let iface2 = retrieve();
|
||||||
|
println!("{}", iface2);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(any(target_os = "linux", target_vendor = "apple"))]
|
||||||
|
async fn try_retrieve() -> Result<()> {
|
||||||
|
burrow::ensureroot::ensure_root();
|
||||||
|
let iface2 = retrieve();
|
||||||
|
println!("{}", iface2);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(any(target_os = "linux", target_vendor = "apple")))]
|
||||||
|
async fn try_start() -> Result<()> {
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(any(target_os = "linux", target_vendor = "apple")))]
|
||||||
|
async fn try_retrieve() -> Result<()> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -43,7 +73,12 @@ async fn main() {
|
||||||
let cli = Cli::parse();
|
let cli = Cli::parse();
|
||||||
match &cli.command {
|
match &cli.command {
|
||||||
Commands::Start(..) => {
|
Commands::Start(..) => {
|
||||||
try_main().await.unwrap();
|
try_start().await.unwrap();
|
||||||
|
println!("FINISHED");
|
||||||
|
}
|
||||||
|
Commands::Retrieve(..) => {
|
||||||
|
try_retrieve().await.unwrap();
|
||||||
|
println!("FINISHED");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue