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

Move common definitions into netutils

Browse source
This commit is contained in:
Jeremy Soller 2016-10-20 17:49:54 -06:00
parent 63cff7bc48
commit d0abe6335a
21 changed files with 64 additions and 808 deletions
Download patch file Download diff file Expand all files Collapse all files

1
schemes/udpd/Cargo.toml
View file

@ -3,5 +3,6 @@ name = "udpd"
version = "0.1.0"
[dependencies]
netutils = { path = "../../programs/netutils/" }
resource_scheme = { path = "../../crates/resource_scheme/" }
syscall = { path = "../../syscall/" }

167
schemes/udpd/src/common.rs
View file

@ -1,167 +0,0 @@
use std::{mem, slice, u8, u16};
pub static mut IP_ADDR: Ipv4Addr = Ipv4Addr { bytes: [10, 0, 2, 15] };
#[derive(Copy, Clone)]
#[allow(non_camel_case_types)]
#[repr(packed)]
pub struct n16(u16);
impl n16 {
pub fn new(value: u16) -> Self {
n16(value.to_be())
}
pub fn get(&self) -> u16 {
u16::from_be(self.0)
}
pub fn set(&mut self, value: u16) {
self.0 = value.to_be();
}
}
#[derive(Copy, Clone)]
pub struct Ipv4Addr {
pub bytes: [u8; 4],
}
impl Ipv4Addr {
pub fn equals(&self, other: Self) -> bool {
for i in 0..4 {
if self.bytes[i] != other.bytes[i] {
return false;
}
}
true
}
pub fn from_str(string: &str) -> Self {
let mut addr = Ipv4Addr { bytes: [0, 0, 0, 0] };
let mut i = 0;
for part in string.split('.') {
let octet = part.parse::<u8>().unwrap_or(0);
match i {
0 => addr.bytes[0] = octet,
1 => addr.bytes[1] = octet,
2 => addr.bytes[2] = octet,
3 => addr.bytes[3] = octet,
_ => break,
}
i += 1;
}
addr
}
pub fn to_string(&self) -> String {
let mut string = String::new();
for i in 0..4 {
if i > 0 {
string = string + ".";
}
string = string + &format!("{}", self.bytes[i]);
}
string
}
}
#[derive(Copy, Clone)]
pub struct Checksum {
pub data: u16,
}
impl Checksum {
pub unsafe fn check(&self, mut ptr: usize, mut len: usize) -> bool {
let mut sum: usize = 0;
while len > 1 {
sum += *(ptr as *const u16) as usize;
len -= 2;
ptr += 2;
}
if len > 0 {
sum += *(ptr as *const u8) as usize;
}
while (sum >> 16) > 0 {
sum = (sum & 0xFFFF) + (sum >> 16);
}
sum == 0xFFFF
}
pub unsafe fn calculate(&mut self, ptr: usize, len: usize) {
self.data = 0;
let sum = Checksum::sum(ptr, len);
self.data = Checksum::compile(sum);
}
pub unsafe fn sum(mut ptr: usize, mut len: usize) -> usize {
let mut sum = 0;
while len > 1 {
sum += *(ptr as *const u16) as usize;
len -= 2;
ptr += 2;
}
if len > 0 {
sum += *(ptr as *const u8) as usize;
}
sum
}
pub fn compile(mut sum: usize) -> u16 {
while (sum >> 16) > 0 {
sum = (sum & 0xFFFF) + (sum >> 16);
}
0xFFFF - (sum as u16)
}
}
#[derive(Copy, Clone)]
#[repr(packed)]
pub struct UdpHeader {
pub src: n16,
pub dst: n16,
pub len: n16,
pub checksum: Checksum,
}
pub struct Udp {
pub header: UdpHeader,
pub data: Vec<u8>,
}
impl Udp {
pub fn from_bytes(bytes: &[u8]) -> Option<Self> {
if bytes.len() >= mem::size_of::<UdpHeader>() {
unsafe {
Option::Some(Udp {
header: *(bytes.as_ptr() as *const UdpHeader),
data: bytes[mem::size_of::<UdpHeader>()..bytes.len()].to_vec(),
})
}
} else {
Option::None
}
}
pub fn to_bytes(&self) -> Vec<u8> {
unsafe {
let header_ptr: *const UdpHeader = &self.header;
let mut ret = Vec::from(slice::from_raw_parts(header_ptr as *const u8,
mem::size_of::<UdpHeader>()));
ret.extend_from_slice(&self.data);
ret
}
}
}

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

@ -1,5 +1,6 @@
#![feature(rand)]
extern crate netutils;
extern crate resource_scheme;
extern crate syscall;
@ -12,9 +13,8 @@ use syscall::Packet;
use scheme::UdpScheme;
pub mod common;
pub mod resource;
pub mod scheme;
mod resource;
mod scheme;
fn main() {
thread::spawn(move || {

7
schemes/udpd/src/resource.rs
View file

@ -1,15 +1,15 @@
use std::{cmp, mem};
use netutils::{n16, Ipv4Addr, Checksum, Udp, UdpHeader};
use resource_scheme::Resource;
use syscall;
use syscall::error::*;
use common::{n16, Ipv4Addr, Checksum, IP_ADDR, Udp, UdpHeader};
/// UDP resource
pub struct UdpResource {
pub ip: usize,
pub data: Vec<u8>,
pub host_addr: Ipv4Addr,
pub peer_addr: Ipv4Addr,
pub peer_port: u16,
pub host_port: u16,
@ -22,6 +22,7 @@ impl Resource for UdpResource {
Ok(Box::new(UdpResource {
ip: ip,
data: self.data.clone(),
host_addr: self.host_addr,
peer_addr: self.peer_addr,
peer_port: self.peer_port,
host_port: self.host_port,
@ -92,7 +93,7 @@ impl Resource for UdpResource {
let proto = n16::new(0x11);
let datagram_len = n16::new((mem::size_of::<UdpHeader>() + udp.data.len()) as u16);
udp.header.checksum.data =
Checksum::compile(Checksum::sum((&IP_ADDR as *const Ipv4Addr) as usize,
Checksum::compile(Checksum::sum((&self.host_addr as *const Ipv4Addr) as usize,
mem::size_of::<Ipv4Addr>()) +
Checksum::sum((&self.peer_addr as *const Ipv4Addr) as usize,
mem::size_of::<Ipv4Addr>()) +

6
schemes/udpd/src/scheme.rs
View file

@ -1,12 +1,12 @@
use std::rand;
use std::{str, u16};
use netutils::{getcfg, Ipv4Addr, Udp};
use resource_scheme::ResourceScheme;
use syscall;
use syscall::error::{Error, Result, ENOENT, EINVAL};
use syscall::flag::O_RDWR;
use common::{Ipv4Addr, Udp};
use resource::UdpResource;
/// UDP UdpScheme
@ -14,6 +14,8 @@ pub struct UdpScheme;
impl ResourceScheme<UdpResource> for UdpScheme {
fn open_resource(&self, url: &[u8], _flags: usize, _uid: u32, _gid: u32) -> Result<Box<UdpResource>> {
let ip_addr = Ipv4Addr::from_str(&getcfg("ip").map_err(|err| err.into_sys())?);
let path = try!(str::from_utf8(url).or(Err(Error::new(EINVAL))));
let mut parts = path.split('/');
let remote = parts.next().unwrap_or("");
@ -36,6 +38,7 @@ impl ResourceScheme<UdpResource> for UdpScheme {
return Ok(Box::new(UdpResource {
ip: ip,
data: datagram.data,
host_addr: ip_addr,
peer_addr: Ipv4Addr::from_str(peer_addr),
peer_port: datagram.header.src.get(),
host_port: host_port,
@ -56,6 +59,7 @@ impl ResourceScheme<UdpResource> for UdpScheme {
return Ok(Box::new(UdpResource {
ip: ip,
data: Vec::new(),
host_addr: ip_addr,
peer_addr: Ipv4Addr::from_str(peer_addr),
peer_port: peer_port as u16,
host_port: host_port,