renet
/
renet
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix examples.

v0.7.x
whitequark 2016-12-27 18:04:02 +00:00
parent a8fc4fd832
commit bbff907e87
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -105,9 +105,11 @@ cargo run --example smoltcpserver -- tap0
It responds to:
* pings (`ping 192.168.69.1`),
* pings (`ping 192.168.69.1`);
* UDP packets on port 6969 (`socat stdio udp4-connect:192.168.69.1:6969 <<<"abcdefg"`),
where it will respond "yo dawg" to any incoming packet;
* TCP packets on port 6969 (`socat stdio tcp4-connect:192.168.69.1:6969 <<<"abcdefg"`),
where it will respond with reversed chunks of the input indefinitely.
The buffers are only 64 bytes long, for convenience of testing resource exhaustion conditions.

32
examples/smoltcpserver.rs
View File

@ -57,7 +57,7 @@ fn main() {
let tcp_rx_buffer = TcpSocketBuffer::new(vec![0; 64]);
let tcp_tx_buffer = TcpSocketBuffer::new(vec![0; 128]);
let mut tcp_socket = TcpSocket::new(tcp_rx_buffer, tcp_tx_buffer);
(tcp_socket.as_socket() : &mut TcpSocket).listen(endpoint);
(tcp_socket.as_socket() : &mut TcpSocket).listen(endpoint).unwrap();
let hardware_addr = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x01]);
let protocol_addrs = [IpAddress::v4(192, 168, 69, 1)];
@ -97,21 +97,23 @@ fn main() {
{
let socket: &mut TcpSocket = iface.sockets()[1].as_socket();
let data = {
let mut data = socket.recv(128).to_owned();
if data.len() > 0 {
debug!("tcp recv data: {:?}",
str::from_utf8(data.as_ref()).unwrap());
data = data.split(|&b| b == b'\n').next().unwrap().to_owned();
data.reverse();
data.extend(b"\n");
if socket.can_recv() {
let data = {
let mut data = socket.recv(128).unwrap().to_owned();
if data.len() > 0 {
debug!("tcp recv data: {:?}",
str::from_utf8(data.as_ref()).unwrap_or("(invalid utf8)"));
data = data.split(|&b| b == b'\n').collect::<Vec<_>>().concat();
data.reverse();
data.extend(b"\n");
}
data
};
if socket.can_send() && data.len() > 0 {
debug!("tcp send data: {:?}",
str::from_utf8(data.as_ref()).unwrap_or("(invalid utf8)"));
socket.send_slice(&data[..]).unwrap();
}
data
};
if data.len() > 0 {
debug!("tcp send data: {:?}",
str::from_utf8(data.as_ref()).unwrap());
socket.send_slice(&data[..]);
}
}
}

2
src/socket/tcp.rs
View File

@ -1112,7 +1112,7 @@ mod test {
#[test]
fn test_listen() {
let mut s = socket();
s.listen(IpEndpoint::new(IpAddress::default(), LOCAL_PORT));
s.listen(IpEndpoint::new(IpAddress::default(), LOCAL_PORT)).unwrap();
assert_eq!(s.state, State::Listen);
}