xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ip/gping: ignore advice, fix packet corruption check, remove dead code

Browse source
This commit is contained in:
cinap_lenrek 2016-03-12 23:27:49 +01:00
parent 8f2d9a139f
commit 2dddca9847
1 changed files with 12 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sys/src/cmd/ip/gping.c
View file

@ -205,26 +205,6 @@ colinit(void)
cols[5][2] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x888888FF); cols[5][2] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x888888FF);
} }
int
loadbuf(Machine *m, int *fd)
{
int n;
if(*fd < 0)
return 0;
seek(*fd, 0, 0);
n = read(*fd, m->buf, sizeof m->buf);
if(n <= 0){
close(*fd);
*fd = -1;
return 0;
}
m->bufp = m->buf;
m->ebufp = m->buf+n;
return 1;
}
void void
label(Point p, int dy, char *text) label(Point p, int dy, char *text)
{ {
@ -516,34 +496,31 @@ pingsend(Machine *m)
void void
pingrcv(void *arg) pingrcv(void *arg)
{ {
int i, n, fd; int i, n;
uchar buf[512]; uchar buf[512];
ushort x; ushort x;
vlong now;
Icmphdr *ip; Icmphdr *ip;
Ip4hdr *ip4; Ip4hdr *ip4;
Machine *m = arg; Machine *m = arg;
ip4 = (Ip4hdr *)buf; ip4 = (Ip4hdr *)buf;
ip = (Icmphdr *)(buf + IPV4HDR_LEN); ip = (Icmphdr *)(buf + IPV4HDR_LEN);
fd = dup(m->pingfd, -1);
for(;;){ for(;;){
n = read(fd, buf, sizeof(buf)); n = read(m->pingfd, buf, sizeof(buf));
now = nsec();
if(n <= 0) if(n <= 0)
break;
if(n < MSGLEN)
continue; continue;
if(n < MSGLEN){
print("bad len %d/%d\n", n, MSGLEN);
continue;
}
for(i = 32; i < MSGLEN; i++) for(i = 32; i < MSGLEN; i++)
if(buf[i] != (i&0xff)) if(buf[i] != (i&0xff))
continue; break;
if(i != MSGLEN)
continue;
x = (ip->seq[1]<<8) | ip->seq[0]; x = (ip->seq[1]<<8) | ip->seq[0];
if(ip->type != EchoReply || ip->code != 0) if(ip->type != EchoReply || ip->code != 0)
continue; continue;
lock(m); lock(m);
pingclean(m, x, now, ip4->ttl); pingclean(m, x, nsec(), ip4->ttl);
unlock(m); unlock(m);
} }
} }
@ -551,6 +528,7 @@ pingrcv(void *arg)
void void
initmach(Machine *m, char *name) initmach(Machine *m, char *name)
{ {
int cfd = -1;
char *p; char *p;
srand(time(0)); srand(time(0));
@ -563,9 +541,11 @@ initmach(Machine *m, char *name)
m->name = estrdup(p); m->name = estrdup(p);
m->nproc = 1; m->nproc = 1;
m->pingfd = dial(netmkaddr(m->name, "icmp", "1"), 0, 0, 0); m->pingfd = dial(netmkaddr(m->name, "icmp", "1"), nil, nil, &cfd);
if(m->pingfd < 0) if(m->pingfd < 0)
sysfatal("dialing %s: %r", m->name); sysfatal("dialing %s: %r", m->name);
write(cfd, "ignoreadvice", 12);
close(cfd);
startproc(pingrcv, m); startproc(pingrcv, m);
} }