clean up start_client function (#37)

* add constructor for ConnectionRequestPacket * use get_serialized_data method for ConnectionRequestPacket * rearrange some things in start_client function
Sid-Bhatia-0 · Mar 23, 2024 · 9af3bbe · 9af3bbe
1 parent d922226
commit 9af3bbe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/netcode/simulate.jl b/netcode/simulate.jl
@@ -153,28 +153,17 @@ function start_client(auth_server_address, username, password)
         error("Invalid connect token packet received")
     end
 
-    app_server_address = get_inetaddr(first(connect_token_packet.netcode_addresses))
-
-    @info "Client obtained app_server_address" app_server_address
+    connection_request_packet = ConnectionRequestPacket(connect_token_packet)
+    pprint(connection_request_packet)
 
     socket = Sockets.UDPSocket()
 
-    connection_request_packet = ConnectionRequestPacket(
-        PACKET_TYPE_CONNECTION_REQUEST_PACKET,
-        connect_token_packet.netcode_version_info,
-        connect_token_packet.protocol_id,
-        connect_token_packet.expire_timestamp,
-        connect_token_packet.nonce,
-        connect_token_packet.encrypted_private_connect_token_data,
-    )
-    size_of_connection_request_packet = get_serialized_size(connection_request_packet)
-    io_connection_request_packet = IOBuffer(maxsize = size_of_connection_request_packet)
-    connection_request_packet_length = write(io_connection_request_packet, connection_request_packet)
-    @assert connection_request_packet_length == size_of_connection_request_packet
+    connection_request_packet_data = get_serialized_data(connection_request_packet)
 
-    pprint(connection_request_packet)
+    app_server_address = get_inetaddr(first(connect_token_packet.netcode_addresses))
+    @info "Client obtained app_server_address" app_server_address
 
-    Sockets.send(socket, app_server_address.host, app_server_address.port, io_connection_request_packet.data)
+    Sockets.send(socket, app_server_address.host, app_server_address.port, connection_request_packet_data)
 
     return nothing
 end

diff --git a/netcode/types.jl b/netcode/types.jl
@@ -185,3 +185,14 @@ function ConnectTokenPacket(connect_token_info::ConnectTokenInfo)
         connect_token_info.server_to_client_key,
     )
 end
+
+function ConnectionRequestPacket(connect_token_packet::ConnectTokenPacket)
+    return ConnectionRequestPacket(
+        PACKET_TYPE_CONNECTION_REQUEST_PACKET,
+        connect_token_packet.netcode_version_info,
+        connect_token_packet.protocol_id,
+        connect_token_packet.expire_timestamp,
+        connect_token_packet.nonce,
+        connect_token_packet.encrypted_private_connect_token_data,
+    )
+end