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

ip/gping: fix corruption due to Machine.last pointer not being maintained in pingclean(), cleanup unused stuff

Browse source
This commit is contained in:
cinap_lenrek 2017-02-19 02:27:42 +01:00
parent 59ba35a327
commit abda59c7ec
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,6 @@ struct Req
{
int seq; /* sequence number */
vlong time; /* time sent */
// int rtt;
Req *next;
};
@ -68,13 +67,7 @@ struct Machine
int unreachable;
ushort seq;
Req *first;
Req *last;
Req *rcvd;
char buf[1024];
char *bufp;
char *ebufp;
Req *list;
};
enum
@ -436,7 +429,7 @@ pingclean(Machine *m, ushort seq, vlong now, int)
vlong x, y;
y = 10LL*1000000000LL;
for(l = &m->first; *l; ){
for(l = &m->list; *l; ){
r = *l;
x = now - r->time;
if(x > y || r->seq == seq){
@ -474,15 +467,11 @@ pingsend(Machine *m)
ip->seq[0] = m->seq;
ip->seq[1] = m->seq>>8;
r->seq = m->seq;
r->next = nil;
lock(m);
pingclean(m, -1, nsec(), 0);
if(m->first == nil)
m->first = r;
else
m->last->next = r;
m->last = r;
r->time = nsec();
lock(m);
pingclean(m, -1, r->time, 0);
r->next = m->list;
m->list = r;
unlock(m);
if(write(m->pingfd, buf, MSGLEN) < MSGLEN){
errstr(err, sizeof err);