remove references to oudpheader Notes: Mon May 7 11:42:13 EDT 2007 geoff already done; see sources. Reference: /n/sources/patch/sorry/no-oudp-etc Date: Sun May 6 21:24:40 CES 2007 Signed-off-by: quanstro@quanstro.net Reviewed-by: geoff --- /sys/src/cmd/ip/udpecho.c Sun May 6 21:24:04 2007 +++ /sys/src/cmd/ip/udpecho.c Sun May 6 21:24:03 2007 @@ -36,7 +36,6 @@ sysfatal("can't announce: %r"); if(fprint(cfd, "headers") < 0) sysfatal("can't set header mode: %r"); - fprint(cfd, "oldheaders"); sprint(data, "%s/data", devdir); --- /sys/src/cmd/ip/dhcpclient.c Sun May 6 21:24:10 2007 +++ /sys/src/cmd/ip/dhcpclient.c Sun May 6 21:24:08 2007 @@ -369,7 +369,6 @@ if(fprint(cfd, "headers") < 0) myfatal("can't set header mode: %r"); - fprint(cfd, "oldheaders"); sprint(data, "%s/data", devdir); @@ -544,11 +543,11 @@ bootpdump(uchar *p, int n) { Bootp *bp; - OUdphdr *up; + Udphdr *up; int len, i, code; bp = (Bootp*)p; - up = (OUdphdr*)bp->udphdr; + up = (Udphdr*)bp->udphdr; if(n < bp->optmagic - p) { fprint(2, "dhcpclient: short bootp packet"); --- /sys/src/cmd/ip/rip.c Sun May 6 21:24:16 2007 +++ /sys/src/cmd/ip/rip.c Sun May 6 21:24:15 2007 @@ -202,7 +202,7 @@ main(int argc, char *argv[]) { int i, n; - OUdphdr *up; + Udphdr *up; Ripmsg *m; Rip *r; Route route; @@ -292,12 +292,12 @@ if(n <= 0) continue; - n = (n-OUdphdrsize-4)/sizeof(Rip); + n = (n-Udphdrsize-4)/sizeof(Rip); if(n <= 0) continue; - up = (OUdphdr*)buf; - m = (Ripmsg*)(buf+OUdphdrsize); + up = (Udphdr*)buf; + m = (Ripmsg*)(buf+Udphdrsize); if(m->type != Response || m->vers != Version) continue; v6tov4(raddr, up->raddr); @@ -334,7 +334,6 @@ fatal(1, "can't announce"); if(fprint(ripctl, "headers") < 0) fatal(1, "can't set header mode"); - fprint(ripctl, "oldheaders"); sprint(data, "%s/data", devdir); @@ -615,17 +614,17 @@ { int h, n; Route *r; - uchar mbuf[OUdphdrsize+512]; + uchar mbuf[Udphdrsize+512]; Ripmsg *m; - OUdphdr *u; + Udphdr *u; uchar raddr[Pasize]; - u = (OUdphdr*)mbuf; + u = (Udphdr*)mbuf; for(n = 0; n < Pasize; n++) raddr[n] = ip->net[n] | ~(ip->mask[n]); v4tov6(u->raddr, raddr); hnputs(u->rport, 520); - m = (Ripmsg*)(mbuf+OUdphdrsize); + m = (Ripmsg*)(mbuf+Udphdrsize); m->type = Response; m->vers = Version; if(debug) @@ -666,14 +665,14 @@ fprint(2, " %16V & %16V -> %16V %2d\n", r->dest, r->mask, r->gate, r->metric); if(++n == Maxroutes && !readonly){ - write(ripfd, mbuf, OUdphdrsize+4+n*20); + write(ripfd, mbuf, Udphdrsize+4+n*20); n = 0; } } } if(n && !readonly) - write(ripfd, mbuf, OUdphdrsize+4+n*20); + write(ripfd, mbuf, Udphdrsize+4+n*20); } void broadcast(void)