jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

much progress, need to remove non blocking IO because its not allowed

Browse source
This commit is contained in:
Jack Halford 2017-05-13 23:15:50 +02:00
parent 5cd2bf7039
commit d3aaedb7a2
4 changed files with 87 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nmap/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
ft_ping

6
nmap/includes/ft_ping.h → nmap/includes/ping.h
View file

@ -17,6 +17,7 @@
# include <fcntl.h> # include <fcntl.h>
# include <errno.h> # include <errno.h>
# include <sys/socket.h> # include <sys/socket.h>
# include <sys/time.h>
# include <resolv.h> # include <resolv.h>
# include <netdb.h> # include <netdb.h>
# include <netinet/in.h> # include <netinet/in.h>
@ -24,10 +25,11 @@
# include <netinet/ip_icmp.h> # include <netinet/ip_icmp.h>
#define PACKETSIZE 64 #define PACKETSIZE 64
struct s_packet struct s_packet
{ {
struct icmp icmp; struct icmp hdr;
char msg[PACKETSIZE-sizeof(struct icmp)]; char msg[PACKETSIZE - sizeof(struct icmp)];
}; };
#endif #endif

2
nmap/libft

@ -1 +1 @@
Subproject commit 61ecc913bbc31dafab3fff2386e1cbfffd34596a Subproject commit 23c69f13242ecbff493356c57cb1384eb1dd45f5

126
nmap/srcs/ping.c
View file

@ -10,9 +10,11 @@
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ft_ping.h" #include "ping.h"
int g_pid=-1; int g_pid=-1;
int g_pkt_rec=0;
char g_domain[256];
unsigned short checksum(void *b, int len) unsigned short checksum(void *b, int len)
{ {
@ -32,63 +34,67 @@ unsigned short checksum(void *b, int len)
void display(void *buf, int bytes, struct sockaddr_in *addr) void display(void *buf, int bytes, struct sockaddr_in *addr)
{ {
int i;
struct ip *ip = buf; struct ip *ip = buf;
struct icmp *icmp = buf + ip->ip_hl*4; struct icmp *icmp;
struct s_packet *pkt;
int hlen;
char addrstr[INET_ADDRSTRLEN];
struct timeval start, end, triptime;
double diff;
printf("%d bytes from %s: ttl=%i\n", (void)bytes;
ip->ip_len, inet_ntoa(addr->sin_addr), ip->ip_ttl); hlen = ip->ip_hl << 2;
printf("IPv%d: hrd-size=%d, pkt-size=%d, id=%d, frag-off=%d, protocol=%c\n, ttl=%i", pkt = (struct s_packet*)(buf + hlen);
ip->ip_v, ip->ip_hl, ip->ip_len, ip->ip_id, ip->ip_off, ip->ip_p, ip->ip_ttl); icmp = &pkt->hdr;
if (icmp->icmp_hun.ih_idseq.icd_id == g_pid) start = *(struct timeval*)&pkt->msg;
{
printf("ICMP: type[%d/%d] checksum[%d] id[%d] seq[%d]\n", if (gettimeofday(&end, NULL) != 0)
icmp->icmp_type, icmp->icmp_code, ntohs(icmp->icmp_cksum), return ;
icmp->icmp_hun.ih_idseq.icd_id, icmp->icmp_hun.ih_idseq.icd_seq); timersub(&end, &start, &triptime);
(void)bytes; diff = (triptime.tv_sec + triptime.tv_usec / 1000000.0) * 1000.0;
} rs_push(diff);
for (i=0; i < bytes; i++) g_pkt_rec++;
{ printf("%d bytes from %s: icmp_seq=%d ttl=%i time=%.3f ms\n",
if ( !(i & 15) ) printf("\n%i: ", i); ip->ip_len,
printf("%c ", ((char*)buf)[i]); inet_ntop(AF_INET, &(addr->sin_addr), addrstr, INET_ADDRSTRLEN),
} icmp->icmp_seq, ip->ip_ttl, diff);
printf("\n");
} }
void listener(struct sockaddr_in *addr) void listener(void)
{ { int sd;
int sd; struct sockaddr_in addr;
struct sockaddr_in r_addr; unsigned char buf[1024];
int bytes;
socklen_t len; sd = socket(PF_INET, SOCK_DGRAM, IPPROTO_ICMP);
unsigned char buf[1024]; if ( sd < 0 )
if ((sd = socket(PF_INET, SOCK_DGRAM, IPPROTO_ICMP)) < 0)
{ {
perror("socket"); perror("socket");
exit(0); exit(0);
} }
for (;;) for (;;)
{ { int bytes;
socklen_t len=sizeof(addr);
bzero(buf, sizeof(buf)); bzero(buf, sizeof(buf));
len = sizeof(r_addr); bytes = recvfrom(sd, buf, sizeof(buf), 0, (struct sockaddr*)&addr, &len);
bytes = recvfrom(sd, buf, sizeof(buf), 0, (struct sockaddr*)&r_addr, &len); if ( bytes > 0 )
if (bytes > 0) display(buf, bytes, &addr);
display(buf, bytes, addr);
else else
perror("recvfrom"); perror("recvfrom");
} }
exit(0);
} }
void ping(struct sockaddr_in *addr) void ping(struct sockaddr_in *addr)
{ {
const int val; const int val = 255;
int i; int i;
int sd; int sd;
int cnt; int cnt;
socklen_t len; socklen_t len;
struct s_packet pkt; struct s_packet pkt;
struct sockaddr_in r_addr; struct sockaddr_in r_addr;
struct timeval time;
if ((sd = socket(PF_INET, SOCK_DGRAM, IPPROTO_ICMP)) < 0) if ((sd = socket(PF_INET, SOCK_DGRAM, IPPROTO_ICMP)) < 0)
{ {
@ -99,44 +105,74 @@ void ping(struct sockaddr_in *addr)
perror("set TTL option"); perror("set TTL option");
if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0) if (fcntl(sd, F_SETFL, O_NONBLOCK) != 0)
perror("Request non blocking IO"); perror("Request non blocking IO");
cnt = 1; cnt = 0;
while (1) while (1)
{ {
len = sizeof(r_addr); len = sizeof(r_addr);
recvfrom(sd, &pkt, sizeof(pkt), 0, (struct sockaddr*)&r_addr, &len);
bzero(&pkt, sizeof(pkt)); bzero(&pkt, sizeof(pkt));
pkt.icmp.icmp_type = ICMP_ECHO; pkt.hdr.icmp_type = ICMP_ECHO;
pkt.icmp.icmp_hun.ih_idseq.icd_id = g_pid; pkt.hdr.icmp_id = g_pid;
pkt.hdr.icmp_seq = cnt++;
for (i=0; i < (int)sizeof(pkt.msg); i++) for (i=0; i < (int)sizeof(pkt.msg); i++)
pkt.msg[i] = i+'0'; pkt.msg[i] = i+'0';
pkt.msg[i] = 0; pkt.msg[i] = 0;
pkt.icmp.icmp_hun.ih_idseq.icd_seq = cnt++; if (gettimeofday(&time, NULL) != 0)
pkt.icmp.icmp_cksum = checksum(&pkt, sizeof(pkt)); return ;
ft_memcpy(pkt.msg, (void*)&time, sizeof(time));
time = *(struct timeval*)&pkt.msg;
pkt.hdr.icmp_cksum = checksum(&pkt, sizeof(pkt));
if (sendto(sd, &pkt, sizeof(pkt), 0, (struct sockaddr*)addr, sizeof(*addr)) <= 0) if (sendto(sd, &pkt, sizeof(pkt), 0, (struct sockaddr*)addr, sizeof(*addr)) <= 0)
perror("sendto"); perror("sendto");
sleep(1); sleep(1);
} }
} }
void sigint_handler(int signo)
{
double loss;
(void)signo;
rs_calcmore();
loss = g_rs.count ? 100 * ((float) (g_rs.count - g_pkt_rec) / (float)g_rs.count) : 0;
printf("\n--- %s ping statistics ---", g_domain);
printf("\n%d packets transmitted, %d packets received, %0.1f%% packet loss", g_rs.count, g_pkt_rec, loss);
printf("\nround-trip min/avg/max/stddev = %.3f/%.3f/%.3f/%.3f ms", g_rs.min, g_rs.avg, g_rs.max, g_rs.stdev);
exit(0);
}
int main(int ac, char **av) int main(int ac, char **av)
{ {
struct sockaddr_in *addr; struct sockaddr_in *addr;
struct addrinfo *result; struct addrinfo *result, hints;
char addrstr[INET_ADDRSTRLEN];
if (ac != 2) if (ac != 2)
{ {
printf("usage: %s <addr>\n", av[0]); printf("usage: %s <addr>\n", av[0]);
exit(1); exit(1);
} }
if (getaddrinfo(av[1], NULL, NULL, &result) != 0) memset (&hints, 0, sizeof (hints));
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags |= AI_CANONNAME;
if (getaddrinfo(av[1], NULL, &hints, &result) != 0)
{ {
perror("getaddrinfo"); perror("getaddrinfo");
exit(1); exit(1);
} }
addr = (struct sockaddr_in*)result->ai_addr; addr = (struct sockaddr_in*)result->ai_addr;
inet_ntop(AF_INET, &(addr->sin_addr), addrstr, INET_ADDRSTRLEN);
g_pid = getpid();
ft_strcpy(g_domain, addrstr);
if (result->ai_canonname)
ft_strcpy(g_domain, result->ai_canonname);
printf("PING %s (%s): %i data bytes\n", FT_TRY(result->ai_canonname, addrstr), addrstr, 64);
if (fork() == 0) if (fork() == 0)
{ {
listener(addr); signal(SIGINT, sigint_handler);
rs_clear();
listener();
exit(0); exit(0);
} }
else else