2 files changed, 4 insertions(+), 2 deletions(-)

M boot/userpasswd.c
M ip/rudp.c

@@ 47,5 47,4 @@ userpasswd(int islocal, Method *mp)
 	/* set host's owner (and uid of current process) */
 	if(writefile("#c/hostowner", username, strlen(username)) < 0)
 		fatal(homsg);
-	close(fd);
 }

@@ 126,6 126,7 @@ struct Reliable
 	ulong	ackrcvd;	/* last msg for which ack was rcvd */
 
 	/* flow control */
+	QLock	lock;
 	Rendez	vous;
 	int	blocked;
 };


@@ 435,6 436,7 @@ rudpkick(Conv *c, int)
 	hnputs(uh->udpcksum, ptclcsum(bp, UDP_IPHDR, dlen+UDP_RHDRSIZE));
 
 	relackq(r, bp);
+	qunlock(ucb);
 
 	upriv->ustats.rudpOutDatagrams++;
 


@@ 444,13 446,14 @@ rudpkick(Conv *c, int)
 	doipoput(c, f, bp, 0, c->ttl, c->tos);
 
 	/* flow control of sorts */
+	qlock(&r->lock);
 	if(UNACKED(r) > Maxunacked){
 		r->blocked = 1;
 		sleep(&r->vous, flow, r);
 		r->blocked = 0;
 	}
+	qunlock(&r->lock);
 	relput(r);
-	qunlock(ucb);
 }
 
 void