netstack: Merge the redox_netstack lib into smolnetd

netstack/src/lib/lib.rs

@@ -1,2 +0,0 @@
-pub mod error;
-pub mod logger;

netstack/src/main.rs

@@ -7,12 +7,13 @@ use event::{EventFlags, EventQueue};
 use libredox::flag::{O_CREAT, O_NONBLOCK, O_RDWR};
 use libredox::Fd;
 
-use redox_netstack::logger;
 use scheme::Smolnetd;
 use smoltcp::wire::EthernetAddress;
 
 mod buffer_pool;
+mod error;
 mod link;
+mod logger;
 mod port_set;
 mod router;
 mod scheme;

netstack/src/scheme/mod.rs

@@ -28,7 +28,7 @@ use self::ip::IpScheme;
 use self::netcfg::NetCfgScheme;
 use self::tcp::TcpScheme;
 use self::udp::UdpScheme;
-use redox_netstack::error::{Error, Result};
+use crate::error::{Error, Result};
 
 mod icmp;
 mod ip;

netstack/src/scheme/netcfg/mod.rs

@@ -19,13 +19,13 @@ use syscall::{
     Result as SyscallResult, SchemeMut,
 };
 
+use crate::error::{Error, Result};
 use crate::link::DeviceList;
 use crate::router::route_table::{RouteTable, Rule};
 
 use self::nodes::*;
 use self::notifier::*;
 use super::{post_fevent, Interface};
-use redox_netstack::error::{Error, Result};
 
 const WRITE_BUFFER_MAX_SIZE: usize = 0xffff;
 

netstack/src/scheme/socket.rs

@@ -20,9 +20,9 @@ use syscall::{
 };
 
 use super::Interface;
+use crate::error::{Error, Result};
 use crate::router::route_table::RouteTable;
 use crate::scheme::smoltcp::iface::SocketHandle;
-use redox_netstack::error::{Error, Result};
 use smoltcp::socket::AnySocket;
 
 use super::{post_fevent, SocketSet};