browser-rs: recieve a http response from a server

Author: d0iasm

app/browser-rs/src/main.rs

@@ -46,7 +46,7 @@ impl ParsedUrl {
                 path = v[1];
             } else if v.len() == 1 {
                 host = v[0];
-                path = "index.html";
+                path = "/index.html";
             } else {
                 panic!("invalid url {}", url);
             }
@@ -137,13 +137,32 @@ fn main() {
         Some(fd) => fd,
         None => panic!("can't create a socket file descriptor"),
     };
-    let address = SockAddr::new(
+    let mut address = SockAddr::new(
         AF_INET as u16,
         htons(parsed_url.port),
         inet_addr(&parsed_url.host),
     );
     let mut request = http_request.string();
-    sendto(&socket_fd, &mut request, 0, &address);
+
+    println!("----- sending a request -----");
+    println!("{}", request);
+
+    if sendto(&socket_fd, &mut request, 0, &address) < 0 {
+        panic!("failed to send a request: {:?}", request);
+    }
+
+    let mut buf = [0; 1000];
+    let length = recvfrom(&socket_fd, &mut buf, 0, &mut address);
+    if length < 0 {
+        panic!("failed to receive a response");
+    }
+    let response = match String::from_utf8(buf.to_vec()) {
+        Ok(s) => s,
+        Err(e) => panic!("failed to convert u8 array to string: {}", e),
+    };
+
+    println!("----- receiving a response -----");
+    println!("{}", response);
 
     close(&socket_fd);
 }

app/liumlib/src/lib.rs

@@ -42,7 +42,7 @@ impl Drop for FileDescriptor {
 #[derive(Debug)]
 struct InAddr {
     /// IP address with big endian
-    s_addr: u32
+    s_addr: u32,
 }
 
 impl InAddr {
@@ -86,15 +86,15 @@ extern "C" {
         flags: u32,
         dest_addr: &SockAddr,
         addrlen: usize,
-    ) -> usize;
-    fn _sys_recvfrom(
+    ) -> i64;
+    fn sys_recvfrom(
         sockfd: u32,
         buf: *mut u8,
         len: usize,
         flags: u32,
         src_addr: &mut SockAddr,
         addrlen: usize,
-    ) -> usize;
+    ) -> i64;
     fn sys_exit(code: i32) -> !;
     pub fn sys_getdents64(fd: u32, buf: *mut u8, buf_size: usize) -> i32;
 }
@@ -154,24 +154,43 @@ pub fn free_page(addr: *mut u8) -> i32 {
 }
 
 pub fn socket(domain: u32, socket_type: u32, protocol: u32) -> Option<FileDescriptor> {
-    let fd = unsafe {sys_socket(domain, socket_type, protocol) };
+    let fd = unsafe { sys_socket(domain, socket_type, protocol) };
     if fd < 0 {
         None
     } else {
         Some(FileDescriptor { fd })
     }
 }
 
-pub fn sendto(sockfd: &FileDescriptor, buf: &mut String, flags: u32, dest_addr: &SockAddr) -> usize {
+pub fn sendto(sockfd: &FileDescriptor, buf: &mut String, flags: u32, dest_addr: &SockAddr) -> i64 {
     unsafe {
-        sys_sendto(sockfd.fd as u32, buf.as_bytes_mut().as_mut_ptr(), buf.len(), flags, dest_addr, 0)
+        sys_sendto(
+            sockfd.fd as u32,
+            buf.as_mut_ptr(),
+            buf.len(),
+            flags,
+            dest_addr,
+            0,
+        )
     }
 }
 
-fn _recvfrom(sockfd: &FileDescriptor, buf: &mut String, flags: u32, src_addr: &mut SockAddr) -> usize {
+pub fn recvfrom(
+    sockfd: &FileDescriptor,
+    buf: &mut [u8],
+    flags: u32,
+    src_addr: &mut SockAddr,
+) -> i64 {
     let len = buf.len();
     unsafe {
-        _sys_recvfrom(sockfd.fd as u32, buf.as_bytes_mut().as_mut_ptr(), len, flags, src_addr, 0)
+        sys_recvfrom(
+            sockfd.fd as u32,
+            buf.as_mut_ptr(),
+            len,
+            flags,
+            src_addr,
+            0,
+        )
     }
 }