Skip to content
Snippets Groups Projects
Commit e4c85478 authored by James Munns's avatar James Munns
Browse files

Run rust format. No functional change.

parent 45773bd2
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/client.rs
+ 159
− 155
View file @ e4c85478
......@@ -20,25 +20,27 @@ impl CoAPClient {
match iter.next() {
Some(SocketAddr::V4(a)) => {
UdpSocket::bind("0.0.0.0:0").and_then(|s| {
s.set_read_timeout(Some(Duration::new(DEFAULT_RECEIVE_TIMEOUT, 0))).and_then(|_| {
s.set_read_timeout(Some(Duration::new(DEFAULT_RECEIVE_TIMEOUT, 0)))
.and_then(|_| {
Ok(CoAPClient {
socket: s,
peer_addr: SocketAddr::V4(a),
})
})
})
},
}
Some(SocketAddr::V6(a)) => {
UdpSocket::bind(":::0").and_then(|s| {
s.set_read_timeout(Some(Duration::new(DEFAULT_RECEIVE_TIMEOUT, 0))).and_then(|_| {
s.set_read_timeout(Some(Duration::new(DEFAULT_RECEIVE_TIMEOUT, 0)))
.and_then(|_| {
Ok(CoAPClient {
socket: s,
peer_addr: SocketAddr::V6(a),
})
})
})
},
None => Err(Error::new(ErrorKind::Other, "no address"))
}
None => Err(Error::new(ErrorKind::Other, "no address")),
}
})
}
......@@ -58,7 +60,7 @@ impl CoAPClient {
let message_id = thread_rng().gen_range(0, num::pow(2u32, 16)) as u16;
packet.header.set_message_id(message_id);
let mut token: Vec<u8> = vec!(1, 1, 1, 1);
let mut token: Vec<u8> = vec![1, 1, 1, 1];
for x in token.iter_mut() {
*x = random()
}
......@@ -66,7 +68,7 @@ impl CoAPClient {
let domain = match url_params.domain() {
Some(d) => d,
None => return Err(Error::new(ErrorKind::InvalidInput, "domain error"))
None => return Err(Error::new(ErrorKind::InvalidInput, "domain error")),
};
let port = url_params.port_or_default().unwrap();
......@@ -82,17 +84,17 @@ impl CoAPClient {
try!(client.set_receive_timeout(timeout));
match client.receive() {
Ok(receive_packet) => {
if receive_packet.header.get_message_id() == message_id
&& *receive_packet.get_token() == token {
return Ok(receive_packet)
if receive_packet.header.get_message_id() == message_id &&
*receive_packet.get_token() == token {
return Ok(receive_packet);
} else {
return Err(Error::new(ErrorKind::Other, "receive invalid data"))
return Err(Error::new(ErrorKind::Other, "receive invalid data"));
}
}
},
Err(e) => Err(e)
Err(e) => Err(e),
}
},
Err(_) => Err(Error::new(ErrorKind::InvalidInput, "url error"))
}
Err(_) => Err(Error::new(ErrorKind::InvalidInput, "url error")),
}
}
......@@ -111,8 +113,8 @@ impl CoAPClient {
} else {
Err(Error::new(ErrorKind::Other, "send length error"))
}
},
Err(_) => Err(Error::new(ErrorKind::InvalidInput, "packet error"))
}
Err(_) => Err(Error::new(ErrorKind::InvalidInput, "packet error")),
}
}
......@@ -123,7 +125,7 @@ impl CoAPClient {
let (nread, _src) = try!(self.socket.recv_from(&mut buf));
match Packet::from_bytes(&buf[..nread]) {
Ok(packet) => Ok(packet),
Err(_) => Err(Error::new(ErrorKind::InvalidInput, "packet error"))
Err(_) => Err(Error::new(ErrorKind::InvalidInput, "packet error")),
}
}
......@@ -165,7 +167,9 @@ mod test {
let mut server = CoAPServer::new("127.0.0.1:5684").unwrap();
server.handle(request_handler).unwrap();
let error = CoAPClient::request_with_timeout("coap://127.0.0.1:5684/Rust", Some(Duration::new(1, 0))).unwrap_err();
let error = CoAPClient::request_with_timeout("coap://127.0.0.1:5684/Rust",
Some(Duration::new(1, 0)))
.unwrap_err();
if cfg!(windows) {
assert_eq!(error.kind(), ErrorKind::TimedOut);
} else {
......
src/lib.rs
+ 4
− 2
View file @ e4c85478
//! Implementation of the [CoAP Protocol][spec].
//!
//! This library provides both a client interface (`CoAPClient`) and a server interface (`CoAPServer`).
//! This library provides both a client interface (`CoAPClient`)
//! and a server interface (`CoAPServer`).
//!
//! [spec]: https://tools.ietf.org/html/rfc7252
//!
......@@ -72,7 +73,8 @@ extern crate threadpool;
extern crate url;
extern crate num;
extern crate rand;
#[cfg(test)] extern crate quickcheck;
#[cfg(test)]
extern crate quickcheck;
#[macro_use]
extern crate log;
......
src/packet.rs
+ 672
− 647
View file @ e4c85478
......@@ -21,14 +21,14 @@ pub enum PacketType {
pub struct PacketHeaderRaw {
ver_type_tkl: u8,
code: u8,
message_id: u16
message_id: u16,
}
#[derive(Debug)]
pub struct PacketHeader {
ver_type_tkl: u8,
pub code: PacketClass,
message_id: u16
message_id: u16,
}
#[derive(Debug, PartialEq)]
......@@ -36,7 +36,7 @@ pub enum PacketClass {
Empty,
Request(Requests),
Response(Responses),
Reserved
Reserved,
}
#[derive(Debug, PartialEq)]
......@@ -44,7 +44,7 @@ pub enum Requests {
Get,
Post,
Put,
Delete
Delete,
}
#[derive(Debug, PartialEq)]
......@@ -74,7 +74,7 @@ pub enum Responses {
BadGateway,
ServiceUnavailable,
GatewayTimeout,
ProxyingNotSupported
ProxyingNotSupported,
}
pub fn class_to_code(class: &PacketClass) -> u8 {
......@@ -111,7 +111,7 @@ pub fn class_to_code(class: &PacketClass) -> u8 {
PacketClass::Response(Responses::ProxyingNotSupported) => 0x95,
_ => 0xFF,
} as u8
} as u8;
}
pub fn code_to_class(code: &u8) -> PacketClass {
......@@ -163,7 +163,6 @@ pub fn class_to_str(class: &PacketClass) -> String {
}
impl PacketHeader {
pub fn new() -> PacketHeader {
return PacketHeader::from_raw(&PacketHeaderRaw::default());
}
......@@ -173,7 +172,7 @@ impl PacketHeader {
ver_type_tkl: raw.ver_type_tkl,
code: code_to_class(&raw.code),
message_id: raw.message_id,
}
};
}
pub fn to_raw(&self) -> PacketHeaderRaw {
......@@ -181,7 +180,7 @@ impl PacketHeader {
ver_type_tkl: self.ver_type_tkl,
code: class_to_code(&self.code),
message_id: self.message_id,
}
};
}
#[inline]
......@@ -294,7 +293,7 @@ pub enum OptionType {
Block1,
ProxyUri,
ProxyScheme,
Size1
Size1,
}
#[derive(Debug)]
......@@ -339,7 +338,7 @@ impl Packet {
Some(list) => {
list.push_back(value);
return;
},
}
None => (),
};
......@@ -352,7 +351,7 @@ impl Packet {
let num = Self::get_option_number(tp);
match self.options.get(&num) {
Some(options) => Some(options.clone()),
None => None
None => None,
}
}
......@@ -398,15 +397,16 @@ impl Packet {
}
delta = buf[idx] as usize + 13;
idx += 1;
},
}
14 => {
if idx + 1 >= buf.len() {
return Err(ParseError::InvalidOptionLength);
}
delta = (u16::from_be(u8_to_unsigned_be!(buf, idx, idx + 1, u16)) + 269) as usize;
delta = (u16::from_be(u8_to_unsigned_be!(buf, idx, idx + 1, u16)) +
269) as usize;
idx += 2;
},
}
15 => {
return Err(ParseError::InvalidOptionDelta);
}
......@@ -422,18 +422,19 @@ impl Packet {
length = buf[idx] as usize + 13;
idx += 1;
},
}
14 => {
if idx + 1 >= buf.len() {
return Err(ParseError::InvalidOptionLength);
}
length = (u16::from_be(u8_to_unsigned_be!(buf, idx, idx + 1, u16)) + 269) as usize;
length = (u16::from_be(u8_to_unsigned_be!(buf, idx, idx + 1, u16)) +
269) as usize;
idx += 2;
},
}
15 => {
return Err(ParseError::InvalidOptionLength);
},
}
_ => {}
};
......@@ -469,7 +470,7 @@ impl Packet {
options: options,
payload: payload,
})
},
}
Err(_) => Err(ParseError::InvalidHeader),
}
}
......@@ -522,8 +523,12 @@ impl Packet {
unsafe {
use std::ptr;
let buf_len = options_bytes.len();
ptr::copy(header.as_ptr(), options_bytes.as_mut_ptr().offset(buf_len as isize), header.len());
ptr::copy(value.as_ptr(), options_bytes.as_mut_ptr().offset((buf_len + header.len()) as isize), value.len());
ptr::copy(header.as_ptr(),
options_bytes.as_mut_ptr().offset(buf_len as isize),
header.len());
ptr::copy(value.as_ptr(),
options_bytes.as_mut_ptr().offset((buf_len + header.len()) as isize),
value.len());
options_bytes.set_len(buf_len + header.len() + value.len());
}
}
......@@ -540,15 +545,22 @@ impl Packet {
}
let mut buf: Vec<u8> = Vec::with_capacity(buf_length);
let header_result: bincode::EncodingResult<()> = bincode::encode_into(&self.header.to_raw(), &mut buf, bincode::SizeLimit::Infinite);
let header_result: bincode::EncodingResult<()> =
bincode::encode_into(&self.header.to_raw(),
&mut buf,
bincode::SizeLimit::Infinite);
match header_result {
Ok(_) => {
buf.reserve(self.token.len() + options_bytes.len());
unsafe {
use std::ptr;
let buf_len = buf.len();
ptr::copy(self.token.as_ptr(), buf.as_mut_ptr().offset(buf_len as isize), self.token.len());
ptr::copy(options_bytes.as_ptr(), buf.as_mut_ptr().offset((buf_len + self.token.len()) as isize), options_bytes.len());
ptr::copy(self.token.as_ptr(),
buf.as_mut_ptr().offset(buf_len as isize),
self.token.len());
ptr::copy(options_bytes.as_ptr(),
buf.as_mut_ptr().offset((buf_len + self.token.len()) as isize),
options_bytes.len());
buf.set_len(buf_len + self.token.len() + options_bytes.len());
}
......@@ -558,12 +570,14 @@ impl Packet {
unsafe {
use std::ptr;
let buf_len = buf.len();
ptr::copy(self.payload.as_ptr(), buf.as_mut_ptr().offset(buf.len() as isize), self.payload.len());
ptr::copy(self.payload.as_ptr(),
buf.as_mut_ptr().offset(buf.len() as isize),
self.payload.len());
buf.set_len(buf_len + self.payload.len());
}
}
Ok(buf)
},
}
Err(_) => Err(PackageError::InvalidHeader),
}
}
......@@ -600,7 +614,7 @@ pub fn auto_response(request_packet: &Packet) -> Option<Packet> {
let response_type = match request_packet.header.get_type() {
PacketType::Confirmable => PacketType::Acknowledgement,
PacketType::NonConfirmable => PacketType::NonConfirmable,
_ => return None
_ => return None,
};
packet.header.set_type(response_type);
packet.header.code = PacketClass::Response(Responses::Content);
......@@ -635,7 +649,8 @@ mod test {
#[test]
fn test_decode_packet_with_options() {
let buf = [0x44, 0x01, 0x84, 0x9e, 0x51, 0x55, 0x77, 0xe8, 0xb2, 0x48, 0x69, 0x04, 0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x3d, 0x31];
let buf = [0x44, 0x01, 0x84, 0x9e, 0x51, 0x55, 0x77, 0xe8, 0xb2, 0x48, 0x69, 0x04, 0x54,
0x65, 0x73, 0x74, 0x43, 0x61, 0x3d, 0x31];
let packet = Packet::from_bytes(&buf);
assert!(packet.is_ok());
let packet = packet.unwrap();
......@@ -644,7 +659,7 @@ mod test {
assert_eq!(packet.header.get_token_length(), 4);
assert_eq!(packet.header.code, PacketClass::Request(Requests::Get));
assert_eq!(packet.header.get_message_id(), 33950);
assert_eq!(*packet.get_token(), vec!(0x51, 0x55, 0x77, 0xE8));
assert_eq!(*packet.get_token(), vec![0x51, 0x55, 0x77, 0xE8]);
assert_eq!(packet.options.len(), 2);
let uri_path = packet.get_option(OptionType::UriPath);
......@@ -665,16 +680,18 @@ mod test {
#[test]
fn test_decode_packet_with_payload() {
let buf = [0x64, 0x45, 0x13, 0xFD, 0xD0, 0xE2, 0x4D, 0xAC, 0xFF, 0x48, 0x65, 0x6C, 0x6C, 0x6F];
let buf = [0x64, 0x45, 0x13, 0xFD, 0xD0, 0xE2, 0x4D, 0xAC, 0xFF, 0x48, 0x65, 0x6C, 0x6C,
0x6F];
let packet = Packet::from_bytes(&buf);
assert!(packet.is_ok());
let packet = packet.unwrap();
assert_eq!(packet.header.get_version(), 1);
assert_eq!(packet.header.get_type(), PacketType::Acknowledgement);
assert_eq!(packet.header.get_token_length(), 4);
assert_eq!(packet.header.code, PacketClass::Response(Responses::Content));
assert_eq!(packet.header.code,
PacketClass::Response(Responses::Content));
assert_eq!(packet.header.get_message_id(), 5117);
assert_eq!(*packet.get_token(), vec!(0xD0, 0xE2, 0x4D, 0xAC));
assert_eq!(*packet.get_token(), vec![0xD0, 0xE2, 0x4D, 0xAC]);
assert_eq!(packet.payload, "Hello".as_bytes().to_vec());
}
......@@ -685,11 +702,13 @@ mod test {
packet.header.set_type(PacketType::Confirmable);
packet.header.code = PacketClass::Request(Requests::Get);
packet.header.set_message_id(33950);
packet.set_token(vec!(0x51, 0x55, 0x77, 0xE8));
packet.set_token(vec![0x51, 0x55, 0x77, 0xE8]);
packet.add_option(OptionType::UriPath, b"Hi".to_vec());
packet.add_option(OptionType::UriPath, b"Test".to_vec());
packet.add_option(OptionType::UriQuery, b"a=1".to_vec());
assert_eq!(packet.to_bytes().unwrap(), vec!(0x44, 0x01, 0x84, 0x9e, 0x51, 0x55, 0x77, 0xe8, 0xb2, 0x48, 0x69, 0x04, 0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x3d, 0x31));
assert_eq!(packet.to_bytes().unwrap(),
vec![0x44, 0x01, 0x84, 0x9e, 0x51, 0x55, 0x77, 0xe8, 0xb2, 0x48, 0x69, 0x04,
0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x3d, 0x31]);
}
#[test]
......@@ -699,9 +718,11 @@ mod test {
packet.header.set_type(PacketType::Acknowledgement);
packet.header.code = PacketClass::Response(Responses::Content);
packet.header.set_message_id(5117);
packet.set_token(vec!(0xD0, 0xE2, 0x4D, 0xAC));
packet.set_token(vec![0xD0, 0xE2, 0x4D, 0xAC]);
packet.payload = "Hello".as_bytes().to_vec();
assert_eq!(packet.to_bytes().unwrap(), vec!(0x64, 0x45, 0x13, 0xFD, 0xD0, 0xE2, 0x4D, 0xAC, 0xFF, 0x48, 0x65, 0x6C, 0x6C, 0x6F));
assert_eq!(packet.to_bytes().unwrap(),
vec![0x64, 0x45, 0x13, 0xFD, 0xD0, 0xE2, 0x4D, 0xAC, 0xFF, 0x48, 0x65, 0x6C,
0x6C, 0x6F]);
}
#[test]
......@@ -712,11 +733,15 @@ mod test {
fn run(x: Vec<u8>) -> TestResult {
match Packet::from_bytes(&x[..]) {
Ok(packet) => {
TestResult::from_bool(packet.get_token().len() == packet.header.get_token_length() as usize)
},
Err(_) => TestResult::passed()
TestResult::from_bool(packet.get_token().len() ==
packet.header.get_token_length() as usize)
}
Err(_) => TestResult::passed(),
}
}
QuickCheck::new().tests(10000).gen(StdGen::new(rand::thread_rng(), 1500)).quickcheck(run as fn(Vec<u8>) -> TestResult)
QuickCheck::new()
.tests(10000)
.gen(StdGen::new(rand::thread_rng(), 1500))
.quickcheck(run as fn(Vec<u8>) -> TestResult)
}
}
src/server.rs
+ 256
− 248
View file @ e4c85478
......@@ -22,14 +22,17 @@ pub enum CoAPServerError {
#[derive(Debug)]
pub struct CoAPResponse {
pub address: SocketAddr,
pub response: Packet
pub response: Packet,
}
pub trait CoAPHandler: Sync + Send + Copy {
fn handle(&self, Packet, Option<Packet>) -> Option<Packet>;
}
impl<F> CoAPHandler for F where F: Fn(Packet, Option<Packet>) -> Option<Packet>, F: Sync + Send + Copy {
impl<F> CoAPHandler for F
where F: Fn(Packet, Option<Packet>) -> Option<Packet>,
F: Sync + Send + Copy
{
fn handle(&self, request: Packet, response: Option<Packet>) -> Option<Packet> {
return self(request, response);
}
......@@ -39,16 +42,20 @@ struct UdpHandler<H: CoAPHandler + 'static> {
socket: UdpSocket,
thread_pool: ThreadPool,
tx_sender: TxQueue,
coap_handler: H
coap_handler: H,
}
impl<H: CoAPHandler + 'static> UdpHandler<H> {
fn new(socket: UdpSocket, thread_pool: ThreadPool, tx_sender: TxQueue, coap_handler: H) -> UdpHandler<H> {
fn new(socket: UdpSocket,
thread_pool: ThreadPool,
tx_sender: TxQueue,
coap_handler: H)
-> UdpHandler<H> {
UdpHandler {
socket: socket,
thread_pool: thread_pool,
tx_sender: tx_sender,
coap_handler: coap_handler
coap_handler: coap_handler,
}
}
}
......@@ -82,25 +89,26 @@ impl<H: CoAPHandler + 'static> Handler for UdpHandler<H> {
debug!("Response: {:?}", response);
response_q.send(CoAPResponse {
address: src,
response: response
}).unwrap();
},
response: response,
})
.unwrap();
}
None => {
debug!("No response");
}
};
},
}
Err(_) => {
error!("Failed to parse request");
return;
}
};
});
},
}
_ => {
error!("Failed to read from socket");
panic!("unexpected error");
},
}
}
}
......@@ -125,15 +133,17 @@ impl CoAPServer {
addr.to_socket_addrs().and_then(|mut iter| {
match iter.next() {
Some(ad) => {
UdpSocket::bound(&ad).and_then(|s| Ok(CoAPServer {
UdpSocket::bound(&ad).and_then(|s| {
Ok(CoAPServer {
socket: s,
event_sender: None,
event_thread: None,
tx_thread: None,
worker_num: DEFAULT_WORKER_NUM,
}))
},
None => Err(Error::new(ErrorKind::Other, "no address"))
})
})
}
None => Err(Error::new(ErrorKind::Other, "no address")),
}
})
}
......@@ -148,13 +158,11 @@ impl CoAPServer {
return Err(CoAPServerError::AnotherHandlerIsRunning);
}
match self.socket.try_clone() {
Ok(good_socket) => {
socket = good_socket
},
Ok(good_socket) => socket = good_socket,
Err(_) => {
error!("Network Error!");
return Err(CoAPServerError::NetworkError);
},
}
}
// Create resources
......@@ -187,8 +195,8 @@ impl CoAPServer {
self.event_thread = Some(thread);
self.tx_thread = Some(tx_thread);
Ok(())
},
Err(_) => Err(CoAPServerError::EventLoopError)
}
Err(_) => Err(CoAPServerError::EventLoopError),
}
}
......@@ -199,8 +207,8 @@ impl CoAPServer {
Some(ref sender) => {
sender.send(()).unwrap();
self.event_thread.take().map(|g| g.join());
},
_ => {},
}
_ => {}
}
}
......@@ -219,12 +227,12 @@ fn transmit_handler(tx_recv: RxQueue, tx_only: UdpSocket) {
match q_res.response.to_bytes() {
Ok(bytes) => {
let _ = tx_only.send_to(&bytes[..], &q_res.address);
},
}
Err(_) => {
error!("Failed to decode response");
}
}
},
}
// recv error occurs when all transmitters are terminited
// (when all UDP Handlers are closed)
Err(_) => {
......@@ -256,8 +264,8 @@ mod test {
Some(mut packet) => {
packet.set_payload(uri_path_list.front().unwrap().clone());
Some(packet)
},
_ => None
}
_ => None,
}
}
......@@ -272,7 +280,7 @@ mod test {
packet.header.set_type(PacketType::Confirmable);
packet.header.set_code("0.01");
packet.header.set_message_id(1);
packet.set_token(vec!(0x51, 0x55, 0x77, 0xE8));
packet.set_token(vec![0x51, 0x55, 0x77, 0xE8]);
packet.add_option(OptionType::UriPath, b"test-echo".to_vec());
client.send(&packet).unwrap();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment