2 files changed, 40 insertions(+), 9 deletions(-)

M ip/icmp.c
M ip/udp.c

@@ 118,7 118,7 @@ icmpkick(Conv *c, int l)
 	hnputs(p->icmpid, c->lport);
 	memset(p->cksum, 0, sizeof(p->cksum));
 	hnputs(p->cksum, ptclcsum(bp, ICMP_IPSIZE, blocklen(bp) - ICMP_IPSIZE));
-	ipoput(bp, 0, MAXTTL);
+	ipoput(bp, 0, c->ttl);
 }
 
 extern void


@@ 136,10 136,11 @@ icmpnoconv(Block *bp)
 	memmove(np->data, bp->rp, ICMP_IPSIZE + 8);
 	np->type = Unreachable;
 	np->code = 3;
-	p->proto = IP_ICMPPROTO;
-	hnputs(p->icmpid, 0);
-	memset(p->cksum, 0, sizeof(p->cksum));
-	hnputs(p->cksum, ptclcsum(bp, ICMP_IPSIZE, blocklen(bp) - ICMP_IPSIZE));
+	np->proto = IP_ICMPPROTO;
+	hnputs(np->icmpid, 0);
+	hnputs(np->seq, 0);
+	memset(np->cksum, 0, sizeof(np->cksum));
+	hnputs(np->cksum, ptclcsum(nbp, ICMP_IPSIZE, blocklen(nbp) - ICMP_IPSIZE));
 	ipoput(nbp, 0, MAXTTL);
 }
 


@@ 276,6 277,29 @@ raise:
 }
 
 void
+icmpadvise(Block *bp, char *msg)
+{
+	Conv	**c, *s;
+	Icmp	*p;
+	Ipaddr	dst;
+	ushort	recid;
+
+	p = (Icmp *) bp->rp;
+	dst = nhgetl(p->dst);
+	recid = nhgets(p->icmpid);
+
+	for(c = icmp.conv; *c; c++) {
+		s = *c;
+		if(s->lport == recid && s->raddr == dst){
+			qhangup(s->rq, msg);
+			qhangup(s->wq, msg);
+			break;
+		}
+	}
+	freeblist(bp);
+}
+
+void
 icmpinit(Fs *fs)
 {
 	icmp.name = "icmp";


@@ 287,7 311,7 @@ icmpinit(Fs *fs)
 	icmp.close = icmpclose;
 	icmp.rcv = icmpiput;
 	icmp.ctl = nil;
-	icmp.advise = nil;
+	icmp.advise = icmpadvise;
 	icmp.ipproto = IP_ICMPPROTO;
 	icmp.nc = 16;
 	icmp.ptclsize = 0;

@@ 198,7 198,7 @@ udpkick(Conv *c, int l)
 void
 udpiput(Media *m, Block *bp)
 {
-	int len;
+	int len, olen, ottl;
 	Udphdr *uh;
 	Conv *c, **p;
 	Udpcb *ucb;


@@ 210,9 210,11 @@ udpiput(Media *m, Block *bp)
 	USED(m);
 	uh = (Udphdr*)(bp->rp);
 
-	/* Put back pseudo header for checksum */
+	/* Put back pseudo header for checksum (remember old values for icmpnoconv()) */
+	ottl = uh->Unused;
 	uh->Unused = 0;
 	len = nhgets(uh->udplen);
+	olen = nhgets(uh->udpplen);
 	hnputs(uh->udpplen, len);
 
 	raddr = nhgetl(uh->udpsrc);


@@ 244,7 246,12 @@ udpiput(Media *m, Block *bp)
 	if(*p == nil) {
 		netlog(Logudp, "udp: no conv %I.%d -> %I.%d\n", src, rport,
 			dst, lport);
-		icmpnoconv(bp);
+		/* don't complain about broadcasts... */
+		if(Mediaforme(dst) > 0){
+			uh->Unused = ottl;
+			hnputs(uh->udpplen, olen);
+			icmpnoconv(bp);
+		}
 		freeblist(bp);
 		return;
 	}