tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-29 00:36:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up UDP queue find a bit

Browse source
This commit is contained in:
TomAwezome 2020-07-28 00:51:14 -05:00 committed by VoidNV
parent 5ef1d5ef57
commit 1be8f456f0
2 changed files with 53 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Zenith-latest-2020-07-28-00_34_28.iso → Zenith-latest-2020-07-28-00_50_58.iso
View file

Binary file not shown.

99
src/Home/Net/UDP.CC
View file

@ -23,7 +23,7 @@ class CUDPSocket
U8 *receive_buffer; U8 *receive_buffer;
I64 receive_len; I64 receive_len;
CSocketAddressStorage receive_address; // based on ->family, cast or assign pointer as IPV4/IPV6 CSocketAddress CSocketAddressStorage receive_address; // based on ->family, cast or assign to a var as IPV4/IPV6 CSocketAddress
U16 bound_to; // represents the currently bound port U16 bound_to; // represents the currently bound port
}; };
@ -124,25 +124,25 @@ CUDPTreeNode *UDPTreeNodeFind(I64 port, CUDPTreeNode *tree)
CUDPTreeNode *UDPTreeNodePop(I64 port, CUDPTreeNode *tree) CUDPTreeNode *UDPTreeNodePop(I64 port, CUDPTreeNode *tree)
{ // mimics TreeNodeFind. pops whole sub-tree, original tree loses whole branch. { // mimics TreeNodeFind. pops whole sub-tree, original tree loses whole branch.
CUDPTreeNode *parent_tree = tree; CUDPTreeNode *parent_tree = tree;
CUDPTreeNode *temp_tree = parent_tree; CUDPTreeNode *temp_tree = parent_tree;
Bool is_left = FALSE; Bool is_left = FALSE;
Bool is_right = FALSE; Bool is_right = FALSE;
while (temp_tree) while (temp_tree)
{ {
if (port < temp_tree->port) if (port < temp_tree->port)
{ {
parent_tree = temp_tree; parent_tree = temp_tree;
temp_tree = temp_tree->left; temp_tree = temp_tree->left;
is_right = FALSE; is_right = FALSE;
is_left = TRUE; is_left = TRUE;
} }
else if (port > temp_tree->port) else if (port > temp_tree->port)
{ {
parent_tree = temp_tree; parent_tree = temp_tree;
temp_tree = temp_tree->right; temp_tree = temp_tree->right;
is_right = TRUE; is_right = TRUE;
is_left = FALSE; is_left = FALSE;
} }
else // if value equal, match found. else // if value equal, match found.
break; break;
@ -167,9 +167,9 @@ CUDPTreeNode *UDPTreeNodeSinglePop(I64 port, CUDPTreeNode *tree)
{ // pop a tree off, then add back in its sub-trees to main tree. { // pop a tree off, then add back in its sub-trees to main tree.
// original node sub-trees are cleared. // original node sub-trees are cleared.
// TODO: double check this logic ensure it's sound. // TODO: double check this logic ensure it's sound.
CUDPTreeNode *node = UDPTreeNodePop(port, tree); CUDPTreeNode *node = UDPTreeNodePop(port, tree);
CUDPTreeNode *left = node->left; CUDPTreeNode *left = node->left;
CUDPTreeNode *right = node->right; CUDPTreeNode *right = node->right;
if (node) if (node)
{ {
@ -243,24 +243,30 @@ CUDPTreeQueue *UDPTreeNodeQueueSocketFind(CUDPSocket *socket, CUDPTreeNode *node
return NULL; return NULL;
} }
CUDPTreeQueue *UDPTreeNodeQueueFind(U32 address, CUDPTreeNode *node) CUDPTreeQueue *UDPTreeNodeQueueIPV4Find(U32 address, CUDPTreeNode *node)
{ // address should be pulled from an instance of CIPV4Address (TODO... double check what bit order we're in ?) { // address should be pulled from an instance of CIPV4Address (TODO... double check what bit order we're in ?)
CUDPTreeQueue *temp_queue; CUDPTreeQueue *temp_queue;
CSocketAddressIPV4 *temp_ip;
if (node->queue) if (node->queue)
{ {
if (node->queue->socket->receive_address.family != AF_INET) if (node->queue->socket->receive_address.family == AF_INET)
Debug("This method was made for IPV4, UDP can be IPV4 or IPV6. excessive casting bad, TODO: revise method."); {
temp_ip = &node->queue->socket->receive_address;
if (node->queue->socket->receive_address(CSocketAddressIPV4).address == address) if (temp_ip->address == address)
return node->queue; return node->queue;
}
temp_queue = node->queue->next; temp_queue = node->queue->next;
while (temp_queue != node->queue) while (temp_queue != node->queue)
{ {
if (temp_queue->socket->receive_address(CSocketAddressIPV4).address == address) if (temp_queue->socket->receive_address.family == AF_INET)
return temp_queue; {
temp_ip = &temp_queue->socket->receive_address;
if (temp_ip->address == address)
return temp_queue;
}
temp_queue = temp_queue->next; temp_queue = temp_queue->next;
} }
@ -282,10 +288,11 @@ CUDPTreeQueue *UDPTreeNodeQueueSocketSinglePop(CUDPSocket *socket, CUDPTreeNode
if (temp_queue != temp_next) if (temp_queue != temp_next)
{ // if 2 or more entries in queue, stitch next&last, loop found queue { // if 2 or more entries in queue, stitch next&last, loop found queue
temp_last->next = temp_next; temp_last->next = temp_next;
temp_next->last = temp_last; temp_next->last = temp_last;
temp_queue->next = temp_queue; temp_queue->next = temp_queue;
temp_queue->last = temp_queue; temp_queue->last = temp_queue;
if (temp_queue == node->queue) // if entry to pop is node queue head, change head to next if (temp_queue == node->queue) // if entry to pop is node queue head, change head to next
node->queue = temp_next; node->queue = temp_next;
} }
@ -334,21 +341,21 @@ U0 UDPGlobalsInit()
} }
I64 UDPPacketAllocate(U8 **frame_out, I64 UDPPacketAllocate(U8 **frame_out,
U32 source_ip, U32 source_ip,
U16 source_port, U16 source_port,
U32 destination_ip, U32 destination_ip,
U16 destination_port, U16 destination_port,
I64 length) I64 length)
{ {
U8 *ethernet_frame; U8 *ethernet_frame;
I64 de_index; I64 de_index;
CUDPHeader *header; CUDPHeader *header;
de_index = IPV4PacketAllocate(&ethernet_frame, de_index = IPV4PacketAllocate(&ethernet_frame,
IP_PROTOCOL_UDP, IP_PROTOCOL_UDP,
source_ip, source_ip,
destination_ip, destination_ip,
sizeof(CUDPHeader) + length); sizeof(CUDPHeader) + length);
if (de_index < 0) if (de_index < 0)
{ {
ZenithLog("UDP Ethernet Frame Allocate failed.\n"); ZenithLog("UDP Ethernet Frame Allocate failed.\n");
@ -357,10 +364,10 @@ I64 UDPPacketAllocate(U8 **frame_out,
header = ethernet_frame; header = ethernet_frame;
header->source_port = EndianU16(source_port); header->source_port = EndianU16(source_port);
header->destination_port = EndianU16(destination_port); header->destination_port = EndianU16(destination_port);
header->length = EndianU16(sizeof(CUDPHeader) + length); header->length = EndianU16(sizeof(CUDPHeader) + length);
header->checksum = 0; header->checksum = 0;
*frame_out = ethernet_frame + sizeof(CUDPHeader); *frame_out = ethernet_frame + sizeof(CUDPHeader);
@ -372,10 +379,10 @@ U0 UDPPacketFinish(I64 de_index)
} }
I64 UDPParsePacket(U16 *source_port_out, I64 UDPParsePacket(U16 *source_port_out,
U16 *destination_port_out, U16 *destination_port_out,
U8 **data_out, U8 **data_out,
I64 *length_out, I64 *length_out,
CIPV4Packet *packet) CIPV4Packet *packet)
{ {
// check ip protocol? probably redundant // check ip protocol? probably redundant
@ -384,11 +391,11 @@ I64 UDPParsePacket(U16 *source_port_out,
// Shrine has FIXME, validate packet length! // Shrine has FIXME, validate packet length!
*source_port_out = EndianU16(header->source_port); *source_port_out = EndianU16(header->source_port);
*destination_port_out = EndianU16(header->destination_port); *destination_port_out = EndianU16(header->destination_port);
*data_out = packet->data + sizeof(CUDPHeader); *data_out = packet->data + sizeof(CUDPHeader);
*length_out = packet->length - sizeof(CUDPHeader); *length_out = packet->length - sizeof(CUDPHeader);
return 0; return 0;
@ -457,7 +464,7 @@ I64 UDPSocketBind(CUDPSocket *udp_socket, CSocketAddressStorage *address_in) //
if (temp_node) if (temp_node)
{ // if we find we have bound sockets at port, check address before adding to queue { // if we find we have bound sockets at port, check address before adding to queue
if (UDPTreeNodeQueueFind(udp_socket->receive_address(CSocketAddressIPV4).address.address, temp_node)) if (UDPTreeNodeQueueIPV4Find(udp_socket->receive_address(CSocketAddressIPV4).address.address, temp_node))
{ {
ZenithErr("Attempted UDP Socket Bind at an address already in Bound Socket Tree !\n"); ZenithErr("Attempted UDP Socket Bind at an address already in Bound Socket Tree !\n");
return -1; return -1;