raw net packets
This commit is contained in:
parent
fa96c54104
commit
d829c3c1a8
@ -137,6 +137,38 @@ void NET_W32_PostRecv(NET_W32_Pipe *pipe)
|
||||
);
|
||||
}
|
||||
|
||||
void NET_W32_SendTo(NET_W32_Pipe *pipe, NET_W32_Peer *peer, NET_W32_PacketHeader header, String data)
|
||||
{
|
||||
struct sockaddr_in6 addr = NET_W32_AddressFromKey(peer->key);
|
||||
i64 buff_len = 0;
|
||||
u8 buff[Kibi(2)];
|
||||
|
||||
// Push header
|
||||
header.checksum = 0;
|
||||
CopyBytes(buff, &header, sizeof(header));
|
||||
buff_len += sizeof(header);
|
||||
|
||||
// Push data
|
||||
i64 data_write_len = MinI64(countof(buff) - buff_len, data.len);
|
||||
CopyBytes(buff + buff_len, data.text, data_write_len);
|
||||
buff_len += data_write_len;
|
||||
|
||||
// Write checksum
|
||||
u32 checksum = NET_W32_ChecksumFromPacketString(STRING(buff_len, buff));
|
||||
CopyBytes(buff, &checksum, sizeof(checksum));
|
||||
|
||||
// Send
|
||||
sendto(
|
||||
pipe->udp,
|
||||
(char *)buff,
|
||||
buff_len,
|
||||
0,
|
||||
(struct sockaddr *)&addr,
|
||||
sizeof(addr)
|
||||
);
|
||||
Atomic64FetchAdd(&pipe->total_bytes_sent, buff_len);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
//~ @hookimpl Net ops
|
||||
|
||||
@ -278,6 +310,9 @@ NET_MsgList NET_Swap(Arena *arena, NET_PipeHandle pipe_handle)
|
||||
}
|
||||
|
||||
void NET_Send(NET_PipeHandle pipe_handle, NET_Key dst, String data, NET_SendFlag flags)
|
||||
{
|
||||
b32 drop = AnyBit(flags, NET_SendFlag_Raw) && data.len > NET_PacketSize;
|
||||
if (!drop)
|
||||
{
|
||||
NET_W32_Pipe *pipe = NET_W32_PipeFromHandle(pipe_handle);
|
||||
if (Atomic64Fetch(&pipe->desired_port) == 0)
|
||||
@ -297,6 +332,7 @@ void NET_Send(NET_PipeHandle pipe_handle, NET_Key dst, String data, NET_SendFlag
|
||||
UnlockTicketMutex(&pipe->back_cmd_buff_seq_tm);
|
||||
NET_W32_SignalWorker();
|
||||
}
|
||||
}
|
||||
|
||||
NET_PipeStatistics NET_StatsFromPipe(NET_PipeHandle pipe_handle)
|
||||
{
|
||||
@ -391,6 +427,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
wake_count += 1;
|
||||
Atomic64Set(&NET_W32.seen_signal, Atomic64Fetch(&NET_W32.signal));
|
||||
}
|
||||
i64 time_ns = TimeNs();
|
||||
i32 err = GetLastError();
|
||||
if (!ok)
|
||||
{
|
||||
@ -426,7 +463,9 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
//- Fetch peer
|
||||
NET_W32_Peer *peer = NET_W32_TouchPeerFromKey(pipe, key);
|
||||
peer->key = key;
|
||||
peer->last_packet_received_ns = TimeNs();
|
||||
|
||||
//- Update remote stats
|
||||
peer->last_ack_received_ns = time_ns;
|
||||
if (header.bottom_ack == peer->remote_bottom_ack)
|
||||
{
|
||||
peer->remote_ack_bits |= header.ack_bits;
|
||||
@ -437,10 +476,30 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
peer->remote_ack_bits = header.ack_bits;
|
||||
}
|
||||
|
||||
b32 is_heartbeat = !!(header.flags & NET_W32_PacketFlag_Heartbeat);
|
||||
b32 is_raw = !!(header.flags & NET_W32_PacketFlag_Raw);
|
||||
b32 is_reliable = !is_heartbeat && !is_raw;
|
||||
|
||||
//- Read msg packet
|
||||
if (!(header.flags & NET_W32_PacketFlag_Heartbeat))
|
||||
if (!is_heartbeat)
|
||||
{
|
||||
// Update our stats
|
||||
if (is_raw)
|
||||
{
|
||||
//- Read raw packet now
|
||||
LockTicketMutex(&pipe->back_msg_buff_seq_tm);
|
||||
{
|
||||
NET_W32_MsgBuff *msg_buff = &pipe->msg_buffs[pipe->back_msg_buff_seq % countof(pipe->msg_buffs)];
|
||||
NET_Msg *msg = PushStruct(msg_buff->arena, NET_Msg);
|
||||
msg->sender = peer->key;
|
||||
msg->data = PushString(msg_buff->arena, src_data);
|
||||
DllQueuePush(msg_buff->msgs.first, msg_buff->msgs.last, msg);
|
||||
++msg_buff->msgs.count;
|
||||
}
|
||||
UnlockTicketMutex(&pipe->back_msg_buff_seq_tm);
|
||||
}
|
||||
else if (is_reliable)
|
||||
{
|
||||
//- Update our stats
|
||||
b32 is_sequential = 0;
|
||||
b32 should_process = 0;
|
||||
if (header.seq == peer->bottom_ack + 1)
|
||||
@ -457,7 +516,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
peer->num_msg_packets_received_this_frame += 1;
|
||||
pipe->num_msg_packets_received_this_frame += 1;
|
||||
|
||||
// Process packet
|
||||
//- Process packet
|
||||
if (should_process)
|
||||
{
|
||||
NET_W32_Packet *packet = NET_W32.first_free_packet;
|
||||
@ -480,7 +539,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
CopyBytes(packet->data.text, src_data.text, src_data.len);
|
||||
packet->data.len = src_data.len;
|
||||
|
||||
// Insert packet
|
||||
//- Insert packet
|
||||
{
|
||||
NET_W32_Packet *left = peer->last_frag_packet;
|
||||
for (; left; left = left->prev)
|
||||
@ -493,7 +552,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
DllQueueInsert(peer->first_frag_packet, peer->last_frag_packet, left, packet);
|
||||
}
|
||||
|
||||
// Transfer fragmented -> contiguous packets
|
||||
//- Transfer fragmented -> contiguous packets
|
||||
if (is_sequential)
|
||||
{
|
||||
NET_W32_Packet *contig_start = peer->first_frag_packet;
|
||||
@ -558,6 +617,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Re-post recv
|
||||
if (err != ERROR_OPERATION_ABORTED)
|
||||
@ -574,13 +634,12 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
for (i64 pipe_idx = 0; pipe_idx < pipes_count; ++pipe_idx)
|
||||
{
|
||||
NET_W32_Pipe *pipe = pipes[pipe_idx];
|
||||
i64 time_ns = TimeNs();
|
||||
|
||||
//////////////////////////////
|
||||
//- Bind
|
||||
|
||||
{
|
||||
i64 now_ns = TimeNs();
|
||||
|
||||
u64 desired_port = Atomic64Fetch(&pipe->desired_port);
|
||||
if (desired_port != 0)
|
||||
{
|
||||
@ -592,7 +651,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
|
||||
if (
|
||||
(!pipe->udp || (!desired_is_ephemeral && pipe->bound_port != desired_port)) &&
|
||||
(pipe->last_attempted_bind_ns == 0 || now_ns - pipe->last_attempted_bind_ns > bind_retry_threshold_ns)
|
||||
(pipe->last_attempted_bind_ns == 0 || time_ns - pipe->last_attempted_bind_ns > bind_retry_threshold_ns)
|
||||
)
|
||||
{
|
||||
LogTraceF("Binding to port \"%F\"", FmtUint(desired_port));
|
||||
@ -611,7 +670,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
|
||||
if (pipe->iocp_count == 0)
|
||||
{
|
||||
pipe->last_attempted_bind_ns = now_ns;
|
||||
pipe->last_attempted_bind_ns = time_ns;
|
||||
|
||||
//- Init bind address
|
||||
struct addrinfo hints = Zi;
|
||||
@ -848,7 +907,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
}
|
||||
|
||||
//////////////////////////////
|
||||
//- Queue message packets
|
||||
//- Process cmds
|
||||
|
||||
{
|
||||
// Swap cmd buff
|
||||
@ -869,13 +928,28 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
{
|
||||
NET_Key key = cmd->key;
|
||||
NET_W32_Peer *peer = NET_W32_TouchPeerFromKey(pipe, key);
|
||||
|
||||
b32 is_raw = !!(cmd->send_flags & NET_SendFlag_Raw);
|
||||
|
||||
if (is_raw)
|
||||
{
|
||||
// Send raw packet now
|
||||
NET_W32_PacketHeader header = Zi;
|
||||
{
|
||||
header.flags = NET_W32_PacketFlag_Raw;
|
||||
header.bottom_ack = peer->bottom_ack;
|
||||
header.ack_bits = peer->ack_bits;
|
||||
}
|
||||
NET_W32_SendTo(pipe, peer, header, cmd->data);
|
||||
peer->last_ack_sent_ns = time_ns;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Queue reliable msg packets
|
||||
String src_data = cmd->data;
|
||||
i64 src_pos = 0;
|
||||
i64 msg_seq = ++peer->msg_seq;
|
||||
LogTraceF("Queued msg with seq %F", FmtSint(msg_seq));
|
||||
|
||||
// TODO: Raw packets
|
||||
|
||||
b32 is_msg_end = 0;
|
||||
while (!is_msg_end)
|
||||
{
|
||||
@ -917,6 +991,7 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////
|
||||
//- Send heartbeat packets
|
||||
@ -934,39 +1009,21 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
}
|
||||
|
||||
// Send heartbeat if we haven't sent any packets in a while
|
||||
i64 now_ns = TimeNs();
|
||||
if (now_ns - peer->last_packet_sent_ns > heartbeat_threshold_ns)
|
||||
if (time_ns - peer->last_ack_sent_ns > heartbeat_threshold_ns)
|
||||
{
|
||||
should_send_heartbeat = 1;
|
||||
}
|
||||
|
||||
if (should_send_heartbeat)
|
||||
{
|
||||
struct sockaddr_in6 addr = NET_W32_AddressFromKey(peer->key);
|
||||
i64 buff_len = 0;
|
||||
u8 buff[Kibi(2)];
|
||||
NET_W32_PacketHeader header = Zi;
|
||||
{
|
||||
header.checksum = 0;
|
||||
header.flags = NET_W32_PacketFlag_Heartbeat;
|
||||
header.bottom_ack = peer->bottom_ack;
|
||||
header.ack_bits = peer->ack_bits;
|
||||
}
|
||||
CopyBytes(buff, &header, sizeof(header));
|
||||
buff_len += sizeof(header);
|
||||
|
||||
u32 checksum = NET_W32_ChecksumFromPacketString(STRING(buff_len, buff));
|
||||
CopyBytes(buff, &checksum, sizeof(checksum));
|
||||
sendto(
|
||||
pipe->udp,
|
||||
(char *)buff,
|
||||
buff_len,
|
||||
0,
|
||||
(struct sockaddr *)&addr,
|
||||
sizeof(addr)
|
||||
);
|
||||
Atomic64FetchAdd(&pipe->total_bytes_sent, buff_len);
|
||||
peer->last_packet_sent_ns = now_ns;
|
||||
NET_W32_SendTo(pipe, peer, header, Zstr);
|
||||
peer->last_ack_sent_ns = time_ns;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -987,7 +1044,6 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
u64 ack_bits = peer->remote_ack_bits;
|
||||
|
||||
NET_Key key = peer->key;
|
||||
struct sockaddr_in6 addr = NET_W32_AddressFromKey(key);
|
||||
|
||||
// TODO: Maybe send more than just bottom_ack + 65 packets at a time.
|
||||
for (NET_W32_Packet *packet = peer->first_remote_packet; packet && packet->seq <= bottom_ack + 65;)
|
||||
@ -1016,41 +1072,19 @@ void NET_W32_TickForever(WaveLaneCtx *lane)
|
||||
else
|
||||
{
|
||||
// Transmit unacked packet
|
||||
i64 now_ns = TimeNs();
|
||||
if (packet->last_sent_ns == 0 || (now_ns - packet->last_sent_ns > msg_resend_threshold_ns))
|
||||
if (packet->last_sent_ns == 0 || (time_ns - packet->last_sent_ns > msg_resend_threshold_ns))
|
||||
{
|
||||
peer->last_packet_sent_ns = now_ns;
|
||||
packet->last_sent_ns = now_ns;
|
||||
i64 buff_len = 0;
|
||||
u8 buff[Kibi(2)];
|
||||
|
||||
NET_W32_PacketHeader header = Zi;
|
||||
{
|
||||
header.checksum = 0;
|
||||
header.flags = packet->flags;
|
||||
header.seq = packet->seq;
|
||||
header.msg_seq = packet->msg_seq;
|
||||
header.bottom_ack = peer->bottom_ack;
|
||||
header.ack_bits = peer->ack_bits;
|
||||
}
|
||||
CopyBytes(buff, &header, sizeof(header));
|
||||
buff_len += sizeof(header);
|
||||
|
||||
CopyBytes(buff + buff_len, packet->data.text, packet->data.len);
|
||||
buff_len += packet->data.len;
|
||||
|
||||
u32 checksum = NET_W32_ChecksumFromPacketString(STRING(buff_len, buff));
|
||||
CopyBytes(buff, &checksum, sizeof(checksum));
|
||||
sendto(
|
||||
pipe->udp,
|
||||
(char *)buff,
|
||||
buff_len,
|
||||
0,
|
||||
(struct sockaddr *)&addr,
|
||||
sizeof(addr)
|
||||
);
|
||||
Atomic64FetchAdd(&pipe->total_bytes_sent, buff_len);
|
||||
|
||||
NET_W32_SendTo(pipe, peer, header, packet->data);
|
||||
peer->last_ack_sent_ns = time_ns;
|
||||
packet->last_sent_ns = time_ns;
|
||||
LogTraceF(
|
||||
"Sent msg packet. seq: %F, msg seq: %F, data: \"%F\"",
|
||||
FmtSint(header.seq),
|
||||
|
||||
@ -43,7 +43,7 @@ Enum(NET_W32_PacketFlag)
|
||||
|
||||
NET_W32_PacketFlag_EndMsg = (1 << 0),
|
||||
NET_W32_PacketFlag_Heartbeat = (1 << 2),
|
||||
// NET_W32_PacketFlag_Raw = (1 << 3),
|
||||
NET_W32_PacketFlag_Raw = (1 << 3),
|
||||
};
|
||||
|
||||
Struct(NET_W32_PacketHeader)
|
||||
@ -103,8 +103,8 @@ Struct(NET_W32_Peer)
|
||||
i64 msg_seq;
|
||||
String msg_fragment;
|
||||
|
||||
i64 last_packet_received_ns;
|
||||
i64 last_packet_sent_ns;
|
||||
i64 last_ack_received_ns;
|
||||
i64 last_ack_sent_ns;
|
||||
i64 num_msg_packets_received_this_frame;
|
||||
};
|
||||
|
||||
@ -203,6 +203,7 @@ void NET_W32_SignalWorker(void);
|
||||
NET_W32_Peer *NET_W32_TouchPeerFromKey(NET_W32_Pipe *pipe, NET_Key key);
|
||||
u32 NET_W32_ChecksumFromPacketString(String str);
|
||||
void NET_W32_PostRecv(NET_W32_Pipe *pipe);
|
||||
void NET_W32_SendTo(NET_W32_Pipe *pipe, NET_W32_Peer *peer, NET_W32_PacketHeader header, String data);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
//~ Worker
|
||||
|
||||
@ -925,8 +925,8 @@ void S_TickForever(WaveLaneCtx *lane)
|
||||
NET_Send(net_pipe, client->net_key, snapshot, NET_SendFlag_Raw);
|
||||
|
||||
// Sanity check to catch whenever we end up packing too much information
|
||||
// into a single raw snapshot, causing it to drop. Not an actual error,
|
||||
// but signals we may have botched the packing code or need tighter
|
||||
// into a single raw snapshot, causing it to drop. This isn't necessarily
|
||||
// an error, but signals we may have botched the packing code or need tighter
|
||||
// compression
|
||||
Assert(snapshot.len <= NET_PacketSize);
|
||||
}
|
||||
|
||||
@ -3154,8 +3154,8 @@ void V_TickForever(WaveLaneCtx *lane)
|
||||
NET_Send(net_pipe, frame->sim_key, snapshot, NET_SendFlag_Raw);
|
||||
|
||||
// Sanity check to catch whenever we end up packing too much information
|
||||
// into a single raw snapshot, causing it to drop. Not an actual error,
|
||||
// but signals we may have botched the packing code or need tighter
|
||||
// into a single raw snapshot, causing it to drop. This isn't necessarily
|
||||
// an error, but signals we may have botched the packing code or need tighter
|
||||
// compression
|
||||
Assert(snapshot.len <= NET_PacketSize);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user