Skip to content

Added source port to pending messages and packets completed #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Morcules merged 1 commit into from
Mar 19, 2026
Merged

Added source port to pending messages and packets completed #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/cleanup_swiftnet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ void swiftnet_cleanup() {

allocator_destroy(&listener_memory_allocator);
allocator_destroy(&uint16_memory_allocator);
allocator_destroy(&packet_completed_key_allocator);
allocator_destroy(&pending_message_key_allocator);

#ifdef SWIFT_NET_INTERNAL_TESTING
printf("Bytes leaked: %d\nItems leaked: %d\n", bytes_leaked, items_leaked);
Expand Down
7 changes: 6 additions & 1 deletion src/execute_packet_callback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ static struct PacketCallbackQueueNode* const wait_for_next_packet_callback(struc

static inline void remove_pending_message_from_hashmap(struct SwiftNetHashMap* const pending_messages, struct SwiftNetPendingMessage* const pending_message) {
LOCK_ATOMIC_DATA_TYPE(&pending_messages->atomic_lock);

struct PendingMessagesKey key = {
.source_port = pending_message->source_port,
.packet_id = pending_message->packet_id
};

hashmap_remove(&pending_message->packet_id, sizeof(uint16_t), pending_messages);
hashmap_remove(&key, sizeof(key), pending_messages);

UNLOCK_ATOMIC_DATA_TYPE(&pending_messages->atomic_lock);
}
Expand Down
4 changes: 2 additions & 2 deletions src/initialize_client_connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ static inline struct SwiftNetClientConnection* const construct_client_connection
new_connection->pending_messages_memory_allocator = allocator_create(sizeof(struct SwiftNetPendingMessage), 100);
new_connection->packets_sending_memory_allocator = allocator_create(sizeof(struct SwiftNetPacketSending), 100);
new_connection->packets_completed_memory_allocator = allocator_create(sizeof(struct SwiftNetPacketCompleted), 100);
new_connection->packets_completed = hashmap_create(&uint16_memory_allocator);
new_connection->packets_completed = hashmap_create(&packet_completed_key_allocator);
new_connection->packets_sending = hashmap_create(&uint16_memory_allocator);
new_connection->pending_messages = hashmap_create(&uint16_memory_allocator);
new_connection->pending_messages = hashmap_create(&pending_message_key_allocator);

new_connection->packet_queue = (struct PacketQueue){
.first_node = NULL,
Expand Down
4 changes: 2 additions & 2 deletions src/initialize_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ static inline struct SwiftNetServer* const construct_server(const bool loopback,
new_server->packets_sending_memory_allocator = allocator_create(sizeof(struct SwiftNetPacketSending), 100);
new_server->packets_completed_memory_allocator = allocator_create(sizeof(struct SwiftNetPacketCompleted), 100);

new_server->packets_completed = hashmap_create(&uint16_memory_allocator);
new_server->packets_completed = hashmap_create(&packet_completed_key_allocator);
new_server->packets_sending = hashmap_create(&uint16_memory_allocator);
new_server->pending_messages = hashmap_create(&uint16_memory_allocator);
new_server->pending_messages = hashmap_create(&pending_message_key_allocator);

return new_server;
}
Expand Down
4 changes: 4 additions & 0 deletions src/initialize_swiftnet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ struct SwiftNetMemoryAllocator client_connection_memory_allocator;
struct SwiftNetMemoryAllocator listener_memory_allocator;
struct SwiftNetMemoryAllocator hashmap_item_memory_allocator;
struct SwiftNetMemoryAllocator uint16_memory_allocator;
struct SwiftNetMemoryAllocator pending_message_key_allocator;
struct SwiftNetMemoryAllocator packet_completed_key_allocator;

#ifdef SWIFT_NET_REQUESTS
struct SwiftNetMemoryAllocator requests_sent_memory_allocator;
Expand All @@ -58,6 +60,8 @@ static inline void initialize_allocators() {
listener_memory_allocator = allocator_create(sizeof(struct Listener), 100);
hashmap_item_memory_allocator = allocator_create(sizeof(struct SwiftNetHashMapItem), 0xFF);
uint16_memory_allocator = allocator_create(sizeof(uint16_t), 0xFF);
pending_message_key_allocator = allocator_create(sizeof(struct PendingMessagesKey), 0xFF);
packet_completed_key_allocator = allocator_create(sizeof(struct PacketCompletedKey), 0xFF);

#ifdef SWIFT_NET_REQUESTS
requests_sent_memory_allocator = allocator_create(sizeof(struct RequestSent), 100);
Expand Down
13 changes: 13 additions & 0 deletions src/internal/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,16 @@ enum AllocatorStackState {
ALLOCATOR_STACK_OCCUPIED = 1
};

struct PendingMessagesKey {
uint16_t source_port;
uint16_t packet_id;
};

struct PacketCompletedKey {
uint16_t source_port;
uint16_t packet_id;
};

struct Listener {
pcap_t* pcap;
pthread_t listener_thread;
Expand All @@ -166,6 +176,9 @@ extern uint64_t seed;

extern struct SwiftNetHashMap listeners;

extern struct SwiftNetMemoryAllocator pending_message_key_allocator;
extern struct SwiftNetMemoryAllocator packet_completed_key_allocator;

extern pthread_t memory_cleanup_thread;
extern _Atomic bool swiftnet_closing;

Expand Down
71 changes: 48 additions & 23 deletions src/process_packets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static inline const uint32_t return_lost_chunk_indexes(const uint8_t* const chun
return offset;
}

static inline void packet_completed(uint16_t packet_id, struct SwiftNetHashMap* const packets_completed_history, struct SwiftNetMemoryAllocator* const packets_completed_history_memory_allocator) {
static inline void packet_completed(const uint16_t packet_id, const uint16_t source_port, struct SwiftNetHashMap* const packets_completed_history, struct SwiftNetMemoryAllocator* const packets_completed_history_memory_allocator) {
struct SwiftNetPacketCompleted* const new_packet_completed = allocator_allocate(packets_completed_history_memory_allocator);
new_packet_completed->packet_id = packet_id;
new_packet_completed->marked_cleanup = false;
Expand All @@ -81,23 +81,39 @@ static inline void packet_completed(uint16_t packet_id, struct SwiftNetHashMap*

LOCK_ATOMIC_DATA_TYPE(&packets_completed_history->atomic_lock);

hashmap_insert(heap_key_data_location, sizeof(uint16_t), new_packet_completed, packets_completed_history);
struct PacketCompletedKey* const key = allocator_allocate(&packet_completed_key_allocator);
*key = (struct PacketCompletedKey){
.source_port = source_port,
.packet_id = packet_id
};

hashmap_insert(key, sizeof(struct PacketCompletedKey), new_packet_completed, packets_completed_history);

UNLOCK_ATOMIC_DATA_TYPE(&packets_completed_history->atomic_lock);

return;
}

static inline bool check_packet_already_completed(uint16_t packet_id, struct SwiftNetHashMap* const packets_completed_history) {
const struct SwiftNetPacketCompleted* const item = hashmap_get(&packet_id, sizeof(packet_id), packets_completed_history);
static inline bool check_packet_already_completed(const uint16_t packet_id, const uint16_t source_port, struct SwiftNetHashMap* const packets_completed_history) {
const struct PacketCompletedKey key = {
.packet_id = packet_id,
.source_port = source_port
};

const struct SwiftNetPacketCompleted* const item = hashmap_get(&key, sizeof(key), packets_completed_history);

return item != NULL;
}

static inline struct SwiftNetPendingMessage* const get_pending_message(struct SwiftNetHashMap* const pending_messages, const enum ConnectionType connection_type, uint16_t packet_id) {
static inline struct SwiftNetPendingMessage* const get_pending_message(struct SwiftNetHashMap* const pending_messages, const enum ConnectionType connection_type, const uint16_t packet_id, const uint16_t source_port) {
LOCK_ATOMIC_DATA_TYPE(&pending_messages->atomic_lock);

struct SwiftNetPendingMessage* const pending_message = hashmap_get(&packet_id, sizeof(uint16_t), pending_messages);
const struct PendingMessagesKey key = {
.source_port = source_port,
.packet_id = packet_id
};

struct SwiftNetPendingMessage* const pending_message = hashmap_get(&key, sizeof(key), pending_messages);

UNLOCK_ATOMIC_DATA_TYPE(&pending_messages->atomic_lock);

Expand Down Expand Up @@ -130,7 +146,7 @@ static inline void insert_callback_queue_node(struct PacketCallbackQueueNode* co

#ifdef SWIFT_NET_REQUESTS

static inline void handle_request_response(uint16_t packet_id, struct SwiftNetPendingMessage* const pending_message, void* const packet_data, struct SwiftNetHashMap* const pending_messages, struct SwiftNetMemoryAllocator* const pending_message_memory_allocator, const enum ConnectionType connection_type, const bool loopback) {
static inline void handle_request_response(uint16_t packet_id, struct SwiftNetPendingMessage* const pending_message, void* const packet_data, struct SwiftNetHashMap* const pending_messages, struct SwiftNetMemoryAllocator* const pending_message_memory_allocator, const enum ConnectionType connection_type, const bool loopback, const uint16_t source_port) {
bool is_valid_response = false;

LOCK_ATOMIC_DATA_TYPE(&requests_sent.atomic_lock);
Expand All @@ -153,7 +169,12 @@ static inline void handle_request_response(uint16_t packet_id, struct SwiftNetPe
if (pending_message != NULL) {
LOCK_ATOMIC_DATA_TYPE(&pending_messages->atomic_lock);

hashmap_remove(&packet_id, sizeof(uint16_t), pending_messages);
struct PendingMessagesKey key = {
.source_port = source_port,
.packet_id = packet_id
};

hashmap_remove(&key, sizeof(key), pending_messages);

UNLOCK_ATOMIC_DATA_TYPE(&pending_messages->atomic_lock);
}
Expand Down Expand Up @@ -196,7 +217,7 @@ static inline void chunk_received(uint8_t* const chunks_received, const uint32_t
chunks_received[byte] |= 1 << bit;
}

static inline struct SwiftNetPendingMessage* const create_new_pending_message(struct SwiftNetHashMap* const pending_messages, struct SwiftNetMemoryAllocator* const pending_messages_memory_allocator, const struct SwiftNetPacketInfo* const packet_info, const enum ConnectionType connection_type, const uint16_t packet_id) {
static inline struct SwiftNetPendingMessage* const create_new_pending_message(struct SwiftNetHashMap* const pending_messages, struct SwiftNetMemoryAllocator* const pending_messages_memory_allocator, const struct SwiftNetPacketInfo* const packet_info, const enum ConnectionType connection_type, const uint16_t packet_id, const uint16_t source_port) {
struct SwiftNetPendingMessage* const new_pending_message = allocator_allocate(pending_messages_memory_allocator);

uint8_t* const allocated_memory = malloc(packet_info->packet_length);
Expand All @@ -212,13 +233,17 @@ static inline struct SwiftNetPendingMessage* const create_new_pending_message(st
new_pending_message->chunks_received = calloc(chunks_received_byte_size, 1);

new_pending_message->packet_id = packet_id;
new_pending_message->source_port = source_port;

LOCK_ATOMIC_DATA_TYPE(&pending_messages->atomic_lock);

uint16_t* const packet_id_mem = allocator_allocate(&uint16_memory_allocator);
*packet_id_mem = packet_id;
struct PendingMessagesKey* const key = allocator_allocate(&pending_message_key_allocator);
*key = (struct PendingMessagesKey){
.source_port = source_port,
.packet_id = packet_id
};

hashmap_insert(packet_id_mem, sizeof(uint16_t), new_pending_message, pending_messages);
hashmap_insert(key, sizeof(struct PendingMessagesKey), new_pending_message, pending_messages);

UNLOCK_ATOMIC_DATA_TYPE(&pending_messages->atomic_lock);

Expand Down Expand Up @@ -391,9 +416,9 @@ static inline void swiftnet_process_packets(
{
const uint32_t mtu = MIN(packet_info.maximum_transmission_unit, maximum_transmission_unit);

struct SwiftNetPendingMessage* const pending_message = get_pending_message(pending_messages, connection_type, ip_header.ip_id);
struct SwiftNetPendingMessage* const pending_message = get_pending_message(pending_messages, connection_type, ip_header.ip_id, packet_info.port_info.source_port);
if(pending_message == NULL) {
const bool packet_already_completed = check_packet_already_completed(ip_header.ip_id, packets_completed_history);
const bool packet_already_completed = check_packet_already_completed(ip_header.ip_id, packet_info.port_info.source_port, packets_completed_history);
if(likely(packet_already_completed == true)) {
const struct ip send_packet_ip_header = construct_ip_header(ip_header.ip_src, PACKET_HEADER_SIZE, ip_header.ip_id);

Expand Down Expand Up @@ -506,7 +531,7 @@ static inline void swiftnet_process_packets(
break;
}

if (check_packet_already_completed(ip_header.ip_id, packets_completed_history)) {
if (check_packet_already_completed(ip_header.ip_id, packet_info.port_info.source_port, packets_completed_history)) {
allocator_free(&packet_buffer_memory_allocator, packet_buffer);
goto next_packet;
}
Expand All @@ -523,12 +548,12 @@ static inline void swiftnet_process_packets(
const uint32_t mtu = MIN(packet_info.maximum_transmission_unit, maximum_transmission_unit);
const uint32_t chunk_data_size = mtu - PACKET_HEADER_SIZE;

struct SwiftNetPendingMessage* const pending_message = get_pending_message(pending_messages, connection_type, ip_header.ip_id);
struct SwiftNetPendingMessage* const pending_message = get_pending_message(pending_messages, connection_type, ip_header.ip_id, packet_info.port_info.source_port);

if(pending_message == NULL) {
if(packet_info.packet_length > chunk_data_size) {
// Split packet into chunks
struct SwiftNetPendingMessage* const new_pending_message = create_new_pending_message(pending_messages, pending_messages_memory_allocator, &packet_info, connection_type, ip_header.ip_id);
struct SwiftNetPendingMessage* const new_pending_message = create_new_pending_message(pending_messages, pending_messages_memory_allocator, &packet_info, connection_type, ip_header.ip_id, packet_info.port_info.source_port);

new_pending_message->chunks_received_number++;

Expand All @@ -540,7 +565,7 @@ static inline void swiftnet_process_packets(

goto next_packet;
} else {
packet_completed(ip_header.ip_id, packets_completed_history, packets_completed_history_memory_allocator);
packet_completed(ip_header.ip_id, packet_info.port_info.source_port, packets_completed_history, packets_completed_history_memory_allocator);

if(connection_type == CONNECTION_TYPE_SERVER) {
struct SwiftNetServerPacketData* const new_packet_data = allocator_allocate(&server_packet_data_memory_allocator) ;
Expand All @@ -559,7 +584,7 @@ static inline void swiftnet_process_packets(

#ifdef SWIFT_NET_REQUESTS
if (packet_info.packet_type == RESPONSE) {
handle_request_response(ip_header.ip_id, NULL, new_packet_data, pending_messages, pending_messages_memory_allocator, connection_type, loopback);
handle_request_response(ip_header.ip_id, NULL, new_packet_data, pending_messages, pending_messages_memory_allocator, connection_type, loopback, packet_info.port_info.source_port);
} else {
pass_callback_execution(new_packet_data, packet_callback_queue, NULL, ip_header.ip_id, execute_callback_mtx, execute_callback_cond);
}
Expand All @@ -582,7 +607,7 @@ static inline void swiftnet_process_packets(

#ifdef SWIFT_NET_REQUESTS
if (packet_info.packet_type == RESPONSE) {
handle_request_response(ip_header.ip_id, NULL, new_packet_data, pending_messages, pending_messages_memory_allocator, connection_type, loopback);
handle_request_response(ip_header.ip_id, NULL, new_packet_data, pending_messages, pending_messages_memory_allocator, connection_type, loopback, packet_info.port_info.source_port);
} else {
pass_callback_execution(new_packet_data, packet_callback_queue, NULL, ip_header.ip_id, execute_callback_mtx, execute_callback_cond);
}
Expand Down Expand Up @@ -622,7 +647,7 @@ static inline void swiftnet_process_packets(
}
#endif

packet_completed(ip_header.ip_id, packets_completed_history, packets_completed_history_memory_allocator);
packet_completed(ip_header.ip_id, packet_info.port_info.source_port, packets_completed_history, packets_completed_history_memory_allocator);

if(connection_type == CONNECTION_TYPE_SERVER) {
uint8_t* const ptr = pending_message->packet_data_start;
Expand All @@ -643,7 +668,7 @@ static inline void swiftnet_process_packets(

#ifdef SWIFT_NET_REQUESTS
if (packet_info.packet_type == RESPONSE) {
handle_request_response(ip_header.ip_id, pending_message, packet_data, pending_messages, pending_messages_memory_allocator, connection_type, loopback);
handle_request_response(ip_header.ip_id, pending_message, packet_data, pending_messages, pending_messages_memory_allocator, connection_type, loopback, packet_info.port_info.source_port);
} else {
pass_callback_execution(packet_data, packet_callback_queue, pending_message, ip_header.ip_id, execute_callback_mtx, execute_callback_cond);
}
Expand All @@ -668,7 +693,7 @@ static inline void swiftnet_process_packets(

#ifdef SWIFT_NET_REQUESTS
if (packet_info.packet_type == RESPONSE) {
handle_request_response(ip_header.ip_id, pending_message, packet_data, pending_messages, pending_messages_memory_allocator, connection_type, loopback);
handle_request_response(ip_header.ip_id, pending_message, packet_data, pending_messages, pending_messages_memory_allocator, connection_type, loopback, packet_info.port_info.source_port);
} else {
pass_callback_execution(packet_data, packet_callback_queue, pending_message, ip_header.ip_id, execute_callback_mtx, execute_callback_cond);
}
Expand Down
1 change: 1 addition & 0 deletions src/swift_net.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ struct SwiftNetPendingMessage {
struct SwiftNetPacketInfo packet_info;
uint32_t chunks_received_length;
uint32_t chunks_received_number;
uint16_t source_port;
uint16_t packet_id;
};

Expand Down
Loading