Raw socket support

mk/crates.mk

@@ -37,7 +37,7 @@
 #
 #   DEPS_<crate>
 #	These lists are the dependencies of the <crate> that is to be built.
-#	Rust dependencies are listed bare (i.e. std, green) and native
+#	Rust dependencies are listed bare (i.e. std, extra, green) and native
 #	dependencies have a "native:" prefix (i.e. native:sundown). All deps
 #	will be built before the crate itself is built.
 #
@@ -51,15 +51,15 @@
 
 TARGET_CRATES := std green rustuv native flate arena glob term semver \
                  uuid serialize sync getopts collections num test time rand \
-		 workcache url log
+		 workcache url log netsupport
 HOST_CRATES := syntax rustc rustdoc fourcc hexfloat
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
 
 DEPS_std := native:rustrt native:compiler-rt native:backtrace
 DEPS_green := std rand native:context_switch
-DEPS_rustuv := std native:uv native:uv_support
-DEPS_native := std
+DEPS_rustuv := std native:uv native:uv_support netsupport
+DEPS_native := std netsupport
 DEPS_syntax := std term serialize collections log
 DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
               collections time log
@@ -84,6 +84,7 @@ DEPS_rand := std
 DEPS_url := std collections
 DEPS_workcache := std serialize collections log
 DEPS_log := std sync
+DEPS_netsupport := std
 
 TOOL_DEPS_compiletest := test green rustuv getopts
 TOOL_DEPS_rustdoc := rustdoc native

src/libnative/io/addrinfo.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+extern crate netsupport;
+
 use ai = std::io::net::addrinfo;
 use std::c_str::CString;
 use std::cast;
@@ -96,10 +98,8 @@ extern "system" {
 
 #[cfg(windows)]
 fn get_error(_: c_int) -> IoError {
-    use super::translate_error;
-
     unsafe {
-        translate_error(WSAGetLastError() as i32, true)
+        netsupport::translate_error(WSAGetLastError() as i32, true)
     }
 }
 

src/libnative/io/file_unix.rs

@@ -10,6 +10,8 @@
 
 //! Blocking posix-based file I/O
 
+extern crate netsupport;
+
 use std::sync::arc::UnsafeArc;
 use std::c_str::CString;
 use std::io::IoError;
@@ -62,7 +64,7 @@ impl FileDesc {
         if ret == 0 {
             Err(io::standard_error(io::EndOfFile))
         } else if ret < 0 {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(ret as uint)
         }
@@ -75,7 +77,7 @@ impl FileDesc {
             }
         });
         if ret < 0 {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(())
         }
@@ -113,7 +115,7 @@ impl rtio::RtioFileStream for FileDesc {
                         buf.len() as libc::size_t,
                         offset as libc::off_t) as libc::c_int
         }) {
-            -1 => Err(super::last_error()),
+            -1 => Err(netsupport::last_error()),
             n => Ok(n as int)
         }
     }
@@ -131,15 +133,15 @@ impl rtio::RtioFileStream for FileDesc {
         };
         let n = unsafe { libc::lseek(self.fd(), pos as libc::off_t, whence) };
         if n < 0 {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(n as u64)
         }
     }
     fn tell(&self) -> Result<u64, IoError> {
         let n = unsafe { libc::lseek(self.fd(), 0, libc::SEEK_CUR) };
         if n < 0 {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(n as u64)
         }
@@ -249,7 +251,7 @@ impl rtio::RtioFileStream for CFile {
         if ret == 0 {
             Err(io::standard_error(io::EndOfFile))
         } else if ret < 0 {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(ret as int)
         }
@@ -263,7 +265,7 @@ impl rtio::RtioFileStream for CFile {
             }
         });
         if ret < 0 {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(())
         }
@@ -283,15 +285,15 @@ impl rtio::RtioFileStream for CFile {
         };
         let n = unsafe { libc::fseek(self.file, pos as libc::c_long, whence) };
         if n < 0 {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(n as u64)
         }
     }
     fn tell(&self) -> Result<u64, IoError> {
         let ret = unsafe { libc::ftell(self.file) };
         if ret < 0 {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(ret as u64)
         }
@@ -330,7 +332,7 @@ pub fn open(path: &CString, fm: io::FileMode, fa: io::FileAccess)
     };
 
     match retry(|| unsafe { libc::open(path.with_ref(|p| p), flags, mode) }) {
-        -1 => Err(super::last_error()),
+        -1 => Err(netsupport::last_error()),
         fd => Ok(FileDesc::new(fd, true)),
     }
 }
@@ -378,7 +380,7 @@ pub fn readdir(p: &CString) -> IoResult<~[Path]> {
         assert_eq!(unsafe { closedir(dir_ptr) }, 0);
         Ok(prune(p, paths))
     } else {
-        Err(super::last_error())
+        Err(netsupport::last_error())
     }
 }
 
@@ -422,7 +424,7 @@ pub fn readlink(p: &CString) -> IoResult<Path> {
         libc::readlink(p, buf.as_ptr() as *mut libc::c_char,
                        len as libc::size_t) as libc::c_int
     }) {
-        -1 => Err(super::last_error()),
+        -1 => Err(netsupport::last_error()),
         n => {
             assert!(n > 0);
             unsafe { buf.set_len(n as uint); }
@@ -495,15 +497,15 @@ pub fn stat(p: &CString) -> IoResult<io::FileStat> {
     let mut stat: libc::stat = unsafe { mem::uninit() };
     match retry(|| unsafe { libc::stat(p.with_ref(|p| p), &mut stat) }) {
         0 => Ok(mkstat(&stat, p)),
-        _ => Err(super::last_error()),
+        _ => Err(netsupport::last_error()),
     }
 }
 
 pub fn lstat(p: &CString) -> IoResult<io::FileStat> {
     let mut stat: libc::stat = unsafe { mem::uninit() };
     match retry(|| unsafe { libc::lstat(p.with_ref(|p| p), &mut stat) }) {
         0 => Ok(mkstat(&stat, p)),
-        _ => Err(super::last_error()),
+        _ => Err(netsupport::last_error()),
     }
 }
 

src/libnative/io/file_win32.rs

@@ -10,6 +10,8 @@
 
 //! Blocking win32-based file I/O
 
+extern crate netsupport;
+
 use std::c_str::CString;
 use std::cast;
 use std::io::IoError;
@@ -63,7 +65,7 @@ impl FileDesc {
         if ret != 0 {
             Ok(read as uint)
         } else {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         }
     }
     pub fn inner_write(&mut self, buf: &[u8]) -> Result<(), IoError> {
@@ -80,7 +82,7 @@ impl FileDesc {
                 remaining -= amt as uint;
                 cur = unsafe { cur.offset(amt as int) };
             } else {
-                return Err(super::last_error())
+                return Err(netsupport::last_error())
             }
         }
         Ok(())
@@ -130,7 +132,7 @@ impl rtio::RtioFileStream for FileDesc {
         if ret != 0 {
             Ok(read as int)
         } else {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         }
     }
     fn pwrite(&mut self, buf: &[u8], mut offset: u64) -> Result<(), IoError> {
@@ -151,7 +153,7 @@ impl rtio::RtioFileStream for FileDesc {
                 cur = unsafe { cur.offset(amt as int) };
                 offset += amt as u64;
             } else {
-                return Err(super::last_error())
+                return Err(netsupport::last_error())
             }
         }
         Ok(())
@@ -166,7 +168,7 @@ impl rtio::RtioFileStream for FileDesc {
             let mut newpos = 0;
             match libc::SetFilePointerEx(self.handle(), pos, &mut newpos,
                                          whence) {
-                0 => Err(super::last_error()),
+                0 => Err(netsupport::last_error()),
                 _ => Ok(newpos as u64),
             }
         }
@@ -190,7 +192,7 @@ impl rtio::RtioFileStream for FileDesc {
         let _ = try!(self.seek(offset, io::SeekSet));
         let ret = unsafe {
             match libc::SetEndOfFile(self.handle()) {
-                0 => Err(super::last_error()),
+                0 => Err(netsupport::last_error()),
                 _ => Ok(())
             }
         };
@@ -300,14 +302,14 @@ pub fn open(path: &CString, fm: io::FileMode, fa: io::FileAccess)
                           ptr::mut_null())
     });
     if handle == libc::INVALID_HANDLE_VALUE as libc::HANDLE {
-        Err(super::last_error())
+        Err(netsupport::last_error())
     } else {
         let fd = unsafe {
             libc::open_osfhandle(handle as libc::intptr_t, flags)
         };
         if fd < 0 {
             let _ = unsafe { libc::CloseHandle(handle) };
-            Err(super::last_error())
+            Err(netsupport::last_error())
         } else {
             Ok(FileDesc::new(fd, true))
         }
@@ -367,7 +369,7 @@ pub fn readdir(p: &CString) -> IoResult<~[Path]> {
             libc::free(wfd_ptr as *mut c_void);
             Ok(prune(p, paths))
         } else {
-            Err(super::last_error())
+            Err(netsupport::last_error())
         }
     })
 }
@@ -421,7 +423,7 @@ pub fn readlink(p: &CString) -> IoResult<Path> {
         })
     };
     if handle as int == libc::INVALID_HANDLE_VALUE as int {
-        return Err(super::last_error())
+        return Err(netsupport::last_error())
     }
     // Specify (sz - 1) because the documentation states that it's the size
     // without the null pointer
@@ -434,7 +436,7 @@ pub fn readlink(p: &CString) -> IoResult<Path> {
     let ret = match ret {
         Some(ref s) if s.starts_with(r"\\?\") => Ok(Path::new(s.slice_from(4))),
         Some(s) => Ok(Path::new(s)),
-        None => Err(super::last_error()),
+        None => Err(netsupport::last_error()),
     };
     assert!(unsafe { libc::CloseHandle(handle) } != 0);
     return ret;
@@ -495,7 +497,7 @@ pub fn stat(p: &CString) -> IoResult<io::FileStat> {
     as_utf16_p(p.as_str().unwrap(), |up| {
         match unsafe { libc::wstat(up, &mut stat) } {
             0 => Ok(mkstat(&stat, p)),
-            _ => Err(super::last_error()),
+            _ => Err(netsupport::last_error()),
         }
     })
 }