Getifaddrs (#137)

* new

* getifaddrs

* getifaddrs

* getifaddrs

* getifaddrs

* getifaddrs

* cleanup

* cleanup

* cleanup

* PR fix

* PR fix

Author: rennergade

gen_netdevs.c

@@ -0,0 +1,30 @@
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+
+int main ()
+{
+    struct ifaddrs *ifap, *ifa;
+    struct sockaddr_in *sa, *ba, *na, *da;
+    char *addr, *baddr, *naddr, *daddr;
+
+    getifaddrs (&ifap);
+    for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+        if (ifa->ifa_addr && ifa->ifa_addr->sa_family==AF_INET) {
+            sa = (struct sockaddr_in *) ifa->ifa_addr;
+            addr = inet_ntoa(sa->sin_addr);
+            na = (struct sockaddr_in *) ifa->ifa_netmask;
+            naddr = inet_ntoa(na->sin_addr);
+            ba = (struct sockaddr_in *) ifa->ifa_broadaddr;
+            baddr = inet_ntoa(ba->sin_addr);
+
+            printf("%s %d %s %s %s\n", ifa->ifa_name, ifa->ifa_flags, addr, naddr, baddr);
+        }
+    }
+
+    freeifaddrs(ifap);
+    return 0;
+}

gen_netdevs.sh

@@ -1,4 +1,12 @@
 #!/bin/bash
-shopt -u expand_aliases
-ip a | grep 'inet ' | awk '{print $2}' | sed 's/\/.*$//g' > net_devices
-echo '0.0.0.0' >> net_devices
+FILE=gen_netdevs
+if [ -f "$FILE" ]; then
+    echo "$FILE exists."
+else 
+    echo "$FILE does not exist. Compiling."
+    gcc /home/lind/lind_project/src/safeposix-rust/gen_netdevs.c -o gen_netdevs
+fi
+
+echo "Generating netdevs"
+
+./gen_netdevs > net_devices

src/interface/comm.rs

@@ -352,12 +352,6 @@ impl Drop for Socket {
     }
 }
 
-pub fn read_netdevs() -> Vec<GenIpaddr> {
-    let mut ips = vec!();
-    for net_device in read_to_string(NET_DEV_FILENAME).expect("No net_devices file present!").split('\n') {
-        if net_device == "" {continue;}
-        let genipopt = GenIpaddr::from_string(net_device);
-        ips.push(genipopt.expect("Could not parse device ip address from net_devices file"));
-    }
-    return ips;
+pub fn getifaddrs_from_file() -> String {
+    read_to_string(NET_DEV_FILENAME).expect("No net_devices file present!").to_owned()
 }

src/safeposix/dispatcher.rs

@@ -75,6 +75,7 @@ const SOCKET_SYSCALL: i32 = 136;
 
 const GETSOCKNAME_SYSCALL: i32 = 144;
 const GETPEERNAME_SYSCALL: i32 = 145;
+const GETIFADDRS_SYSCALL: i32 = 146;
 
 
 use crate::interface;
@@ -266,6 +267,9 @@ pub extern "C" fn dispatcher(cageid: u64, callnum: i32, arg1: Arg, arg2: Arg, ar
             }
             rv
         }
+        GETIFADDRS_SYSCALL => {
+            check_and_dispatch!(cage.getifaddrs_syscall, interface::get_mutcbuf(arg1), interface::get_usize(arg2))
+        }
         GETSOCKOPT_SYSCALL => {
             let mut sockval = 0;
             if interface::arg_nullity(&arg4) || interface::arg_nullity(&arg5) {

src/safeposix/net.rs

@@ -37,7 +37,23 @@ pub static NET_METADATA: interface::RustLazyGlobal<interface::RustRfc<NetMetadat
 //A list of all network devices present on the machine
 //It is populated from a file that should be present prior to running rustposix, see
 //the implementation of read_netdevs for specifics
-pub static NET_DEVICES_LIST: interface::RustLazyGlobal<Vec<interface::GenIpaddr>> = interface::RustLazyGlobal::new(|| interface::read_netdevs());
+pub static NET_IFADDRS_STR: interface::RustLazyGlobal<String> = interface::RustLazyGlobal::new(|| interface::getifaddrs_from_file());
+
+pub static NET_DEVICE_IPLIST: interface::RustLazyGlobal<Vec<interface::GenIpaddr>> = interface::RustLazyGlobal::new(|| ips_from_ifaddrs());
+
+fn ips_from_ifaddrs() -> Vec<interface::GenIpaddr> {
+    let mut ips = vec![];
+    for net_device in NET_IFADDRS_STR.as_str().split('\n') {
+        if net_device == "" {continue;}
+        let ifaddrstr: Vec<&str> = net_device.split(' ').collect();
+        let genipopt = interface::GenIpaddr::from_string(ifaddrstr[2]);
+        ips.push(genipopt.expect("Could not parse device ip address from net_devices file"));
+    }
+
+    let genipopt0 = interface::GenIpaddr::from_string("0.0.0.0");
+    ips.push(genipopt0.expect("Could not parse device ip address from net_devices file"));
+    return ips;
+}
 
 #[derive(Debug, Hash, Eq, PartialEq, Clone)]
 pub enum PortType {
@@ -77,7 +93,7 @@ impl NetMetadata {
                 }
                 interface::RustHashEntry::Vacant(v) => {
                     let mut intervec = vec!();
-                    for interface_addr in &*NET_DEVICES_LIST {
+                    for interface_addr in &*NET_DEVICE_IPLIST {
                         intervec.push((interface_addr.clone(), rebindability));
                     }
                     v.insert(intervec);
@@ -103,7 +119,7 @@ impl NetMetadata {
         }
     }
     pub fn _get_available_udp_port(&self, addr: interface::GenIpaddr, domain: i32, rebindability: bool) -> Result<u16, i32> {
-        if !NET_DEVICES_LIST.contains(&addr) {
+        if !NET_DEVICE_IPLIST.contains(&addr) {
             return Err(syscall_error(Errno::EADDRNOTAVAIL, "bind", "Specified network device is not set up for lind or does not exist!"));
         }
         let mut porttuple = mux_port(addr, 0, domain, UDPPORT);
@@ -132,7 +148,7 @@ impl NetMetadata {
         return Err(syscall_error(Errno::EADDRINUSE, "bind", "No available ephemeral port could be found"));
     }
     pub fn _get_available_tcp_port(&self, addr: interface::GenIpaddr, domain: i32, rebindability: bool) -> Result<u16, i32> {
-        if !NET_DEVICES_LIST.contains(&addr) {
+        if !NET_DEVICE_IPLIST.contains(&addr) {
             return Err(syscall_error(Errno::EADDRNOTAVAIL, "bind", "Specified network device is not set up for lind or does not exist!"));
         }
         let mut porttuple = mux_port(addr.clone(), 0, domain, TCPPORT);
@@ -173,7 +189,7 @@ impl NetMetadata {
     }
 
     pub fn _reserve_localport(&self, addr: interface::GenIpaddr, port: u16, protocol: i32, domain: i32, rebindability: bool) -> Result<u16, i32> {
-        if !NET_DEVICES_LIST.contains(&addr) {
+        if !NET_DEVICE_IPLIST.contains(&addr) {
             return Err(syscall_error(Errno::EADDRNOTAVAIL, "bind", "Specified network device is not set up for lind or does not exist!"));
         }
 
@@ -202,7 +218,7 @@ impl NetMetadata {
                     return Err(syscall_error(Errno::EADDRINUSE, "reserve port", "port is already in use"));
                 }
                 interface::RustHashEntry::Vacant(v) => {
-                    v.insert(NET_DEVICES_LIST.iter().map(|x| (x.clone(), if rebindability {1} else {0})).collect());
+                    v.insert(NET_DEVICE_IPLIST.iter().map(|x| (x.clone(), if rebindability {1} else {0})).collect());
                 }
             }
         } else {
@@ -228,7 +244,7 @@ impl NetMetadata {
     }
 
     pub fn _release_localport(&self, addr: interface::GenIpaddr, port: u16, protocol: i32, domain: i32) -> Result<(), i32> {
-        if !NET_DEVICES_LIST.contains(&addr) {
+        if !NET_DEVICE_IPLIST.contains(&addr) {
             return Err(syscall_error(Errno::EADDRNOTAVAIL, "bind", "Specified network device is not set up for lind or does not exist!"));
         }
 

src/safeposix/syscalls/net_calls.rs

@@ -1707,4 +1707,16 @@ impl Cage {
         }
         return 0;
     }
+
+    // all this does is send the net_devs data in a string to libc, where we will later parse and 
+    // alloc into getifaddrs structs
+    pub fn getifaddrs_syscall(&self, buf: *mut u8, count: usize) -> i32 {
+        if NET_IFADDRS_STR.len() < count {
+            interface::fill(buf, NET_IFADDRS_STR.len(), &NET_IFADDRS_STR.as_bytes().to_vec());
+            0 // return success
+        }
+        else {
+            return syscall_error(Errno::EOPNOTSUPP, "getifaddrs", "invalid ifaddrs length");
+        }
+    }
 }