implement arpainet

src/arpainet/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "arpainet"
+version = "0.1.0"
+authors = ["Jeremy Soller <jackpot51@gmail.com>"]
+build = "build.rs"
+
+[build-dependencies]
+cbindgen = { path = "../../cbindgen" }
+
+[dependencies]
+platform = { path = "../platform" }
+errno = { path = "../errno" }
+sys_socket = { path = "../sys_socket" }
+netinet = { path = "../netinet" }

src/arpainet/build.rs

@@ -0,0 +1,11 @@
+extern crate cbindgen;
+
+use std::{env, fs};
+
+fn main() {
+    let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
+    fs::create_dir_all("../../target/include").expect("failed to create include directory");
+    cbindgen::generate(crate_dir)
+        .expect("failed to generate bindings")
+        .write_to_file("../../target/include/arpa/inet.h");
+}

src/arpainet/cbindgen.toml

@@ -0,0 +1,7 @@
+sys_includes = ["stddef.h", "sys/socket.h", "netinet/in.h"]
+include_guard = "_ARPAINET_H"
+language = "C"
+style = "Tag"
+
+[enum]
+prefix_with_name = true

src/arpainet/src/lib.rs

@@ -0,0 +1,132 @@
+//! arpainet implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/arpainet.h.html
+
+#![no_std]
+#![feature(alloc)]
+
+#[macro_use]
+extern crate alloc;
+
+extern crate errno;
+extern crate netinet;
+extern crate platform;
+extern crate sys_socket;
+
+use core::str::FromStr;
+use core::{mem, ptr, slice, str};
+use errno::*;
+pub use netinet::in_h::*;
+use platform::types::*;
+use platform::{c_str, socklen_t, AF_INET};
+
+#[no_mangle]
+pub extern "C" fn htonl(hostlong: u32) -> u32 {
+    hostlong.to_be()
+}
+
+#[no_mangle]
+pub extern "C" fn htons(hostshort: u16) -> u16 {
+    hostshort.to_be()
+}
+
+#[no_mangle]
+pub extern "C" fn ntohl(netlong: u32) -> u32 {
+    u32::from_be(netlong)
+}
+
+#[no_mangle]
+pub extern "C" fn ntohs(netshort: u16) -> u16 {
+    u16::from_be(netshort)
+}
+
+static mut NTOA_ADDR: [c_char; 16] = [0; 16];
+
+#[no_mangle]
+pub unsafe extern "C" fn inet_aton(cp: *const c_char, inp: *mut in_addr) -> c_int {
+    // TODO: octal/hex
+    inet_pton(AF_INET, cp, inp as *mut c_void)
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn inet_ntoa(addr: in_addr) -> *const c_char {
+    inet_ntop(
+        AF_INET,
+        &addr as *const in_addr as *const c_void,
+        NTOA_ADDR.as_mut_ptr(),
+        16,
+    )
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn inet_pton(domain: c_int, src: *const c_char, dest: *mut c_void) -> c_int {
+    if domain != AF_INET {
+        platform::errno = EAFNOSUPPORT;
+        -1
+    } else {
+        let mut s_addr = slice::from_raw_parts_mut(
+            &mut (*(dest as *mut in_addr)).s_addr as *mut _ as *mut u8,
+            4,
+        );
+        let mut octets = str::from_utf8_unchecked(c_str(src)).split('.');
+        for i in 0..4 {
+            if let Some(n) = octets.next().and_then(|x| u8::from_str(x).ok()) {
+                s_addr[i] = n;
+            } else {
+                return 0;
+            }
+        }
+        if octets.next() == None {
+            1 // Success
+        } else {
+            0
+        }
+    }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn inet_ntop(
+    domain: c_int,
+    src: *const c_void,
+    dest: *mut c_char,
+    size: socklen_t,
+) -> *const c_char {
+    if domain != AF_INET {
+        platform::errno = EAFNOSUPPORT;
+        ptr::null()
+    } else if size < 16 {
+        platform::errno = ENOSPC;
+        ptr::null()
+    } else {
+        let s_addr = slice::from_raw_parts(
+            &(*(src as *const in_addr)).s_addr as *const _ as *const u8,
+            4,
+        );
+        let addr = format!("{}.{}.{}.{}\0", s_addr[0], s_addr[1], s_addr[2], s_addr[3]);
+        ptr::copy(addr.as_ptr() as *const c_char, dest, addr.len());
+        dest
+    }
+}
+
+#[no_mangle]
+pub extern "C" fn inet_addr(cp: *const c_char) -> in_addr_t {
+    unimplemented!();
+}
+
+#[no_mangle]
+pub extern "C" fn inet_lnaof(_in: in_addr) -> in_addr_t {
+    unimplemented!();
+}
+
+#[no_mangle]
+pub extern "C" fn inet_makeaddr(net: in_addr_t, lna: in_addr_t) -> in_addr {
+    unimplemented!();
+}
+
+#[no_mangle]
+pub extern "C" fn inet_netof(_in: in_addr) -> in_addr_t {
+    unimplemented!();
+}
+
+#[no_mangle]
+pub extern "C" fn inet_network(cp: *const c_char) -> in_addr_t {
+    unimplemented!();
+}

src/lib.rs

@@ -6,6 +6,7 @@
 //extern crate compiler_builtins;
 extern crate platform;
 
+pub extern crate arpainet;
 pub extern crate ctype;
 pub extern crate errno;
 pub extern crate fcntl;

src/netinet/in/cbindgen.toml

@@ -1,6 +1,6 @@
 sys_includes = ["sys/types.h", "sys/socket.h"]
 include_guard = "_NETINET_IN_H"
-style = "Tag"
+style = "Both"
 language = "C"
 
 [export]

src/netinet/src/lib.rs

@@ -1,3 +1,3 @@
 #![no_std]
 
-extern crate in_h;
+pub extern crate in_h;