refactor: move internal ping headers to internal/ping/

This commit is contained in:
lohhiiccc 2026-03-12 16:36:47 +01:00
parent 35217530e4
commit 3f666ff011
24 changed files with 44 additions and 40 deletions

View file

@ -2,7 +2,7 @@
#define PING_LOOP_H #define PING_LOOP_H
#include <stddef.h> #include <stddef.h>
#include "internal/ping_state.h" #include "internal/ping/ping_state.h"
void ping_loop(t_ping_state *state, size_t payload_len); void ping_loop(t_ping_state *state, size_t payload_len);

View file

@ -5,7 +5,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include "icmp.h" #include "icmp.h"
#include "ft_ping.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, void ping_output_start(const t_ping_config *config,
struct in_addr dest, size_t payload_bytes); struct in_addr dest, size_t payload_bytes);

View file

@ -7,8 +7,8 @@
#include <time.h> #include <time.h>
#include "icmp.h" #include "icmp.h"
#include "ft_ping.h" #include "ft_ping.h"
#include "internal/stats.h" #include "internal/ping/stats.h"
#include "internal/tracker.h" #include "internal/ping/tracker.h"
typedef struct s_ping_state { typedef struct s_ping_state {
icmp_handle_t *handle; icmp_handle_t *handle;

View file

@ -2,7 +2,7 @@
#define PING_SCHEDULER_H #define PING_SCHEDULER_H
#include <sys/time.h> #include <sys/time.h>
#include "internal/ping_state.h" #include "internal/ping/ping_state.h"
void ping_scheduler_init(t_ping_state *state); void ping_scheduler_init(t_ping_state *state);
void ping_scheduler_arm(const t_ping_config *config); void ping_scheduler_arm(const t_ping_config *config);

View file

@ -2,7 +2,7 @@
#define PING_SEND_H #define PING_SEND_H
#include <stddef.h> #include <stddef.h>
#include "internal/ping_state.h" #include "internal/ping/ping_state.h"
int ping_send_one(t_ping_state *state, size_t payload_len); int ping_send_one(t_ping_state *state, size_t payload_len);

View file

@ -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, int64_t ping_tracker_record_recv(t_ping_tracker *t, uint16_t seq,
const struct timespec *ts); 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 #endif

View file

@ -1,11 +1,11 @@
#include "icmp.h" #include "icmp.h"
#include "icmp_types.h" #include "icmp_types.h"
#include "ft_ping_flags.h" #include "ft_ping_flags.h"
#include "internal/callback.h" #include "internal/ping/callback.h"
#include "internal/ping_state.h" #include "internal/ping/ping_state.h"
#include "internal/stats.h" #include "internal/ping/stats.h"
#include "internal/tracker.h" #include "internal/ping/tracker.h"
#include "internal/output.h" #include "internal/ping/output.h"
/* Forward declarations */ /* Forward declarations */
static int extract_our_echo(const icmp_reply_t *reply, uint16_t our_id, static int extract_our_echo(const icmp_reply_t *reply, uint16_t our_id,

View file

@ -2,12 +2,12 @@
#include "icmp.h" #include "icmp.h"
#include "ft_ping_flags.h" #include "ft_ping_flags.h"
#include "internal/loop.h" #include "internal/ping/loop.h"
#include "internal/send.h" #include "internal/ping/send.h"
#include "internal/callback.h" #include "internal/ping/callback.h"
#include "internal/tracker.h" #include "internal/ping/tracker.h"
#include "internal/output.h" #include "internal/ping/output.h"
#include "internal/scheduler.h" #include "internal/ping/scheduler.h"
/* Forward declarations */ /* Forward declarations */
static int deadline_expired(const t_ping_state *state); static int deadline_expired(const t_ping_state *state);

View file

@ -4,13 +4,13 @@
#include "ping.h" #include "ping.h"
#include "icmp.h" #include "icmp.h"
#include "ft_ping_flags.h" #include "ft_ping_flags.h"
#include "internal/ping_state.h" #include "internal/ping/ping_state.h"
#include "internal/stats.h" #include "internal/ping/stats.h"
#include "internal/tracker.h" #include "internal/ping/tracker.h"
#include "internal/output.h" #include "internal/ping/output.h"
#include "internal/scheduler.h" #include "internal/ping/scheduler.h"
#include "internal/send.h" #include "internal/ping/send.h"
#include "internal/loop.h" #include "internal/ping/loop.h"
/* Forward declarations */ /* Forward declarations */
static int ping_one(const t_ping_config *config, struct in_addr dest, static int ping_one(const t_ping_config *config, struct in_addr dest,

View file

@ -2,8 +2,8 @@
#include "icmp.h" #include "icmp.h"
#include "ft_ping_const.h" #include "ft_ping_const.h"
#include "internal/send.h" #include "internal/ping/send.h"
#include "internal/tracker.h" #include "internal/ping/tracker.h"
int int
ping_send_one(t_ping_state *state, size_t payload_len) ping_send_one(t_ping_state *state, size_t payload_len)

View file

@ -3,7 +3,7 @@
#include "icmp.h" #include "icmp.h"
#include "icmp_types.h" #include "icmp_types.h"
#include "internal/output.h" #include "internal/ping/output.h"
/* Forward declarations */ /* Forward declarations */
static const char *error_msg_for(const icmp_reply_t *reply); static const char *error_msg_for(const icmp_reply_t *reply);

View file

@ -1,6 +1,6 @@
#include <unistd.h> #include <unistd.h>
#include "internal/output.h" #include "internal/ping/output.h"
void void
ping_output_flood_dot(void) ping_output_flood_dot(void)

View file

@ -2,7 +2,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include "ft_ping_flags.h" #include "ft_ping_flags.h"
#include "internal/output.h" #include "internal/ping/output.h"
void void
ping_output_packet(const icmp_reply_t *reply, uint16_t seq, ping_output_packet(const icmp_reply_t *reply, uint16_t seq,

View file

@ -3,7 +3,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include "ft_ping_flags.h" #include "ft_ping_flags.h"
#include "internal/output.h" #include "internal/ping/output.h"
void void
ping_output_start(const t_ping_config *config, ping_output_start(const t_ping_config *config,

View file

@ -1,9 +1,9 @@
#include <stdio.h> #include <stdio.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include "internal/output.h" #include "internal/ping/output.h"
#include "internal/stats.h" #include "internal/ping/stats.h"
#include "internal/tracker.h" #include "internal/ping/tracker.h"
/* Forward declarations */ /* Forward declarations */
static void print_loss_line(size_t sent, size_t ok_recv, size_t errors); static void print_loss_line(size_t sent, size_t ok_recv, size_t errors);

View file

@ -2,7 +2,7 @@
#include <unistd.h> #include <unistd.h>
#include "ft_ping_flags.h" #include "ft_ping_flags.h"
#include "internal/scheduler.h" #include "internal/ping/scheduler.h"
/* Forward declarations */ /* Forward declarations */
static void sigalrm_handler(int sig); static void sigalrm_handler(int sig);

View file

@ -1,7 +1,7 @@
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>
#include "internal/stats.h" #include "internal/ping/stats.h"
/* Forward declarations */ /* Forward declarations */
static double compute_mdev_ms(const t_ping_stats *s, double avg_ms); static double compute_mdev_ms(const t_ping_stats *s, double avg_ms);

View file

@ -1,6 +1,6 @@
#include <string.h> #include <string.h>
#include "internal/tracker.h" #include "internal/ping/tracker.h"
void void
ping_tracker_init(t_ping_tracker *t) ping_tracker_init(t_ping_tracker *t)

View file

@ -1,7 +1,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "icmp.h" #include "icmp.h"
#include "internal/tracker.h" #include "internal/ping/tracker.h"
int64_t int64_t
ping_tracker_record_recv(t_ping_tracker *t, uint16_t seq, ping_tracker_record_recv(t_ping_tracker *t, uint16_t seq,

View file

@ -1,6 +1,6 @@
#include <stdbool.h> #include <stdbool.h>
#include "internal/tracker.h" #include "internal/ping/tracker.h"
void void
ping_tracker_record_send(t_ping_tracker *t, uint16_t seq, ping_tracker_record_send(t_ping_tracker *t, uint16_t seq,

View file

@ -1,7 +1,7 @@
#include <criterion/criterion.h> #include <criterion/criterion.h>
#include <stdint.h> #include <stdint.h>
#include <math.h> #include <math.h>
#include "internal/stats.h" #include "internal/ping/stats.h"
Test(ping_stats, init_neutral) Test(ping_stats, init_neutral)
{ {

View file

@ -1,6 +1,6 @@
#include <criterion/criterion.h> #include <criterion/criterion.h>
#include <stdint.h> #include <stdint.h>
#include "internal/tracker.h" #include "internal/ping/tracker.h"
static struct timespec static struct timespec
make_ts(long sec, long nsec) make_ts(long sec, long nsec)