From 3f666ff01107174f8fc1f8098ae01786412899e1 Mon Sep 17 00:00:00 2001 From: lohhiiccc <96543753+lohhiiccc@users.noreply.github.com> Date: Thu, 12 Mar 2026 16:36:47 +0100 Subject: [PATCH] refactor: move internal ping headers to internal/ping/ --- includes/internal/{ => ping}/callback.h | 0 includes/internal/{ => ping}/loop.h | 2 +- includes/internal/{ => ping}/output.h | 2 +- includes/internal/{ => ping}/ping_state.h | 4 ++-- includes/internal/{ => ping}/scheduler.h | 2 +- includes/internal/{ => ping}/send.h | 2 +- includes/internal/{ => ping}/stats.h | 0 includes/internal/{ => ping}/tracker.h | 4 ++++ src/core/callback.c | 10 +++++----- src/core/loop.c | 12 ++++++------ src/core/ping.c | 14 +++++++------- src/core/send.c | 4 ++-- src/output/error.c | 2 +- src/output/flood.c | 2 +- src/output/packet.c | 2 +- src/output/start.c | 2 +- src/output/summary.c | 6 +++--- src/scheduler/scheduler.c | 2 +- src/stats/stats.c | 2 +- src/tracker/init.c | 2 +- src/tracker/record_recv.c | 2 +- src/tracker/record_send.c | 2 +- tests/ping/stats/test_stats.c | 2 +- tests/ping/tracker/test_tracker.c | 2 +- 24 files changed, 44 insertions(+), 40 deletions(-) rename includes/internal/{ => ping}/callback.h (100%) rename includes/internal/{ => ping}/loop.h (76%) rename includes/internal/{ => ping}/output.h (94%) rename includes/internal/{ => ping}/ping_state.h (88%) rename includes/internal/{ => ping}/scheduler.h (87%) rename includes/internal/{ => ping}/send.h (77%) rename includes/internal/{ => ping}/stats.h (100%) rename includes/internal/{ => ping}/tracker.h (81%) diff --git a/includes/internal/callback.h b/includes/internal/ping/callback.h similarity index 100% rename from includes/internal/callback.h rename to includes/internal/ping/callback.h diff --git a/includes/internal/loop.h b/includes/internal/ping/loop.h similarity index 76% rename from includes/internal/loop.h rename to includes/internal/ping/loop.h index 5cbb13c..bfe3c1c 100644 --- a/includes/internal/loop.h +++ b/includes/internal/ping/loop.h @@ -2,7 +2,7 @@ #define PING_LOOP_H #include -#include "internal/ping_state.h" +#include "internal/ping/ping_state.h" void ping_loop(t_ping_state *state, size_t payload_len); diff --git a/includes/internal/output.h b/includes/internal/ping/output.h similarity index 94% rename from includes/internal/output.h rename to includes/internal/ping/output.h index e0ec9da..bf6a203 100644 --- a/includes/internal/output.h +++ b/includes/internal/ping/output.h @@ -5,7 +5,7 @@ #include #include "icmp.h" #include "ft_ping.h" -#include "internal/ping_state.h" +#include "internal/ping/ping_state.h" void ping_output_start(const t_ping_config *config, struct in_addr dest, size_t payload_bytes); diff --git a/includes/internal/ping_state.h b/includes/internal/ping/ping_state.h similarity index 88% rename from includes/internal/ping_state.h rename to includes/internal/ping/ping_state.h index da1dcc1..b6e0add 100644 --- a/includes/internal/ping_state.h +++ b/includes/internal/ping/ping_state.h @@ -7,8 +7,8 @@ #include #include "icmp.h" #include "ft_ping.h" -#include "internal/stats.h" -#include "internal/tracker.h" +#include "internal/ping/stats.h" +#include "internal/ping/tracker.h" typedef struct s_ping_state { icmp_handle_t *handle; diff --git a/includes/internal/scheduler.h b/includes/internal/ping/scheduler.h similarity index 87% rename from includes/internal/scheduler.h rename to includes/internal/ping/scheduler.h index ac698da..8720f0e 100644 --- a/includes/internal/scheduler.h +++ b/includes/internal/ping/scheduler.h @@ -2,7 +2,7 @@ #define PING_SCHEDULER_H #include -#include "internal/ping_state.h" +#include "internal/ping/ping_state.h" void ping_scheduler_init(t_ping_state *state); void ping_scheduler_arm(const t_ping_config *config); diff --git a/includes/internal/send.h b/includes/internal/ping/send.h similarity index 77% rename from includes/internal/send.h rename to includes/internal/ping/send.h index df634e7..01b7cac 100644 --- a/includes/internal/send.h +++ b/includes/internal/ping/send.h @@ -2,7 +2,7 @@ #define PING_SEND_H #include -#include "internal/ping_state.h" +#include "internal/ping/ping_state.h" int ping_send_one(t_ping_state *state, size_t payload_len); diff --git a/includes/internal/stats.h b/includes/internal/ping/stats.h similarity index 100% rename from includes/internal/stats.h rename to includes/internal/ping/stats.h diff --git a/includes/internal/tracker.h b/includes/internal/ping/tracker.h similarity index 81% rename from includes/internal/tracker.h rename to includes/internal/ping/tracker.h index 53a73a1..f8d40a0 100644 --- a/includes/internal/tracker.h +++ b/includes/internal/ping/tracker.h @@ -26,4 +26,8 @@ void ping_tracker_record_send(t_ping_tracker *t, uint16_t seq, const int64_t ping_tracker_record_recv(t_ping_tracker *t, uint16_t seq, const struct timespec *ts); +#define ping_tracker_sent(t) ((t)->nb_sent) +#define ping_tracker_recv(t) ((t)->nb_recv) +#define ping_tracker_lost(t) ((t)->nb_sent - (t)->nb_recv) + #endif diff --git a/src/core/callback.c b/src/core/callback.c index 0b1da8e..69f749a 100644 --- a/src/core/callback.c +++ b/src/core/callback.c @@ -1,11 +1,11 @@ #include "icmp.h" #include "icmp_types.h" #include "ft_ping_flags.h" -#include "internal/callback.h" -#include "internal/ping_state.h" -#include "internal/stats.h" -#include "internal/tracker.h" -#include "internal/output.h" +#include "internal/ping/callback.h" +#include "internal/ping/ping_state.h" +#include "internal/ping/stats.h" +#include "internal/ping/tracker.h" +#include "internal/ping/output.h" /* Forward declarations */ static int extract_our_echo(const icmp_reply_t *reply, uint16_t our_id, diff --git a/src/core/loop.c b/src/core/loop.c index 3fb28e8..5308c5d 100644 --- a/src/core/loop.c +++ b/src/core/loop.c @@ -2,12 +2,12 @@ #include "icmp.h" #include "ft_ping_flags.h" -#include "internal/loop.h" -#include "internal/send.h" -#include "internal/callback.h" -#include "internal/tracker.h" -#include "internal/output.h" -#include "internal/scheduler.h" +#include "internal/ping/loop.h" +#include "internal/ping/send.h" +#include "internal/ping/callback.h" +#include "internal/ping/tracker.h" +#include "internal/ping/output.h" +#include "internal/ping/scheduler.h" /* Forward declarations */ static int deadline_expired(const t_ping_state *state); diff --git a/src/core/ping.c b/src/core/ping.c index 2d5f1b8..3788ac2 100644 --- a/src/core/ping.c +++ b/src/core/ping.c @@ -4,13 +4,13 @@ #include "ping.h" #include "icmp.h" #include "ft_ping_flags.h" -#include "internal/ping_state.h" -#include "internal/stats.h" -#include "internal/tracker.h" -#include "internal/output.h" -#include "internal/scheduler.h" -#include "internal/send.h" -#include "internal/loop.h" +#include "internal/ping/ping_state.h" +#include "internal/ping/stats.h" +#include "internal/ping/tracker.h" +#include "internal/ping/output.h" +#include "internal/ping/scheduler.h" +#include "internal/ping/send.h" +#include "internal/ping/loop.h" /* Forward declarations */ static int ping_one(const t_ping_config *config, struct in_addr dest, diff --git a/src/core/send.c b/src/core/send.c index d4fe3d6..da35889 100644 --- a/src/core/send.c +++ b/src/core/send.c @@ -2,8 +2,8 @@ #include "icmp.h" #include "ft_ping_const.h" -#include "internal/send.h" -#include "internal/tracker.h" +#include "internal/ping/send.h" +#include "internal/ping/tracker.h" int ping_send_one(t_ping_state *state, size_t payload_len) diff --git a/src/output/error.c b/src/output/error.c index a7da7db..2afcee8 100644 --- a/src/output/error.c +++ b/src/output/error.c @@ -3,7 +3,7 @@ #include "icmp.h" #include "icmp_types.h" -#include "internal/output.h" +#include "internal/ping/output.h" /* Forward declarations */ static const char *error_msg_for(const icmp_reply_t *reply); diff --git a/src/output/flood.c b/src/output/flood.c index 0438d27..49e63f4 100644 --- a/src/output/flood.c +++ b/src/output/flood.c @@ -1,6 +1,6 @@ #include -#include "internal/output.h" +#include "internal/ping/output.h" void ping_output_flood_dot(void) diff --git a/src/output/packet.c b/src/output/packet.c index 0bf0c0a..9f9ded6 100644 --- a/src/output/packet.c +++ b/src/output/packet.c @@ -2,7 +2,7 @@ #include #include "ft_ping_flags.h" -#include "internal/output.h" +#include "internal/ping/output.h" void ping_output_packet(const icmp_reply_t *reply, uint16_t seq, diff --git a/src/output/start.c b/src/output/start.c index 098dbee..2b62673 100644 --- a/src/output/start.c +++ b/src/output/start.c @@ -3,7 +3,7 @@ #include #include "ft_ping_flags.h" -#include "internal/output.h" +#include "internal/ping/output.h" void ping_output_start(const t_ping_config *config, diff --git a/src/output/summary.c b/src/output/summary.c index 376d83e..ba6ea61 100644 --- a/src/output/summary.c +++ b/src/output/summary.c @@ -1,9 +1,9 @@ #include #include -#include "internal/output.h" -#include "internal/stats.h" -#include "internal/tracker.h" +#include "internal/ping/output.h" +#include "internal/ping/stats.h" +#include "internal/ping/tracker.h" /* Forward declarations */ static void print_loss_line(size_t sent, size_t ok_recv, size_t errors); diff --git a/src/scheduler/scheduler.c b/src/scheduler/scheduler.c index c3c1d56..50437e1 100644 --- a/src/scheduler/scheduler.c +++ b/src/scheduler/scheduler.c @@ -2,7 +2,7 @@ #include #include "ft_ping_flags.h" -#include "internal/scheduler.h" +#include "internal/ping/scheduler.h" /* Forward declarations */ static void sigalrm_handler(int sig); diff --git a/src/stats/stats.c b/src/stats/stats.c index 270d49b..d16fb60 100644 --- a/src/stats/stats.c +++ b/src/stats/stats.c @@ -1,7 +1,7 @@ #include #include -#include "internal/stats.h" +#include "internal/ping/stats.h" /* Forward declarations */ static double compute_mdev_ms(const t_ping_stats *s, double avg_ms); diff --git a/src/tracker/init.c b/src/tracker/init.c index dcb550b..5aab9e5 100644 --- a/src/tracker/init.c +++ b/src/tracker/init.c @@ -1,6 +1,6 @@ #include -#include "internal/tracker.h" +#include "internal/ping/tracker.h" void ping_tracker_init(t_ping_tracker *t) diff --git a/src/tracker/record_recv.c b/src/tracker/record_recv.c index 602db17..0b66ec8 100644 --- a/src/tracker/record_recv.c +++ b/src/tracker/record_recv.c @@ -1,7 +1,7 @@ #include #include "icmp.h" -#include "internal/tracker.h" +#include "internal/ping/tracker.h" int64_t ping_tracker_record_recv(t_ping_tracker *t, uint16_t seq, diff --git a/src/tracker/record_send.c b/src/tracker/record_send.c index c2b65ba..648905e 100644 --- a/src/tracker/record_send.c +++ b/src/tracker/record_send.c @@ -1,6 +1,6 @@ #include -#include "internal/tracker.h" +#include "internal/ping/tracker.h" void ping_tracker_record_send(t_ping_tracker *t, uint16_t seq, diff --git a/tests/ping/stats/test_stats.c b/tests/ping/stats/test_stats.c index 80341ea..65d0c6b 100644 --- a/tests/ping/stats/test_stats.c +++ b/tests/ping/stats/test_stats.c @@ -1,7 +1,7 @@ #include #include #include -#include "internal/stats.h" +#include "internal/ping/stats.h" Test(ping_stats, init_neutral) { diff --git a/tests/ping/tracker/test_tracker.c b/tests/ping/tracker/test_tracker.c index f6f91c3..43d9bc9 100644 --- a/tests/ping/tracker/test_tracker.c +++ b/tests/ping/tracker/test_tracker.c @@ -1,6 +1,6 @@ #include #include -#include "internal/tracker.h" +#include "internal/ping/tracker.h" static struct timespec make_ts(long sec, long nsec)