receive of icmp work, needs statistics and missing settings
This commit is contained in:
@ -6,13 +6,13 @@
|
||||
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/04/26 19:54:25 by tomoron #+# #+# */
|
||||
/* Updated: 2025/04/30 01:57:10 by tomoron ### ########.fr */
|
||||
/* Updated: 2025/04/30 17:59:21 by tomoron ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "includes/ft_ping.h"
|
||||
|
||||
struct addrinfo *resolve_ip(char *host)
|
||||
struct addrinfo *resolve_ip(char *host, t_settings *settings)
|
||||
{
|
||||
struct addrinfo hints, *result;
|
||||
int s;
|
||||
@ -25,7 +25,7 @@ struct addrinfo *resolve_ip(char *host)
|
||||
|
||||
s = getaddrinfo(host, NULL, &hints, &result);
|
||||
if (s != 0) {
|
||||
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(s));
|
||||
fprintf(stderr, "%s: %s\n",settings->name, gai_strerror(s));
|
||||
return(ret);
|
||||
}
|
||||
|
||||
@ -49,22 +49,22 @@ double timediff(struct timeval *from)
|
||||
return(diff);
|
||||
}
|
||||
|
||||
t_waitlist *send_icmp(t_settings *set, struct addrinfo *host, int seq, struct timeval *last)
|
||||
t_waitlist *send_icmp(t_settings *set, struct addrinfo *host, uint16_t *seq, struct timeval *last)
|
||||
{
|
||||
t_icmp_echo packet;
|
||||
t_waitlist *ret;
|
||||
|
||||
if(timediff(last) < set->interval)
|
||||
return (0);
|
||||
printf("send packet\n");
|
||||
packet = prepare_icmp_echo(seq, set->id);
|
||||
packet = prepare_icmp_echo(*seq, set->id);
|
||||
sendto(set->socket, &packet, sizeof(t_icmp_echo), 0, host->ai_addr, host->ai_addrlen);
|
||||
gettimeofday(last, 0);
|
||||
(*seq)++;
|
||||
ret = malloc(sizeof(t_waitlist));
|
||||
if(!ret)
|
||||
return(0);
|
||||
ret->time = *last;
|
||||
ret->seq = seq;
|
||||
ret->seq = *seq;
|
||||
ret->next = 0;
|
||||
return(ret);
|
||||
}
|
||||
@ -83,7 +83,7 @@ void waitlist_add(t_waitlist **waitlist, t_waitlist *elem)
|
||||
*waitlist = elem;
|
||||
}
|
||||
|
||||
void whitelist_free(t_waitlist *lst)
|
||||
void waitlist_free(t_waitlist *lst)
|
||||
{
|
||||
t_waitlist *tmp;
|
||||
|
||||
@ -95,24 +95,47 @@ void whitelist_free(t_waitlist *lst)
|
||||
}
|
||||
}
|
||||
|
||||
void waitlist_remove(t_waitlist **lst, uint16_t seq)
|
||||
{
|
||||
t_waitlist *cur;
|
||||
t_waitlist *prev;
|
||||
|
||||
if(!*lst)
|
||||
return ;
|
||||
cur = *lst;
|
||||
prev = 0;
|
||||
while(cur && cur->seq != seq)
|
||||
{
|
||||
prev = cur;
|
||||
cur = cur->next;
|
||||
}
|
||||
if(!prev)
|
||||
return ;
|
||||
if(!prev && *lst)
|
||||
*lst = (*lst)->next;
|
||||
if(cur)
|
||||
prev->next = cur->next;
|
||||
free(cur);
|
||||
}
|
||||
|
||||
void receive_icmp(t_settings *set, struct addrinfo *info, t_waitlist **wl)
|
||||
{
|
||||
size_t len;
|
||||
t_icmp_echo packet;
|
||||
t_waitlist *tmp;
|
||||
char buf[256];
|
||||
t_icmp_echo *res;
|
||||
uint16_t checksum;
|
||||
|
||||
len = recvfrom(set->socket, &packet, sizeof(t_icmp_echo), 0, info->ai_addr, &info->ai_addrlen);
|
||||
if(len == -1 || !len)
|
||||
len = recvfrom(set->socket, buf, sizeof(t_icmp_echo) + 20, 0, info->ai_addr, &info->ai_addrlen);
|
||||
res = (void*)(buf + 20);
|
||||
if(len == (size_t)-1 || !len)
|
||||
return;
|
||||
tmp = *wl;
|
||||
while(tmp && tmp->seq != packet.sequence)
|
||||
tmp = tmp->next;
|
||||
if(tmp)
|
||||
{
|
||||
free(tmp);
|
||||
}
|
||||
(void)len;
|
||||
|
||||
if(res->type != 0 && res->identifier != set->id)
|
||||
return ;
|
||||
checksum = res->checksum;
|
||||
res->checksum = 0;
|
||||
if(calc_checksum(res, sizeof(t_icmp_echo)) != checksum)
|
||||
return ;
|
||||
waitlist_remove(wl, res->sequence);
|
||||
}
|
||||
|
||||
int ping_host(t_settings *set, char *host)
|
||||
@ -124,7 +147,7 @@ int ping_host(t_settings *set, char *host)
|
||||
t_waitlist *tmp;
|
||||
|
||||
seq = 0;
|
||||
info = resolve_ip(host);
|
||||
info = resolve_ip(host, set);
|
||||
if(!info)
|
||||
return(0);
|
||||
last_sent.tv_sec = 0;
|
||||
@ -132,7 +155,7 @@ int ping_host(t_settings *set, char *host)
|
||||
wl = 0;
|
||||
while(seq < set->count || set->count == -1)
|
||||
{
|
||||
tmp = send_icmp(set, info, seq, &last_sent);
|
||||
tmp = send_icmp(set, info, &seq, &last_sent);
|
||||
if(tmp)
|
||||
waitlist_add(&wl, tmp);
|
||||
usleep(1000);
|
||||
@ -141,7 +164,7 @@ int ping_host(t_settings *set, char *host)
|
||||
while(wl)
|
||||
receive_icmp(set, info, &wl);
|
||||
freeaddrinfo(info);
|
||||
whitelist_free(wl);
|
||||
waitlist_free(wl);
|
||||
return(1);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user