From ab90dbb07f88fe587c3f0c755e8be7701e21f942 Mon Sep 17 00:00:00 2001 From: lohhiiccc <96543753+lohhiiccc@users.noreply.github.com> Date: Thu, 12 Mar 2026 16:45:11 +0100 Subject: [PATCH] refactor: reorganize src/ and includes/ for multi-binary support --- Makefile | 14 +++-- includes/internal/cli/arg_handler.h | 2 +- includes/internal/cli/messages.h | 2 +- includes/internal/cli/parse_utils.h | 2 +- includes/internal/ping/output.h | 2 +- includes/internal/ping/ping_state.h | 2 +- includes/{ => ping}/cli.h | 2 +- includes/{ => ping}/ft_ping.h | 0 includes/{ => ping}/ft_ping_const.h | 0 includes/{ => ping}/ft_ping_flags.h | 0 includes/{ => ping}/ping.h | 2 +- sources.mk | 58 ------------------- sources/ping.mk | 58 +++++++++++++++++++ src/{ => ping}/cli/config_free.c | 2 +- src/{ => ping}/cli/handlers/handle_count.c | 2 +- src/{ => ping}/cli/handlers/handle_deadline.c | 2 +- src/{ => ping}/cli/handlers/handle_flood.c | 4 +- src/{ => ping}/cli/handlers/handle_help.c | 2 +- src/{ => ping}/cli/handlers/handle_interval.c | 2 +- src/{ => ping}/cli/handlers/handle_quiet.c | 4 +- src/{ => ping}/cli/handlers/handle_size.c | 2 +- src/{ => ping}/cli/handlers/handle_timeout.c | 2 +- src/{ => ping}/cli/handlers/handle_ttl.c | 2 +- src/{ => ping}/cli/handlers/handle_verbose.c | 6 +- src/{ => ping}/cli/handlers/handle_version.c | 2 +- src/{ => ping}/cli/handlers/option_map.c | 0 src/{ => ping}/cli/messages/error.c | 2 +- src/{ => ping}/cli/messages/help.c | 0 src/{ => ping}/cli/messages/version.c | 0 src/{ => ping}/cli/parse.c | 6 +- src/{ => ping}/cli/parse_utils/get_optstr.c | 0 .../cli/parse_utils/parse_destinations.c | 2 +- src/{ => ping}/cli/parse_utils/parse_float.c | 0 .../cli/parse_utils/parse_inet_addr.c | 0 src/{ => ping}/cli/parse_utils/parse_int.c | 0 src/{ => ping}/core/callback.c | 2 +- src/{ => ping}/core/loop.c | 2 +- src/{ => ping}/core/ping.c | 4 +- src/{ => ping}/core/send.c | 2 +- src/{ => ping}/main.c | 4 +- src/{ => ping}/output/error.c | 0 src/{ => ping}/output/flood.c | 0 src/{ => ping}/output/packet.c | 2 +- src/{ => ping}/output/start.c | 2 +- src/{ => ping}/output/summary.c | 0 src/{ => ping}/scheduler/scheduler.c | 2 +- src/{ => ping}/stats/stats.c | 0 src/{ => ping}/tracker/init.c | 0 src/{ => ping}/tracker/record_recv.c | 0 src/{ => ping}/tracker/record_send.c | 0 tests/cli/handlers/test_handle_count.c | 2 +- tests/cli/handlers/test_handle_flood.c | 4 +- tests/cli/handlers/test_handle_help.c | 2 +- tests/cli/handlers/test_handle_interval.c | 2 +- tests/cli/handlers/test_handle_quiet.c | 4 +- tests/cli/handlers/test_handle_size.c | 2 +- tests/cli/handlers/test_handle_timeout.c | 2 +- tests/cli/handlers/test_handle_ttl.c | 2 +- tests/cli/handlers/test_handle_verbose.c | 4 +- tests/cli/handlers/test_handle_version.c | 2 +- 60 files changed, 119 insertions(+), 113 deletions(-) rename includes/{ => ping}/cli.h (91%) rename includes/{ => ping}/ft_ping.h (100%) rename includes/{ => ping}/ft_ping_const.h (100%) rename includes/{ => ping}/ft_ping_flags.h (100%) rename includes/{ => ping}/ping.h (76%) delete mode 100644 sources.mk create mode 100644 sources/ping.mk rename src/{ => ping}/cli/config_free.c (85%) rename src/{ => ping}/cli/handlers/handle_count.c (92%) rename src/{ => ping}/cli/handlers/handle_deadline.c (92%) rename src/{ => ping}/cli/handlers/handle_flood.c (71%) rename src/{ => ping}/cli/handlers/handle_help.c (90%) rename src/{ => ping}/cli/handlers/handle_interval.c (93%) rename src/{ => ping}/cli/handlers/handle_quiet.c (71%) rename src/{ => ping}/cli/handlers/handle_size.c (93%) rename src/{ => ping}/cli/handlers/handle_timeout.c (92%) rename src/{ => ping}/cli/handlers/handle_ttl.c (93%) rename src/{ => ping}/cli/handlers/handle_verbose.c (63%) rename src/{ => ping}/cli/handlers/handle_version.c (90%) rename src/{ => ping}/cli/handlers/option_map.c (100%) rename src/{ => ping}/cli/messages/error.c (98%) rename src/{ => ping}/cli/messages/help.c (100%) rename src/{ => ping}/cli/messages/version.c (100%) rename src/{ => ping}/cli/parse.c (97%) rename src/{ => ping}/cli/parse_utils/get_optstr.c (100%) rename src/{ => ping}/cli/parse_utils/parse_destinations.c (96%) rename src/{ => ping}/cli/parse_utils/parse_float.c (100%) rename src/{ => ping}/cli/parse_utils/parse_inet_addr.c (100%) rename src/{ => ping}/cli/parse_utils/parse_int.c (100%) rename src/{ => ping}/core/callback.c (98%) rename src/{ => ping}/core/loop.c (98%) rename src/{ => ping}/core/ping.c (97%) rename src/{ => ping}/core/send.c (93%) rename src/{ => ping}/main.c (94%) rename src/{ => ping}/output/error.c (100%) rename src/{ => ping}/output/flood.c (100%) rename src/{ => ping}/output/packet.c (94%) rename src/{ => ping}/output/start.c (94%) rename src/{ => ping}/output/summary.c (100%) rename src/{ => ping}/scheduler/scheduler.c (97%) rename src/{ => ping}/stats/stats.c (100%) rename src/{ => ping}/tracker/init.c (100%) rename src/{ => ping}/tracker/record_recv.c (100%) rename src/{ => ping}/tracker/record_send.c (100%) diff --git a/Makefile b/Makefile index 84097ae..c20db51 100644 --- a/Makefile +++ b/Makefile @@ -28,8 +28,14 @@ endif .DEFAULT_GOAL := all MAKEFLAGS += --no-print-directory +BINARIES = ft_ping +# Future: BINARIES = ft_ping ft_traceroute + # Include source files -include sources.mk +include sources/ping.mk + +SRCS = $(PING_SRCS) +TESTS = $(PING_TESTS) # Get libicmp sources for dependency tracking if building locally ifeq ($(BUILD_LOCAL_LIBICMP),yes) @@ -39,7 +45,7 @@ endif # Build Directories OBJ_DIR = build -OBJS = $(SRCS:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o) +OBJS = $(SRCS:src/%.c=$(OBJ_DIR)/%.o) DEPS = $(OBJS:.o=.d) # Build Rules @@ -96,7 +102,7 @@ $(NAME): $(OBJS) $(LIBICMP_DEP) @echo "[OK] $(NAME) built successfully" # Compile object files -$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c +$(OBJ_DIR)/%.o: src/%.c @mkdir -p $(dir $@) $(CC) $(CPPFLAGS) $(CFLAGS) -MMD -MP -c $< -o $@ @@ -122,7 +128,7 @@ endif @echo "[OK] All tests passed" -$(TEST_BIN): $(VERSION_HEADER) $(TESTS) $(filter-out $(OBJ_DIR)/main.o,$(OBJS)) $(LIBICMP_DEP) +$(TEST_BIN): $(VERSION_HEADER) $(TESTS) $(filter-out $(OBJ_DIR)/ping/main.o,$(OBJS)) $(LIBICMP_DEP) @mkdir -p $(dir $@) @echo "[BUILD] Building test binary..." $(CC) $(CPPFLAGS) $(CFLAGS) $(filter-out $(VERSION_HEADER),$^) $(LDFLAGS) $(TEST_LDFLAGS) -o $@ diff --git a/includes/internal/cli/arg_handler.h b/includes/internal/cli/arg_handler.h index 60b8ce0..36d8990 100644 --- a/includes/internal/cli/arg_handler.h +++ b/includes/internal/cli/arg_handler.h @@ -1,7 +1,7 @@ #ifndef CLI_INTERNAL_ARG_HANDLER #define CLI_INTERNAL_ARG_HANDLER -#include "ft_ping.h" +#include "ping/ft_ping.h" typedef int (*t_option_handler)(const char *arg, t_ping_config *config); diff --git a/includes/internal/cli/messages.h b/includes/internal/cli/messages.h index 4bfb1e2..a31eac1 100644 --- a/includes/internal/cli/messages.h +++ b/includes/internal/cli/messages.h @@ -1,7 +1,7 @@ #ifndef CLI_INTERNAL_MESSAGES #define CLI_INTERNAL_MESSAGES -#include "cli.h" +#include "ping/cli.h" void print_help(void); void print_version(void); diff --git a/includes/internal/cli/parse_utils.h b/includes/internal/cli/parse_utils.h index 71e21e9..01b8703 100644 --- a/includes/internal/cli/parse_utils.h +++ b/includes/internal/cli/parse_utils.h @@ -3,7 +3,7 @@ #include #include -#include "ft_ping.h" +#include "ping/ft_ping.h" int cli_parse_uint64(const char *s, uint64_t *out); int cli_parse_float(const char *s, float *out); diff --git a/includes/internal/ping/output.h b/includes/internal/ping/output.h index bf6a203..21aeaa6 100644 --- a/includes/internal/ping/output.h +++ b/includes/internal/ping/output.h @@ -4,7 +4,7 @@ #include #include #include "icmp.h" -#include "ft_ping.h" +#include "ping/ft_ping.h" #include "internal/ping/ping_state.h" void ping_output_start(const t_ping_config *config, diff --git a/includes/internal/ping/ping_state.h b/includes/internal/ping/ping_state.h index b6e0add..d7e7a01 100644 --- a/includes/internal/ping/ping_state.h +++ b/includes/internal/ping/ping_state.h @@ -6,7 +6,7 @@ #include #include #include "icmp.h" -#include "ft_ping.h" +#include "ping/ft_ping.h" #include "internal/ping/stats.h" #include "internal/ping/tracker.h" diff --git a/includes/cli.h b/includes/ping/cli.h similarity index 91% rename from includes/cli.h rename to includes/ping/cli.h index 63582e0..67d0c8c 100644 --- a/includes/cli.h +++ b/includes/ping/cli.h @@ -1,7 +1,7 @@ #ifndef PING_CLI_H #define PING_CLI_H -#include "ft_ping.h" +#include "ping/ft_ping.h" enum e_cli_code { CLI_EXIT_SUCCESS = -1, diff --git a/includes/ft_ping.h b/includes/ping/ft_ping.h similarity index 100% rename from includes/ft_ping.h rename to includes/ping/ft_ping.h diff --git a/includes/ft_ping_const.h b/includes/ping/ft_ping_const.h similarity index 100% rename from includes/ft_ping_const.h rename to includes/ping/ft_ping_const.h diff --git a/includes/ft_ping_flags.h b/includes/ping/ft_ping_flags.h similarity index 100% rename from includes/ft_ping_flags.h rename to includes/ping/ft_ping_flags.h diff --git a/includes/ping.h b/includes/ping/ping.h similarity index 76% rename from includes/ping.h rename to includes/ping/ping.h index 51b9590..419f70e 100644 --- a/includes/ping.h +++ b/includes/ping/ping.h @@ -1,7 +1,7 @@ #ifndef PING_H #define PING_H -#include "ft_ping.h" +#include "ping/ft_ping.h" int ping_run(const t_ping_config *config); diff --git a/sources.mk b/sources.mk deleted file mode 100644 index 68b68a1..0000000 --- a/sources.mk +++ /dev/null @@ -1,58 +0,0 @@ - -SRC_DIR = src -SRCS = $(SRC_DIR)/main.c \ - $(SRC_DIR)/cli/parse.c \ - $(SRC_DIR)/cli/handlers/handle_count.c \ - $(SRC_DIR)/cli/handlers/handle_deadline.c \ - $(SRC_DIR)/cli/handlers/handle_flood.c \ - $(SRC_DIR)/cli/handlers/handle_help.c \ - $(SRC_DIR)/cli/handlers/handle_interval.c \ - $(SRC_DIR)/cli/handlers/handle_quiet.c \ - $(SRC_DIR)/cli/handlers/option_map.c \ - $(SRC_DIR)/cli/handlers/handle_size.c \ - $(SRC_DIR)/cli/handlers/handle_timeout.c \ - $(SRC_DIR)/cli/handlers/handle_ttl.c \ - $(SRC_DIR)/cli/handlers/handle_version.c \ - $(SRC_DIR)/cli/handlers/handle_verbose.c \ - $(SRC_DIR)/cli/parse_utils/parse_int.c \ - $(SRC_DIR)/cli/parse_utils/parse_float.c \ - $(SRC_DIR)/cli/parse_utils/parse_inet_addr.c \ - $(SRC_DIR)/cli/parse_utils/parse_destinations.c \ - $(SRC_DIR)/cli/parse_utils/get_optstr.c \ - $(SRC_DIR)/cli/config_free.c \ - $(SRC_DIR)/cli/messages/help.c \ - $(SRC_DIR)/cli/messages/version.c \ - $(SRC_DIR)/cli/messages/error.c \ - $(SRC_DIR)/core/ping.c \ - $(SRC_DIR)/core/loop.c \ - $(SRC_DIR)/core/send.c \ - $(SRC_DIR)/core/callback.c \ - $(SRC_DIR)/stats/stats.c \ - $(SRC_DIR)/tracker/init.c \ - $(SRC_DIR)/tracker/record_send.c \ - $(SRC_DIR)/tracker/record_recv.c \ - $(SRC_DIR)/output/start.c \ - $(SRC_DIR)/output/packet.c \ - $(SRC_DIR)/output/error.c \ - $(SRC_DIR)/output/summary.c \ - $(SRC_DIR)/output/flood.c \ - $(SRC_DIR)/scheduler/scheduler.c \ - -TESTS_DIR = tests -TESTS = $(TESTS_DIR)/test_main.c \ - $(TESTS_DIR)/cli/handlers/test_handle_count.c \ - $(TESTS_DIR)/cli/handlers/test_handle_flood.c \ - $(TESTS_DIR)/cli/handlers/test_handle_help.c \ - $(TESTS_DIR)/cli/handlers/test_handle_interval.c \ - $(TESTS_DIR)/cli/handlers/test_handle_quiet.c \ - $(TESTS_DIR)/cli/handlers/test_handler_map.c \ - $(TESTS_DIR)/cli/handlers/test_handle_size.c \ - $(TESTS_DIR)/cli/handlers/test_handle_timeout.c \ - $(TESTS_DIR)/cli/handlers/test_handle_ttl.c \ - $(TESTS_DIR)/cli/handlers/test_handle_version.c \ - $(TESTS_DIR)/cli/handlers/test_handle_verbose.c \ - $(TESTS_DIR)/cli/parse_utils/test_parse_int.c \ - $(TESTS_DIR)/cli/parse_utils/test_parse_float.c \ - $(TESTS_DIR)/ping/stats/test_stats.c \ - $(TESTS_DIR)/ping/tracker/test_tracker.c \ - diff --git a/sources/ping.mk b/sources/ping.mk new file mode 100644 index 0000000..7e2dcf2 --- /dev/null +++ b/sources/ping.mk @@ -0,0 +1,58 @@ + +PING_SRC_DIR = src/ping +PING_SRCS = $(PING_SRC_DIR)/main.c \ + $(PING_SRC_DIR)/cli/parse.c \ + $(PING_SRC_DIR)/cli/handlers/handle_count.c \ + $(PING_SRC_DIR)/cli/handlers/handle_deadline.c \ + $(PING_SRC_DIR)/cli/handlers/handle_flood.c \ + $(PING_SRC_DIR)/cli/handlers/handle_help.c \ + $(PING_SRC_DIR)/cli/handlers/handle_interval.c \ + $(PING_SRC_DIR)/cli/handlers/handle_quiet.c \ + $(PING_SRC_DIR)/cli/handlers/option_map.c \ + $(PING_SRC_DIR)/cli/handlers/handle_size.c \ + $(PING_SRC_DIR)/cli/handlers/handle_timeout.c \ + $(PING_SRC_DIR)/cli/handlers/handle_ttl.c \ + $(PING_SRC_DIR)/cli/handlers/handle_version.c \ + $(PING_SRC_DIR)/cli/handlers/handle_verbose.c \ + $(PING_SRC_DIR)/cli/parse_utils/parse_int.c \ + $(PING_SRC_DIR)/cli/parse_utils/parse_float.c \ + $(PING_SRC_DIR)/cli/parse_utils/parse_inet_addr.c \ + $(PING_SRC_DIR)/cli/parse_utils/parse_destinations.c \ + $(PING_SRC_DIR)/cli/parse_utils/get_optstr.c \ + $(PING_SRC_DIR)/cli/config_free.c \ + $(PING_SRC_DIR)/cli/messages/help.c \ + $(PING_SRC_DIR)/cli/messages/version.c \ + $(PING_SRC_DIR)/cli/messages/error.c \ + $(PING_SRC_DIR)/core/ping.c \ + $(PING_SRC_DIR)/core/loop.c \ + $(PING_SRC_DIR)/core/send.c \ + $(PING_SRC_DIR)/core/callback.c \ + $(PING_SRC_DIR)/stats/stats.c \ + $(PING_SRC_DIR)/tracker/init.c \ + $(PING_SRC_DIR)/tracker/record_send.c \ + $(PING_SRC_DIR)/tracker/record_recv.c \ + $(PING_SRC_DIR)/output/start.c \ + $(PING_SRC_DIR)/output/packet.c \ + $(PING_SRC_DIR)/output/error.c \ + $(PING_SRC_DIR)/output/summary.c \ + $(PING_SRC_DIR)/output/flood.c \ + $(PING_SRC_DIR)/scheduler/scheduler.c \ + +PING_TESTS_DIR = tests +PING_TESTS = $(PING_TESTS_DIR)/test_main.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_count.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_flood.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_help.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_interval.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_quiet.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handler_map.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_size.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_timeout.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_ttl.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_version.c \ + $(PING_TESTS_DIR)/cli/handlers/test_handle_verbose.c \ + $(PING_TESTS_DIR)/cli/parse_utils/test_parse_int.c \ + $(PING_TESTS_DIR)/cli/parse_utils/test_parse_float.c \ + $(PING_TESTS_DIR)/ping/stats/test_stats.c \ + $(PING_TESTS_DIR)/ping/tracker/test_tracker.c \ + diff --git a/src/cli/config_free.c b/src/ping/cli/config_free.c similarity index 85% rename from src/cli/config_free.c rename to src/ping/cli/config_free.c index 557270a..119813f 100644 --- a/src/cli/config_free.c +++ b/src/ping/cli/config_free.c @@ -1,6 +1,6 @@ #include -#include "cli.h" +#include "ping/cli.h" void cli_config_free(t_ping_config *config) diff --git a/src/cli/handlers/handle_count.c b/src/ping/cli/handlers/handle_count.c similarity index 92% rename from src/cli/handlers/handle_count.c rename to src/ping/cli/handlers/handle_count.c index 4551b9c..83d31b2 100644 --- a/src/cli/handlers/handle_count.c +++ b/src/ping/cli/handlers/handle_count.c @@ -1,6 +1,6 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" #include "internal/cli/parse_utils.h" diff --git a/src/cli/handlers/handle_deadline.c b/src/ping/cli/handlers/handle_deadline.c similarity index 92% rename from src/cli/handlers/handle_deadline.c rename to src/ping/cli/handlers/handle_deadline.c index f63b7c2..cb53683 100644 --- a/src/cli/handlers/handle_deadline.c +++ b/src/ping/cli/handlers/handle_deadline.c @@ -1,4 +1,4 @@ -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" #include "internal/cli/parse_utils.h" diff --git a/src/cli/handlers/handle_flood.c b/src/ping/cli/handlers/handle_flood.c similarity index 71% rename from src/cli/handlers/handle_flood.c rename to src/ping/cli/handlers/handle_flood.c index 94b1fbd..1c13d75 100644 --- a/src/cli/handlers/handle_flood.c +++ b/src/ping/cli/handlers/handle_flood.c @@ -1,5 +1,5 @@ -#include "cli.h" -#include "ft_ping_flags.h" +#include "ping/cli.h" +#include "ping/ft_ping_flags.h" int cli_handle_flood(const char *arg, t_ping_config *config) diff --git a/src/cli/handlers/handle_help.c b/src/ping/cli/handlers/handle_help.c similarity index 90% rename from src/cli/handlers/handle_help.c rename to src/ping/cli/handlers/handle_help.c index 751da0d..eb72d9e 100644 --- a/src/cli/handlers/handle_help.c +++ b/src/ping/cli/handlers/handle_help.c @@ -1,4 +1,4 @@ -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" #include "internal/cli/messages.h" diff --git a/src/cli/handlers/handle_interval.c b/src/ping/cli/handlers/handle_interval.c similarity index 93% rename from src/cli/handlers/handle_interval.c rename to src/ping/cli/handlers/handle_interval.c index 3fef735..8366089 100644 --- a/src/cli/handlers/handle_interval.c +++ b/src/ping/cli/handlers/handle_interval.c @@ -1,6 +1,6 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" #include "internal/cli/parse_utils.h" diff --git a/src/cli/handlers/handle_quiet.c b/src/ping/cli/handlers/handle_quiet.c similarity index 71% rename from src/cli/handlers/handle_quiet.c rename to src/ping/cli/handlers/handle_quiet.c index 39bc729..fa8d039 100644 --- a/src/cli/handlers/handle_quiet.c +++ b/src/ping/cli/handlers/handle_quiet.c @@ -1,5 +1,5 @@ -#include "cli.h" -#include "ft_ping_flags.h" +#include "ping/cli.h" +#include "ping/ft_ping_flags.h" int cli_handle_quiet(const char *arg, t_ping_config *config) diff --git a/src/cli/handlers/handle_size.c b/src/ping/cli/handlers/handle_size.c similarity index 93% rename from src/cli/handlers/handle_size.c rename to src/ping/cli/handlers/handle_size.c index 18307b2..0c23598 100644 --- a/src/cli/handlers/handle_size.c +++ b/src/ping/cli/handlers/handle_size.c @@ -1,6 +1,6 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" #include "internal/cli/parse_utils.h" diff --git a/src/cli/handlers/handle_timeout.c b/src/ping/cli/handlers/handle_timeout.c similarity index 92% rename from src/cli/handlers/handle_timeout.c rename to src/ping/cli/handlers/handle_timeout.c index 50e6c05..fa678be 100644 --- a/src/cli/handlers/handle_timeout.c +++ b/src/ping/cli/handlers/handle_timeout.c @@ -1,6 +1,6 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" #include "internal/cli/parse_utils.h" diff --git a/src/cli/handlers/handle_ttl.c b/src/ping/cli/handlers/handle_ttl.c similarity index 93% rename from src/cli/handlers/handle_ttl.c rename to src/ping/cli/handlers/handle_ttl.c index f19d575..e160478 100644 --- a/src/cli/handlers/handle_ttl.c +++ b/src/ping/cli/handlers/handle_ttl.c @@ -1,6 +1,6 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" #include "internal/cli/parse_utils.h" diff --git a/src/cli/handlers/handle_verbose.c b/src/ping/cli/handlers/handle_verbose.c similarity index 63% rename from src/cli/handlers/handle_verbose.c rename to src/ping/cli/handlers/handle_verbose.c index 8ef3447..9b225d8 100644 --- a/src/cli/handlers/handle_verbose.c +++ b/src/ping/cli/handlers/handle_verbose.c @@ -1,6 +1,6 @@ -#include "cli.h" -#include "ft_ping.h" -#include "ft_ping_flags.h" +#include "ping/cli.h" +#include "ping/ft_ping.h" +#include "ping/ft_ping_flags.h" int cli_handle_verbose(const char *arg, t_ping_config *config) diff --git a/src/cli/handlers/handle_version.c b/src/ping/cli/handlers/handle_version.c similarity index 90% rename from src/cli/handlers/handle_version.c rename to src/ping/cli/handlers/handle_version.c index 546e6e0..868e792 100644 --- a/src/cli/handlers/handle_version.c +++ b/src/ping/cli/handlers/handle_version.c @@ -1,4 +1,4 @@ -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" #include "internal/cli/messages.h" diff --git a/src/cli/handlers/option_map.c b/src/ping/cli/handlers/option_map.c similarity index 100% rename from src/cli/handlers/option_map.c rename to src/ping/cli/handlers/option_map.c diff --git a/src/cli/messages/error.c b/src/ping/cli/messages/error.c similarity index 98% rename from src/cli/messages/error.c rename to src/ping/cli/messages/error.c index 760cfba..f4c30a7 100644 --- a/src/cli/messages/error.c +++ b/src/ping/cli/messages/error.c @@ -1,7 +1,7 @@ #include #include -#include "cli.h" +#include "ping/cli.h" #include "version_gen.h" #define CMD_NAME g_prog_name.name diff --git a/src/cli/messages/help.c b/src/ping/cli/messages/help.c similarity index 100% rename from src/cli/messages/help.c rename to src/ping/cli/messages/help.c diff --git a/src/cli/messages/version.c b/src/ping/cli/messages/version.c similarity index 100% rename from src/cli/messages/version.c rename to src/ping/cli/messages/version.c diff --git a/src/cli/parse.c b/src/ping/cli/parse.c similarity index 97% rename from src/cli/parse.c rename to src/ping/cli/parse.c index 64e3ecb..aac4e0a 100644 --- a/src/cli/parse.c +++ b/src/ping/cli/parse.c @@ -2,9 +2,9 @@ #include #include -#include "cli.h" -#include "ft_ping_flags.h" -#include "ft_ping_const.h" +#include "ping/cli.h" +#include "ping/ft_ping_flags.h" +#include "ping/ft_ping_const.h" #include "internal/cli/messages.h" #include "internal/cli/options.h" #include "internal/cli/arg_handler.h" diff --git a/src/cli/parse_utils/get_optstr.c b/src/ping/cli/parse_utils/get_optstr.c similarity index 100% rename from src/cli/parse_utils/get_optstr.c rename to src/ping/cli/parse_utils/get_optstr.c diff --git a/src/cli/parse_utils/parse_destinations.c b/src/ping/cli/parse_utils/parse_destinations.c similarity index 96% rename from src/cli/parse_utils/parse_destinations.c rename to src/ping/cli/parse_utils/parse_destinations.c index 84d55e9..f1bab40 100644 --- a/src/cli/parse_utils/parse_destinations.c +++ b/src/ping/cli/parse_utils/parse_destinations.c @@ -1,6 +1,6 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/messages.h" #include "internal/cli/parse_utils.h" diff --git a/src/cli/parse_utils/parse_float.c b/src/ping/cli/parse_utils/parse_float.c similarity index 100% rename from src/cli/parse_utils/parse_float.c rename to src/ping/cli/parse_utils/parse_float.c diff --git a/src/cli/parse_utils/parse_inet_addr.c b/src/ping/cli/parse_utils/parse_inet_addr.c similarity index 100% rename from src/cli/parse_utils/parse_inet_addr.c rename to src/ping/cli/parse_utils/parse_inet_addr.c diff --git a/src/cli/parse_utils/parse_int.c b/src/ping/cli/parse_utils/parse_int.c similarity index 100% rename from src/cli/parse_utils/parse_int.c rename to src/ping/cli/parse_utils/parse_int.c diff --git a/src/core/callback.c b/src/ping/core/callback.c similarity index 98% rename from src/core/callback.c rename to src/ping/core/callback.c index 69f749a..66ab895 100644 --- a/src/core/callback.c +++ b/src/ping/core/callback.c @@ -1,6 +1,6 @@ #include "icmp.h" #include "icmp_types.h" -#include "ft_ping_flags.h" +#include "ping/ft_ping_flags.h" #include "internal/ping/callback.h" #include "internal/ping/ping_state.h" #include "internal/ping/stats.h" diff --git a/src/core/loop.c b/src/ping/core/loop.c similarity index 98% rename from src/core/loop.c rename to src/ping/core/loop.c index 5308c5d..969c2aa 100644 --- a/src/core/loop.c +++ b/src/ping/core/loop.c @@ -1,7 +1,7 @@ #include #include "icmp.h" -#include "ft_ping_flags.h" +#include "ping/ft_ping_flags.h" #include "internal/ping/loop.h" #include "internal/ping/send.h" #include "internal/ping/callback.h" diff --git a/src/core/ping.c b/src/ping/core/ping.c similarity index 97% rename from src/core/ping.c rename to src/ping/core/ping.c index 3788ac2..b0066d1 100644 --- a/src/core/ping.c +++ b/src/ping/core/ping.c @@ -1,9 +1,9 @@ #include #include -#include "ping.h" +#include "ping/ping.h" #include "icmp.h" -#include "ft_ping_flags.h" +#include "ping/ft_ping_flags.h" #include "internal/ping/ping_state.h" #include "internal/ping/stats.h" #include "internal/ping/tracker.h" diff --git a/src/core/send.c b/src/ping/core/send.c similarity index 93% rename from src/core/send.c rename to src/ping/core/send.c index da35889..7986045 100644 --- a/src/core/send.c +++ b/src/ping/core/send.c @@ -1,7 +1,7 @@ #include #include "icmp.h" -#include "ft_ping_const.h" +#include "ping/ft_ping_const.h" #include "internal/ping/send.h" #include "internal/ping/tracker.h" diff --git a/src/main.c b/src/ping/main.c similarity index 94% rename from src/main.c rename to src/ping/main.c index 3f3e1f1..f991928 100644 --- a/src/main.c +++ b/src/ping/main.c @@ -2,8 +2,8 @@ #include #include -#include "cli.h" -#include "ping.h" +#include "ping/cli.h" +#include "ping/ping.h" #include "version_gen.h" /* Forward declarations */ diff --git a/src/output/error.c b/src/ping/output/error.c similarity index 100% rename from src/output/error.c rename to src/ping/output/error.c diff --git a/src/output/flood.c b/src/ping/output/flood.c similarity index 100% rename from src/output/flood.c rename to src/ping/output/flood.c diff --git a/src/output/packet.c b/src/ping/output/packet.c similarity index 94% rename from src/output/packet.c rename to src/ping/output/packet.c index 9f9ded6..ca1687a 100644 --- a/src/output/packet.c +++ b/src/ping/output/packet.c @@ -1,7 +1,7 @@ #include #include -#include "ft_ping_flags.h" +#include "ping/ft_ping_flags.h" #include "internal/ping/output.h" void diff --git a/src/output/start.c b/src/ping/output/start.c similarity index 94% rename from src/output/start.c rename to src/ping/output/start.c index 2b62673..d517e9d 100644 --- a/src/output/start.c +++ b/src/ping/output/start.c @@ -2,7 +2,7 @@ #include #include -#include "ft_ping_flags.h" +#include "ping/ft_ping_flags.h" #include "internal/ping/output.h" void diff --git a/src/output/summary.c b/src/ping/output/summary.c similarity index 100% rename from src/output/summary.c rename to src/ping/output/summary.c diff --git a/src/scheduler/scheduler.c b/src/ping/scheduler/scheduler.c similarity index 97% rename from src/scheduler/scheduler.c rename to src/ping/scheduler/scheduler.c index 50437e1..6aa1204 100644 --- a/src/scheduler/scheduler.c +++ b/src/ping/scheduler/scheduler.c @@ -1,7 +1,7 @@ #include #include -#include "ft_ping_flags.h" +#include "ping/ft_ping_flags.h" #include "internal/ping/scheduler.h" /* Forward declarations */ diff --git a/src/stats/stats.c b/src/ping/stats/stats.c similarity index 100% rename from src/stats/stats.c rename to src/ping/stats/stats.c diff --git a/src/tracker/init.c b/src/ping/tracker/init.c similarity index 100% rename from src/tracker/init.c rename to src/ping/tracker/init.c diff --git a/src/tracker/record_recv.c b/src/ping/tracker/record_recv.c similarity index 100% rename from src/tracker/record_recv.c rename to src/ping/tracker/record_recv.c diff --git a/src/tracker/record_send.c b/src/ping/tracker/record_send.c similarity index 100% rename from src/tracker/record_send.c rename to src/ping/tracker/record_send.c diff --git a/tests/cli/handlers/test_handle_count.c b/tests/cli/handlers/test_handle_count.c index c2e7717..0586eda 100644 --- a/tests/cli/handlers/test_handle_count.c +++ b/tests/cli/handlers/test_handle_count.c @@ -1,5 +1,5 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" /* Test 1: basic test */ diff --git a/tests/cli/handlers/test_handle_flood.c b/tests/cli/handlers/test_handle_flood.c index e198914..36f23cd 100644 --- a/tests/cli/handlers/test_handle_flood.c +++ b/tests/cli/handlers/test_handle_flood.c @@ -1,7 +1,7 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" -#include "ft_ping_flags.h" +#include "ping/ft_ping_flags.h" /* Test 1: test flag*/ Test(handle_flood, flag_test) diff --git a/tests/cli/handlers/test_handle_help.c b/tests/cli/handlers/test_handle_help.c index 7bf0c63..0807fc5 100644 --- a/tests/cli/handlers/test_handle_help.c +++ b/tests/cli/handlers/test_handle_help.c @@ -1,5 +1,5 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" /* Test 1: exit code test */ diff --git a/tests/cli/handlers/test_handle_interval.c b/tests/cli/handlers/test_handle_interval.c index 1f6b91c..3f8a266 100644 --- a/tests/cli/handlers/test_handle_interval.c +++ b/tests/cli/handlers/test_handle_interval.c @@ -1,5 +1,5 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" /* Test 1: basic test */ diff --git a/tests/cli/handlers/test_handle_quiet.c b/tests/cli/handlers/test_handle_quiet.c index a3ece2d..8afe741 100644 --- a/tests/cli/handlers/test_handle_quiet.c +++ b/tests/cli/handlers/test_handle_quiet.c @@ -1,5 +1,5 @@ -#include "cli.h" -#include "ft_ping_flags.h" +#include "ping/cli.h" +#include "ping/ft_ping_flags.h" #include "internal/cli/arg_handler.h" #include diff --git a/tests/cli/handlers/test_handle_size.c b/tests/cli/handlers/test_handle_size.c index d927a64..4fcef21 100644 --- a/tests/cli/handlers/test_handle_size.c +++ b/tests/cli/handlers/test_handle_size.c @@ -1,5 +1,5 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" /* Test 1: basic test */ diff --git a/tests/cli/handlers/test_handle_timeout.c b/tests/cli/handlers/test_handle_timeout.c index 211fecd..ada3a32 100644 --- a/tests/cli/handlers/test_handle_timeout.c +++ b/tests/cli/handlers/test_handle_timeout.c @@ -1,5 +1,5 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" /* Test 1: basic test */ diff --git a/tests/cli/handlers/test_handle_ttl.c b/tests/cli/handlers/test_handle_ttl.c index e7daa75..32d4fff 100644 --- a/tests/cli/handlers/test_handle_ttl.c +++ b/tests/cli/handlers/test_handle_ttl.c @@ -1,5 +1,5 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" /* Test 1: basic test */ diff --git a/tests/cli/handlers/test_handle_verbose.c b/tests/cli/handlers/test_handle_verbose.c index e223c9f..9195bdd 100644 --- a/tests/cli/handlers/test_handle_verbose.c +++ b/tests/cli/handlers/test_handle_verbose.c @@ -1,5 +1,5 @@ -#include "cli.h" -#include "ft_ping_flags.h" +#include "ping/cli.h" +#include "ping/ft_ping_flags.h" #include "internal/cli/arg_handler.h" #include diff --git a/tests/cli/handlers/test_handle_version.c b/tests/cli/handlers/test_handle_version.c index 8329880..cfb944a 100644 --- a/tests/cli/handlers/test_handle_version.c +++ b/tests/cli/handlers/test_handle_version.c @@ -1,5 +1,5 @@ #include -#include "cli.h" +#include "ping/cli.h" #include "internal/cli/arg_handler.h" /* Test 1: exit code test */