vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update to fix network stack

Browse source
This commit is contained in:
Jeremy Soller 2017-02-07 22:34:23 -07:00
parent 9de8be3c04
commit 6fa887ff18
4 changed files with 44 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
schemes/ethernetd/src/main.rs
View file

@ -88,16 +88,18 @@ fn daemon(network_fd: usize, socket_fd: usize) {
fn main() { fn main() {
match syscall::open("network:", syscall::O_RDWR | syscall::O_NONBLOCK) { match syscall::open("network:", syscall::O_RDWR | syscall::O_NONBLOCK) {
Ok(network_fd) => match syscall::open(":ethernet", syscall::O_RDWR | syscall::O_CREAT | syscall::O_NONBLOCK) { Ok(network_fd) => {
Ok(socket_fd) => { // Daemonize
// Daemonize if unsafe { syscall::clone(0).unwrap() } == 0 {
if unsafe { syscall::clone(0).unwrap() } == 0 { match syscall::open(":ethernet", syscall::O_RDWR | syscall::O_CREAT | syscall::O_NONBLOCK) {
daemon(network_fd, socket_fd); Ok(socket_fd) => {
daemon(network_fd, socket_fd);
},
Err(err) => {
println!("ethernetd: failed to create ethernet scheme: {}", err);
process::exit(1);
}
} }
},
Err(err) => {
println!("ethernetd: failed to create ethernet scheme: {}", err);
process::exit(1);
} }
}, },
Err(err) => { Err(err) => {

20
schemes/ipd/src/main.rs
View file

@ -314,16 +314,18 @@ fn daemon(arp_fd: usize, ip_fd: usize, scheme_fd: usize) {
fn main() { fn main() {
match syscall::open("ethernet:806", syscall::O_RDWR | syscall::O_NONBLOCK) { match syscall::open("ethernet:806", syscall::O_RDWR | syscall::O_NONBLOCK) {
Ok(arp_fd) => match syscall::open("ethernet:800", syscall::O_RDWR | syscall::O_NONBLOCK) { Ok(arp_fd) => match syscall::open("ethernet:800", syscall::O_RDWR | syscall::O_NONBLOCK) {
Ok(ip_fd) => match syscall::open(":ip", syscall::O_RDWR | syscall::O_CREAT | syscall::O_NONBLOCK) { Ok(ip_fd) => {
Ok(scheme_fd) => { // Daemonize
// Daemonize if unsafe { syscall::clone(0).unwrap() } == 0 {
if unsafe { syscall::clone(0).unwrap() } == 0 { match syscall::open(":ip", syscall::O_RDWR | syscall::O_CREAT | syscall::O_NONBLOCK) {
daemon(arp_fd, ip_fd, scheme_fd); Ok(scheme_fd) => {
daemon(arp_fd, ip_fd, scheme_fd);
},
Err(err) => {
println!("ipd: failed to create ip scheme: {}", err);
process::exit(1);
}
} }
},
Err(err) => {
println!("ipd: failed to create ip scheme: {}", err);
process::exit(1);
} }
}, },
Err(err) => { Err(err) => {

20
schemes/tcpd/src/main.rs
View file

@ -809,16 +809,18 @@ fn daemon(tcp_fd: usize, scheme_fd: usize) {
fn main() { fn main() {
match syscall::open("ip:6", O_RDWR | O_NONBLOCK) { match syscall::open("ip:6", O_RDWR | O_NONBLOCK) {
Ok(tcp_fd) => match syscall::open(":tcp", O_RDWR | O_CREAT | O_NONBLOCK) { Ok(tcp_fd) => {
Ok(scheme_fd) => { // Daemonize
// Daemonize if unsafe { syscall::clone(0).unwrap() } == 0 {
if unsafe { syscall::clone(0).unwrap() } == 0 { match syscall::open(":tcp", O_RDWR | O_CREAT | O_NONBLOCK) {
daemon(tcp_fd, scheme_fd); Ok(scheme_fd) => {
daemon(tcp_fd, scheme_fd);
},
Err(err) => {
println!("tcpd: failed to create tcp scheme: {}", err);
process::exit(1);
}
} }
},
Err(err) => {
println!("tcpd: failed to create tcp scheme: {}", err);
process::exit(1);
} }
}, },
Err(err) => { Err(err) => {

20
schemes/udpd/src/main.rs
View file

@ -476,16 +476,18 @@ fn daemon(udp_fd: usize, scheme_fd: usize) {
fn main() { fn main() {
match syscall::open("ip:11", O_RDWR | O_NONBLOCK) { match syscall::open("ip:11", O_RDWR | O_NONBLOCK) {
Ok(udp_fd) => match syscall::open(":udp", O_RDWR | O_CREAT | O_NONBLOCK) { Ok(udp_fd) => {
Ok(scheme_fd) => { // Daemonize
// Daemonize if unsafe { syscall::clone(0).unwrap() } == 0 {
if unsafe { syscall::clone(0).unwrap() } == 0 { match syscall::open(":udp", O_RDWR | O_CREAT | O_NONBLOCK) {
daemon(udp_fd, scheme_fd); Ok(scheme_fd) => {
daemon(udp_fd, scheme_fd);
},
Err(err) => {
println!("udpd: failed to create udp scheme: {}", err);
process::exit(1);
}
} }
},
Err(err) => {
println!("udpd: failed to create udp scheme: {}", err);
process::exit(1);
} }
}, },
Err(err) => { Err(err) => {