pointer fixes

Author: saviorand

external/libc.mojo

@@ -93,7 +93,7 @@ fn to_char_ptr(s: Bytes) -> UnsafePointer[c_char]:
     return ptr
 
 fn c_charptr_to_string(s: UnsafePointer[c_char]) -> String:
-    return String(s.bitcast[Int8](), strlen(s))
+    return String(s.bitcast[UInt8](), strlen(s))
 
 
 fn cftob(val: c_int) -> Bool:

lightbug_http/header.mojo

@@ -296,7 +296,7 @@ struct RequestHeader:
             raise Error("Invalid protocol, HTTP version not supported: " + String(proto))
 
         _ = self.set_protocol_bytes(proto)
-        _ = self.set_request_uri_bytes(b[:n])
+        _ = self.set_request_uri_bytes(b[:n - 2]) # without the null terminator
 
         return len(buf) - len(b_next)
 
@@ -653,7 +653,7 @@ struct ResponseHeader:
         _ = self.parse_first_line(first_line)
 
         for header in headers:
-            var header_str = header.__getitem__()
+            var header_str = header[]
             var separator = header_str.find(":")
             if separator == -1:
                 raise Error("Invalid header")

lightbug_http/http.mojo

@@ -321,8 +321,10 @@ fn encode(req: HTTPRequest, uri: URI) raises -> StringSlice[False, ImmutableStat
     else:
         _ = builder.write_string(strSlash)
     _ = builder.write_string(whitespace)
-    
-    _ = builder.write(req.header.protocol())
+
+    # _ = builder.write(req.header.protocol())
+    # hardcoded for now
+    _ = builder.write_string("HTTP/1.1")
 
     _ = builder.write_string(rChar)
     _ = builder.write_string(nChar)
@@ -421,7 +423,7 @@ fn encode(res: HTTPResponse) raises -> String:
         _ = builder.write_string(rChar)
         _ = builder.write_string(nChar)
         _ = builder.write(res.get_body_bytes())
-
+    
     return StringSlice[False, ImmutableStaticLifetime](unsafe_from_utf8_ptr=builder.render().unsafe_ptr(), len=builder.size)
 
 fn split_http_string(buf: Bytes) raises -> (String, String, String):

lightbug_http/io/bytes.mojo

@@ -49,7 +49,7 @@ fn next_line(b: Bytes) raises -> (Bytes, Bytes):
     var n = n_next
     if n > 0 and (b[n-1] == bytes(rChar, pop=False)[0]):
         n -= 1
-    return (b[:n], b[n_next+1:])
+    return (b[:n+1], b[n_next+1:])
 
 @value
 @register_passable("trivial")

lightbug_http/net.mojo

@@ -258,7 +258,7 @@ fn get_sock_name(fd: Int32) raises -> HostPort:
     )
     if status == -1:
         raise Error("get_sock_name: Failed to get address of local socket.")
-    var addr_in = local_address_ptr.bitcast[sockaddr_in]().__getitem__()
+    var addr_in = local_address_ptr.bitcast[sockaddr_in]()[]
 
     return HostPort(
         host=convert_binary_ip_to_string(addr_in.sin_addr.s_addr, AF_INET, 16),
@@ -279,7 +279,7 @@ fn get_peer_name(fd: Int32) raises -> HostPort:
         raise Error("get_peer_name: Failed to get address of remote socket.")
 
     # Cast sockaddr struct to sockaddr_in to convert binary IP to string.
-    var addr_in = remote_address_ptr.bitcast[sockaddr_in]().__getitem__()
+    var addr_in = remote_address_ptr.bitcast[sockaddr_in]()[]
 
     return HostPort(
         host=convert_binary_ip_to_string(addr_in.sin_addr.s_addr, AF_INET, 16),

lightbug_http/sys/net.mojo

@@ -142,7 +142,8 @@ struct SysListenConfig(ListenConfig):
             ip_buf_size = 16
 
         var ip_buf = UnsafePointer[c_void].alloc(ip_buf_size)
-        var raw_ip = ip_buf.bitcast[c_uint]().__getitem__()
+        var conv_status = inet_pton(address_family, to_char_ptr(addr.ip), ip_buf)
+        var raw_ip = ip_buf.bitcast[c_uint]()[]
 
         var bin_port = htons(UInt16(addr.port))
 
@@ -154,14 +155,13 @@ struct SysListenConfig(ListenConfig):
             print("Socket creation error")
 
         var yes: Int = 1
-        var opterr = setsockopt(
+        _ = setsockopt(
             sockfd,
             SOL_SOCKET,
             SO_REUSEADDR,
             UnsafePointer[Int].address_of(yes).bitcast[c_void](),
             sizeof[Int](),
         )
-        print(opterr)
 
         var bind_success = False
         var bind_fail_logged = False
@@ -276,13 +276,13 @@ struct addrinfo_macos(AnAddrInfo):
     var ai_socktype: c_int
     var ai_protocol: c_int
     var ai_addrlen: socklen_t
-    var ai_canonname: Pointer[c_char]
-    var ai_addr: Pointer[sockaddr]
-    var ai_next: Pointer[c_void]
+    var ai_canonname: UnsafePointer[c_char]
+    var ai_addr: UnsafePointer[sockaddr]
+    var ai_next: UnsafePointer[c_void]
 
     fn __init__() -> Self:
         return Self(
-            0, 0, 0, 0, 0, Pointer[c_char](), Pointer[sockaddr](), Pointer[c_void]()
+            0, 0, 0, 0, 0, UnsafePointer[c_char](), UnsafePointer[sockaddr](), UnsafePointer[c_void]()
         )
 
     fn get_ip_address(self, host: String) raises -> in_addr:
@@ -298,7 +298,7 @@ struct addrinfo_macos(AnAddrInfo):
         """
         var host_ptr = to_char_ptr(host)
         var servinfo = UnsafePointer[Self]().alloc(1)
-        servinfo[0] = Self()
+        initialize_pointee_move(servinfo, Self())
 
         var hints = Self()
         hints.ai_family = AF_INET
@@ -315,7 +315,7 @@ struct addrinfo_macos(AnAddrInfo):
             print("getaddrinfo failed")
             raise Error("Failed to get IP address. getaddrinfo failed.")
 
-        var addrinfo = servinfo[0]
+        var addrinfo = servinfo[]
 
         var ai_addr = addrinfo.ai_addr
         if not ai_addr:
@@ -325,7 +325,7 @@ struct addrinfo_macos(AnAddrInfo):
                 " ai_addr is null."
             )
 
-        var addr_in = ai_addr.bitcast[sockaddr_in]().load()
+        var addr_in = ai_addr.bitcast[sockaddr_in]()[]
 
         return addr_in.sin_addr
 
@@ -342,13 +342,13 @@ struct addrinfo_unix(AnAddrInfo):
     var ai_socktype: c_int
     var ai_protocol: c_int
     var ai_addrlen: socklen_t
-    var ai_addr: Pointer[sockaddr]
-    var ai_canonname: Pointer[c_char]
-    var ai_next: Pointer[c_void]
+    var ai_addr: UnsafePointer[sockaddr]
+    var ai_canonname: UnsafePointer[c_char]
+    var ai_next: UnsafePointer[c_void]
 
     fn __init__() -> Self:
         return Self(
-            0, 0, 0, 0, 0, Pointer[sockaddr](), Pointer[c_char](), Pointer[c_void]()
+            0, 0, 0, 0, 0, UnsafePointer[sockaddr](), UnsafePointer[c_char](), UnsafePointer[c_void]()
         )
 
     fn get_ip_address(self, host: String) raises -> in_addr:
@@ -364,7 +364,7 @@ struct addrinfo_unix(AnAddrInfo):
         """
         var host_ptr = to_char_ptr(String(host))
         var servinfo = UnsafePointer[Self]().alloc(1)
-        servinfo[0] = Self()
+        initialize_pointee_move(servinfo, Self())
 
         var hints = Self()
         hints.ai_family = AF_INET
@@ -381,7 +381,7 @@ struct addrinfo_unix(AnAddrInfo):
             print("getaddrinfo failed")
             raise Error("Failed to get IP address. getaddrinfo failed.")
 
-        var addrinfo = servinfo[0]
+        var addrinfo = servinfo[]
 
         var ai_addr = addrinfo.ai_addr
         if not ai_addr:
@@ -391,7 +391,7 @@ struct addrinfo_unix(AnAddrInfo):
                 " ai_addr is null."
             )
 
-        var addr_in = ai_addr.bitcast[sockaddr_in]().load()
+        var addr_in = ai_addr.bitcast[sockaddr_in]()[]
 
         return addr_in.sin_addr
 

lightbug_http/sys/server.mojo

@@ -177,56 +177,56 @@ struct SysServer:
 
         var req_number = 0
 
-        while True:
-            req_number += 1
+        # while True:
+        req_number += 1
 
-            var first_byte = reader.peek(1)
-            if len(first_byte) == 0:
-                error = Error("Failed to read first byte from connection")
-            
-            var header = RequestHeader()
-            # var end_of_first_line_headers: Int
-            
-            try:
-                _ = header.parse_raw(reader)
-            except e:
-                error = Error("Failed to parse request headers: " + e.__str__())
-            
+        var first_byte = reader.peek(1)
+        if len(first_byte) == 0:
+            error = Error("Failed to read first byte from connection")
+        
+        var header = RequestHeader()
+        # var end_of_first_line_headers: Int
+        
+        try:
+            _ = header.parse_raw(reader)
+        except e:
+            error = Error("Failed to parse request headers: " + e.__str__())
+        
 
-            var uri = URI(self.address() + String(header.request_uri()))
-            try:
-                uri.parse()
-            except e:
-                error = Error("Failed to parse request line:" + e.__str__())
-            
-            if header.content_length() > 0:
-                if max_request_body_size > 0 and header.content_length() > max_request_body_size:
-                    error = Error("Request body too large")
-                
-                # var remaining_body = Bytes()
-                # var remaining_len = header.content_length() - (len(request_body) + 1)
-                # while remaining_len > 0:
-                #     var read_len = conn.read(remaining_body)
-                #     buf.extend(remaining_body)
-                #     remaining_len -= read_len
-
-            var request = HTTPRequest(
-                    uri,
-                    Bytes(),
-                    header,
-                )
-
-            _ = request.read_body(reader, header.content_length(), max_request_body_size)
-
-            var res = handler.func(request)
-            
-            # if not self.tcp_keep_alive:
-            _ = res.set_connection_close()
+        var uri = URI(self.address() + String(header.request_uri()))
+        try:
+            uri.parse()
+        except e:
+            error = Error("Failed to parse request line:" + e.__str__())
+        
+        if header.content_length() > 0:
+            if max_request_body_size > 0 and header.content_length() > max_request_body_size:
+                error = Error("Request body too large")
 
-            var res_encoded = encode(res)
+            # var remaining_body = Bytes()
+            # var remaining_len = header.content_length() - (len(request_body) + 1)
+            # while remaining_len > 0:
+            #     var read_len = conn.read(remaining_body)
+            #     buf.extend(remaining_body)
+            #     remaining_len -= read_len
+
+        var request = HTTPRequest(
+                uri,
+                Bytes(),
+                header,
+            )
+
+        _ = request.read_body(reader, header.content_length(), max_request_body_size)
+        print(encode(request, uri))
+        var res = handler.func(request)
+        
+        # if not self.tcp_keep_alive:
+        _ = res.set_connection_close()
+        
+        var res_encoded = encode(res)
 
-            _ = conn.write(res_encoded)
+        _ = conn.write(res_encoded)
 
-            # if not self.tcp_keep_alive:
-            conn.close()
-            # break
+        # if not self.tcp_keep_alive:
+        conn.close()
+        # break

test.mojo

@@ -4,10 +4,11 @@ from lightbug_http import *
 struct MyPrinter(HTTPService):
     fn func(self, req: HTTPRequest) raises -> HTTPResponse:
         var body = req.get_body_bytes()
+        
         return HTTPResponse(body)
 
 
 fn main() raises:
-    var server = SysServer(tcp_keep_alive=True)
+    var server = SysServer()
     var handler = MyPrinter()
     server.listen_and_serve("0.0.0.0:8080", handler)