smoltcp-rs · Jul 30, 2017 · Jul 30, 2017
Showing with 21 additions and 12 deletions.

+2 −1 README.md

+1 −1 examples/server.rs

+1 −1 src/phy/mod.rs

+1 −1 src/phy/pcap_writer.rs

+1 −1 src/phy/raw_socket.rs

+1 −1 src/phy/tracer.rs

+1 −1 src/socket/mod.rs

+3 −2 src/socket/tcp.rs

+10 −3 src/socket/udp.rs
diff --git a/README.md b/README.md
@@ -208,7 +208,8 @@ It responds to:
   * TCP packets on port 6971 (`cat /dev/urandom | socat stdio tcp4-connect:192.168.69.1:6971`),
     which will be ignored.
 
-The buffers are only 64 bytes long, for convenience of testing resource exhaustion conditions.
+Except for the socket on port 6971. the buffers are only 64 bytes long, for convenience
+of testing resource exhaustion conditions.
 
 ### examples/client.rs
 

diff --git a/examples/server.rs b/examples/server.rs
@@ -63,7 +63,7 @@ fn main() {
         // udp:6969: respond "yo dawg"
         {
             let socket: &mut UdpSocket = sockets.get_mut(udp_handle).as_socket();
-            if !socket.endpoint().is_specified() {
+            if !socket.is_open() {
                 socket.bind(6969).unwrap()
             }
 

diff --git a/src/phy/mod.rs b/src/phy/mod.rs
@@ -104,7 +104,7 @@ impl Drop for EthernetTxBuffer {
 ```
 */
 
-use {Error, Result};
+use Result;
 
 #[cfg(any(feature = "raw_socket", feature = "tap_interface"))]
 mod sys;

diff --git a/src/phy/pcap_writer.rs b/src/phy/pcap_writer.rs
@@ -3,7 +3,7 @@ use core::cell::RefCell;
 use std::io::Write;
 use byteorder::{ByteOrder, NativeEndian};
 
-use {Error, Result};
+use Result;
 use super::{DeviceLimits, Device};
 
 enum_with_unknown! {

diff --git a/src/phy/raw_socket.rs b/src/phy/raw_socket.rs
@@ -3,7 +3,7 @@ use std::vec::Vec;
 use std::rc::Rc;
 use std::io;
 
-use {Error, Result};
+use Result;
 use super::{sys, DeviceLimits, Device};
 
 /// A socket that captures or transmits the complete frame.

diff --git a/src/phy/tracer.rs b/src/phy/tracer.rs
@@ -1,4 +1,4 @@
-use {Error, Result};
+use Result;
 use wire::pretty_print::{PrettyPrint, PrettyPrinter};
 use super::{DeviceLimits, Device};
 

diff --git a/src/socket/mod.rs b/src/socket/mod.rs
@@ -10,7 +10,7 @@
 //! The interface implemented by this module uses explicit buffering: you decide on the good
 //! size for a buffer, allocate it, and let the networking stack use it.
 
-use {Error, Result};
+use Result;
 use phy::DeviceLimits;
 use wire::IpRepr;
 

diff --git a/src/socket/tcp.rs b/src/socket/tcp.rs
@@ -348,8 +348,9 @@ impl<'a> TcpSocket<'a> {
 
     /// Start listening on the given endpoint.
     ///
-    /// This function returns an error if the socket was open; see [is_open](#method.is_open).
-    /// It also returns an error if the specified port is zero.
+    /// This function returns `Err(Error::Illegal)` if the socket was already open
+    /// (see [is_open](#method.is_open)), and `Err(Error::Unaddressable)`
+    /// if the port in the given endpoint is zero.
     pub fn listen<T>(&mut self, local_endpoint: T) -> Result<()>
             where T: Into<IpEndpoint> {
         let local_endpoint = local_endpoint.into();

diff --git a/src/socket/udp.rs b/src/socket/udp.rs
@@ -101,18 +101,25 @@ impl<'a, 'b> UdpSocket<'a, 'b> {
 
     /// Bind the socket to the given endpoint.
     ///
-    /// Returns `Err(Error::Illegal)` if the socket is already bound,
-    /// and `Err(Error::Unaddressable)` if the port is unspecified.
+    /// This function returns `Err(Error::Illegal)` if the socket was open
+    /// (see [is_open](#method.is_open)), and `Err(Error::Unaddressable)`
+    /// if the port in the given endpoint is zero.
     pub fn bind<T: Into<IpEndpoint>>(&mut self, endpoint: T) -> Result<()> {
         let endpoint = endpoint.into();
         if endpoint.port == 0 { return Err(Error::Unaddressable) }
 
-        if self.endpoint.port != 0 { return Err(Error::Illegal) }
+        if self.is_open() { return Err(Error::Illegal) }
 
         self.endpoint = endpoint;
         Ok(())
     }
 
+    /// Check whether the socket is open.
+    #[inline]
+    pub fn is_open(&self) -> bool {
+        self.endpoint.port != 0
+    }
+
     /// Check whether the transmit buffer is full.
     #[inline]
     pub fn can_send(&self) -> bool {