Browse Source

Plan 9 from Bell Labs 2007-05-07

David du Colombier 13 years ago
parent
commit
69b095addc

+ 26 - 14
dist/replica/_plan9.db

@@ -397,7 +397,7 @@
 386/bin/sam - 775 sys sys 1168633586 159364
 386/bin/scat - 775 sys sys 1176520494 284766
 386/bin/scp - 775 sys sys 1176520495 152584
-386/bin/scuzz - 775 sys sys 1177730506 115274
+386/bin/scuzz - 775 sys sys 1178422014 115094
 386/bin/sed - 775 sys sys 1168402348 89763
 386/bin/seq - 775 sys sys 1162241047 38441
 386/bin/sha1sum - 775 sys sys 1168402348 61366
@@ -7629,7 +7629,7 @@ sys/man/3/ether - 664 sys sys 984709635 2563
 sys/man/3/floppy - 664 sys sys 954378905 881
 sys/man/3/fs - 664 sys sys 1175145095 3147
 sys/man/3/i82365 - 664 sys sys 954378906 884
-sys/man/3/ip - 664 sys sys 1176959517 24540
+sys/man/3/ip - 664 sys sys 1178484285 24566
 sys/man/3/kbmap - 664 sys sys 1131110122 1732
 sys/man/3/kprof - 664 sys sys 1018029972 1377
 sys/man/3/loopback - 664 sys sys 964662153 1995
@@ -9350,7 +9350,7 @@ sys/src/cmd/9nfs/dat.h - 664 sys sys 1146061147 4432
 sys/src/cmd/9nfs/fns.h - 664 sys sys 1146061148 1927
 sys/src/cmd/9nfs/listalloc.c - 664 sys sys 1131657407 297
 sys/src/cmd/9nfs/mkfile - 664 sys sys 1071498518 640
-sys/src/cmd/9nfs/mport.c - 664 sys sys 1050715069 3779
+sys/src/cmd/9nfs/mport.c - 664 sys sys 1178482676 3749
 sys/src/cmd/9nfs/nametest.c - 664 sys sys 1015090372 1723
 sys/src/cmd/9nfs/nfs.c - 664 sys sys 1131293679 9526
 sys/src/cmd/9nfs/nfs.h - 664 sys sys 1015090372 642
@@ -9360,7 +9360,7 @@ sys/src/cmd/9nfs/pcnfsd.c - 664 sys sys 1146061148 4068
 sys/src/cmd/9nfs/portmapper.c - 664 sys sys 1146061148 3273
 sys/src/cmd/9nfs/rpc.c - 664 sys sys 1017337815 5293
 sys/src/cmd/9nfs/rpc.h - 664 sys sys 1017337815 1996
-sys/src/cmd/9nfs/server.c - 664 sys sys 1146061148 11275
+sys/src/cmd/9nfs/server.c - 664 sys sys 1178482676 11229
 sys/src/cmd/9nfs/string.c - 664 sys sys 1017337815 1659
 sys/src/cmd/9nfs/strparse.c - 664 sys sys 1015090373 506
 sys/src/cmd/9nfs/system.c - 664 sys sys 1017337815 437
@@ -9754,7 +9754,7 @@ sys/src/cmd/aux/reboot.c - 664 sys sys 1162419091 1533
 sys/src/cmd/aux/searchfs.c - 664 sys sys 1143759348 18163
 sys/src/cmd/aux/statusbar.c - 664 sys sys 1138460096 6066
 sys/src/cmd/aux/stub.c - 664 sys sys 1098196222 2723
-sys/src/cmd/aux/timesync.c - 664 sys sys 1176356334 25852
+sys/src/cmd/aux/timesync.c - 664 sys sys 1178482886 25828
 sys/src/cmd/aux/trampoline.c - 664 sys sys 1126104850 3790
 sys/src/cmd/aux/typepasswd.c - 664 sys sys 1143759348 1749
 sys/src/cmd/aux/unlock - 664 sys sys 944960793 0
@@ -12445,12 +12445,12 @@ sys/src/cmd/iostats/statfs.h - 664 sys sys 1140099908 2626
 sys/src/cmd/iostats/statsrv.c - 664 sys sys 1166824341 10773
 sys/src/cmd/ip - 20000000775 sys sys 1128605981 0
 sys/src/cmd/ip/arp.h - 664 sys sys 944961005 751
-sys/src/cmd/ip/dhcp.h - 664 sys sys 1177099797 3420
-sys/src/cmd/ip/dhcpclient.c - 664 sys sys 1050714660 11978
+sys/src/cmd/ip/dhcp.h - 664 sys sys 1178483074 3419
+sys/src/cmd/ip/dhcpclient.c - 664 sys sys 1178482836 11969
 sys/src/cmd/ip/dhcpd - 20000000775 sys sys 1063897571 0
 sys/src/cmd/ip/dhcpd/dat.h - 664 sys sys 1084471353 2522
 sys/src/cmd/ip/dhcpd/db.c - 664 sys sys 1143670612 7466
-sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1172959216 33339
+sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1178482946 33301
 sys/src/cmd/ip/dhcpd/dhcpleases.c - 664 sys sys 1032655001 779
 sys/src/cmd/ip/dhcpd/mkfile - 664 sys sys 1169162185 443
 sys/src/cmd/ip/dhcpd/ndb.c - 664 sys sys 1172959226 6235
@@ -12516,7 +12516,7 @@ sys/src/cmd/ip/imap4d/utils.c - 664 sys sys 1168894057 2587
 sys/src/cmd/ip/ipconfig - 20000000775 sys sys 1176933436 0
 sys/src/cmd/ip/ipconfig/ipconfig.h - 664 sys sys 1178051838 5666
 sys/src/cmd/ip/ipconfig/ipv6.c - 664 sys sys 1178051839 19588
-sys/src/cmd/ip/ipconfig/main.c - 664 sys sys 1178051838 37982
+sys/src/cmd/ip/ipconfig/main.c - 664 sys sys 1178483060 37952
 sys/src/cmd/ip/ipconfig/mkfile - 664 sys sys 1177092388 236
 sys/src/cmd/ip/ipconfig/ppp.c - 664 sys sys 1177092388 1128
 sys/src/cmd/ip/linklocal.c - 664 sys sys 1177099730 867
@@ -12544,7 +12544,7 @@ sys/src/cmd/ip/pptp.c - 664 sys sys 1143759344 16573
 sys/src/cmd/ip/pptpd.c - 664 sys sys 1135487970 23548
 sys/src/cmd/ip/rarpd.c - 664 sys sys 1084470989 3389
 sys/src/cmd/ip/rexexec.c - 664 sys sys 1121977160 742
-sys/src/cmd/ip/rip.c - 664 sys sys 1143759344 12432
+sys/src/cmd/ip/rip.c - 664 sys sys 1178482790 12383
 sys/src/cmd/ip/rlogind.c - 664 sys sys 1121977161 757
 sys/src/cmd/ip/snoopy - 20000000775 sys sys 1144955676 0
 sys/src/cmd/ip/snoopy/arp.c - 664 sys sys 1128179536 1914
@@ -12590,7 +12590,7 @@ sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
 sys/src/cmd/ip/telnetd.c - 664 sys sys 1135487948 11772
 sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
 sys/src/cmd/ip/traceroute.c - 664 sys sys 1169162086 8637
-sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
+sys/src/cmd/ip/udpecho.c - 664 sys sys 1178483004 789
 sys/src/cmd/join.c - 664 sys sys 1158251357 7550
 sys/src/cmd/jpg - 20000000775 sys sys 1132458749 0
 sys/src/cmd/jpg/bmp.c - 664 sys sys 1108852826 4222
@@ -12781,7 +12781,7 @@ sys/src/cmd/mk/var.c - 664 sys sys 1131289510 530
 sys/src/cmd/mk/varsub.c - 664 sys sys 1174930010 4297
 sys/src/cmd/mk/word.c - 664 sys sys 1174930010 2709
 sys/src/cmd/mkdir.c - 664 sys sys 1082593106 1026
-sys/src/cmd/mkfile - 664 sys sys 1176520958 2674
+sys/src/cmd/mkfile - 664 sys sys 1178487482 2603
 sys/src/cmd/mklib - 664 sys sys 1101213349 618
 sys/src/cmd/mkmany - 664 sys sys 1123818681 1304
 sys/src/cmd/mkone - 664 sys sys 1123943673 910
@@ -15727,7 +15727,7 @@ sys/src/libsunrpc/prog.c - 664 sys sys 1046367120 1704
 sys/src/libsunrpc/rpc.c - 664 sys sys 1045589225 9235
 sys/src/libsunrpc/server.c - 664 sys sys 1048645438 5237
 sys/src/libsunrpc/suncall.c - 664 sys sys 1046367121 257
-sys/src/libsunrpc/udp.c - 664 sys sys 1050717777 2193
+sys/src/libsunrpc/udp.c - 664 sys sys 1178482539 2164
 sys/src/libthread - 20000000775 sys sys 1127405454 0
 sys/src/libthread/386.c - 664 sys sys 1014928156 448
 sys/src/libthread/alpha.c - 664 sys sys 1014928156 664
@@ -15813,4 +15813,16 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/scuzz - 775 sys sys 1178422014 115094
+386/bin/aux/nfsserver - 775 sys sys 1178508497 185834
+386/bin/aux/pcnfsd - 775 sys sys 1178508497 129734
+386/bin/aux/portmapper - 775 sys sys 1178508497 128815
+386/bin/aux/timesync - 775 sys sys 1178508498 128678
+386/bin/ip/dhcpclient - 775 sys sys 1178508498 94390
+386/bin/ip/dhcpd - 775 sys sys 1178508499 151191
+386/bin/ip/ipconfig - 775 sys sys 1178508499 158686
+386/bin/ip/rip - 775 sys sys 1178508500 91306
+386/bin/ip/udpecho - 775 sys sys 1178508500 43095
+386/lib/libsunrpc.a - 664 sys sys 1178508502 353148
+sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1178508075 3140
+sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1178508075 30139
+sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1178508075 5166

+ 25 - 25
dist/replica/plan9.db

@@ -123,13 +123,13 @@
 386/bin/aux/mswordstrings - 775 sys sys 1168402283 65541
 386/bin/aux/na - 775 sys sys 1168402284 154423
 386/bin/aux/nfsmount - 775 sys sys 1168402284 234691
-386/bin/aux/nfsserver - 775 sys sys 1169612019 185943
+386/bin/aux/nfsserver - 775 sys sys 1178508497 185834
 386/bin/aux/olefs - 775 sys sys 1168402285 149519
 386/bin/aux/p9bitpost - 775 sys sys 1104121982 127974
 386/bin/aux/pcmcia - 775 sys sys 1148500601 46940
-386/bin/aux/pcnfsd - 775 sys sys 1169612020 129843
+386/bin/aux/pcnfsd - 775 sys sys 1178508497 129734
 386/bin/aux/portmap - 775 sys sys 1168402286 144211
-386/bin/aux/portmapper - 775 sys sys 1169612021 128924
+386/bin/aux/portmapper - 775 sys sys 1178508497 128815
 386/bin/aux/postgif - 775 sys sys 1087442507 175380
 386/bin/aux/postprint - 775 sys sys 1087442507 160041
 386/bin/aux/postreverse - 775 sys sys 1087442508 164726
@@ -145,7 +145,7 @@
 386/bin/aux/stub - 775 sys sys 1168402287 141090
 386/bin/aux/tcpostio - 775 sys sys 1094040084 200808
 386/bin/aux/text2post - 775 sys sys 1104121986 78336
-386/bin/aux/timesync - 775 sys sys 1176404754 128784
+386/bin/aux/timesync - 775 sys sys 1178508498 128678
 386/bin/aux/tr2post - 775 sys sys 1104121987 176578
 386/bin/aux/trampoline - 775 sys sys 1168402288 84145
 386/bin/aux/typepasswd - 775 sys sys 1168402288 69738
@@ -285,8 +285,8 @@
 386/bin/import - 775 sys sys 1174964428 101761
 386/bin/iostats - 775 sys sys 1168402317 100378
 386/bin/ip - 20000000775 sys sys 1016920851 0
-386/bin/ip/dhcpclient - 775 sys sys 1168402317 94377
-386/bin/ip/dhcpd - 775 sys sys 1176488415 151225
+386/bin/ip/dhcpclient - 775 sys sys 1178508498 94390
+386/bin/ip/dhcpd - 775 sys sys 1178508499 151191
 386/bin/ip/dhcpleases - 775 sys sys 1169612024 86533
 386/bin/ip/ftpd - 775 sys sys 1178135892 170692
 386/bin/ip/gping - 775 sys sys 1168402319 183451
@@ -302,7 +302,7 @@
 386/bin/ip/httpd/wikipost - 775 sys sys 1177283321 115228
 386/bin/ip/httpfile - 775 sys sys 1168402324 284262
 386/bin/ip/imap4d - 775 sys sys 1169265834 238152
-386/bin/ip/ipconfig - 775 sys sys 1178076139 158720
+386/bin/ip/ipconfig - 775 sys sys 1178508499 158686
 386/bin/ip/linklocal - 775 sys sys 1177530964 42790
 386/bin/ip/ping - 775 sys sys 1178076139 84614
 386/bin/ip/ppp - 775 sys sys 1169612026 220423
@@ -311,12 +311,12 @@
 386/bin/ip/pptpd - 775 sys sys 1169612027 126140
 386/bin/ip/rarpd - 775 sys sys 1176488416 113001
 386/bin/ip/rexexec - 775 sys sys 1168402327 90215
-386/bin/ip/rip - 775 sys sys 1169612027 91489
+386/bin/ip/rip - 775 sys sys 1178508500 91306
 386/bin/ip/rlogind - 775 sys sys 1168402328 67654
 386/bin/ip/telnetd - 775 sys sys 1168402329 123319
 386/bin/ip/tftpd - 775 sys sys 1176488417 132007
 386/bin/ip/traceroute - 775 sys sys 1169179342 74185
-386/bin/ip/udpecho - 775 sys sys 1148500666 43190
+386/bin/ip/udpecho - 775 sys sys 1178508500 43095
 386/bin/join - 775 sys sys 1168402330 114382
 386/bin/jpg - 775 sys sys 1168402330 174923
 386/bin/kbmap - 775 sys sys 1168402330 144015
@@ -573,7 +573,7 @@
 386/lib/libscribble.a - 664 sys sys 1175972562 107238
 386/lib/libsec.a - 664 sys sys 1176520530 646724
 386/lib/libstdio.a - 664 sys sys 1176432133 126062
-386/lib/libsunrpc.a - 664 sys sys 1176520531 353266
+386/lib/libsunrpc.a - 664 sys sys 1178508502 353148
 386/lib/libthread.a - 664 sys sys 1176432134 71932
 386/lib/libventi.a - 664 sys sys 1168402374 97858
 386/mbr - 775 sys sys 1131317338 407
@@ -7629,7 +7629,7 @@ sys/man/3/ether - 664 sys sys 984709635 2563
 sys/man/3/floppy - 664 sys sys 954378905 881
 sys/man/3/fs - 664 sys sys 1175145095 3147
 sys/man/3/i82365 - 664 sys sys 954378906 884
-sys/man/3/ip - 664 sys sys 1176959517 24540
+sys/man/3/ip - 664 sys sys 1178484285 24566
 sys/man/3/kbmap - 664 sys sys 1131110122 1732
 sys/man/3/kprof - 664 sys sys 1018029972 1377
 sys/man/3/loopback - 664 sys sys 964662153 1995
@@ -9350,7 +9350,7 @@ sys/src/cmd/9nfs/dat.h - 664 sys sys 1146061147 4432
 sys/src/cmd/9nfs/fns.h - 664 sys sys 1146061148 1927
 sys/src/cmd/9nfs/listalloc.c - 664 sys sys 1131657407 297
 sys/src/cmd/9nfs/mkfile - 664 sys sys 1071498518 640
-sys/src/cmd/9nfs/mport.c - 664 sys sys 1050715069 3779
+sys/src/cmd/9nfs/mport.c - 664 sys sys 1178482676 3749
 sys/src/cmd/9nfs/nametest.c - 664 sys sys 1015090372 1723
 sys/src/cmd/9nfs/nfs.c - 664 sys sys 1131293679 9526
 sys/src/cmd/9nfs/nfs.h - 664 sys sys 1015090372 642
@@ -9360,7 +9360,7 @@ sys/src/cmd/9nfs/pcnfsd.c - 664 sys sys 1146061148 4068
 sys/src/cmd/9nfs/portmapper.c - 664 sys sys 1146061148 3273
 sys/src/cmd/9nfs/rpc.c - 664 sys sys 1017337815 5293
 sys/src/cmd/9nfs/rpc.h - 664 sys sys 1017337815 1996
-sys/src/cmd/9nfs/server.c - 664 sys sys 1146061148 11275
+sys/src/cmd/9nfs/server.c - 664 sys sys 1178482676 11229
 sys/src/cmd/9nfs/string.c - 664 sys sys 1017337815 1659
 sys/src/cmd/9nfs/strparse.c - 664 sys sys 1015090373 506
 sys/src/cmd/9nfs/system.c - 664 sys sys 1017337815 437
@@ -9754,7 +9754,7 @@ sys/src/cmd/aux/reboot.c - 664 sys sys 1162419091 1533
 sys/src/cmd/aux/searchfs.c - 664 sys sys 1143759348 18163
 sys/src/cmd/aux/statusbar.c - 664 sys sys 1138460096 6066
 sys/src/cmd/aux/stub.c - 664 sys sys 1098196222 2723
-sys/src/cmd/aux/timesync.c - 664 sys sys 1176356334 25852
+sys/src/cmd/aux/timesync.c - 664 sys sys 1178482886 25828
 sys/src/cmd/aux/trampoline.c - 664 sys sys 1126104850 3790
 sys/src/cmd/aux/typepasswd.c - 664 sys sys 1143759348 1749
 sys/src/cmd/aux/unlock - 664 sys sys 944960793 0
@@ -12445,12 +12445,12 @@ sys/src/cmd/iostats/statfs.h - 664 sys sys 1140099908 2626
 sys/src/cmd/iostats/statsrv.c - 664 sys sys 1166824341 10773
 sys/src/cmd/ip - 20000000775 sys sys 1128605981 0
 sys/src/cmd/ip/arp.h - 664 sys sys 944961005 751
-sys/src/cmd/ip/dhcp.h - 664 sys sys 1177099797 3420
-sys/src/cmd/ip/dhcpclient.c - 664 sys sys 1050714660 11978
+sys/src/cmd/ip/dhcp.h - 664 sys sys 1178483074 3419
+sys/src/cmd/ip/dhcpclient.c - 664 sys sys 1178482836 11969
 sys/src/cmd/ip/dhcpd - 20000000775 sys sys 1063897571 0
 sys/src/cmd/ip/dhcpd/dat.h - 664 sys sys 1084471353 2522
 sys/src/cmd/ip/dhcpd/db.c - 664 sys sys 1143670612 7466
-sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1172959216 33339
+sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1178482946 33301
 sys/src/cmd/ip/dhcpd/dhcpleases.c - 664 sys sys 1032655001 779
 sys/src/cmd/ip/dhcpd/mkfile - 664 sys sys 1169162185 443
 sys/src/cmd/ip/dhcpd/ndb.c - 664 sys sys 1172959226 6235
@@ -12516,7 +12516,7 @@ sys/src/cmd/ip/imap4d/utils.c - 664 sys sys 1168894057 2587
 sys/src/cmd/ip/ipconfig - 20000000775 sys sys 1176933436 0
 sys/src/cmd/ip/ipconfig/ipconfig.h - 664 sys sys 1178051838 5666
 sys/src/cmd/ip/ipconfig/ipv6.c - 664 sys sys 1178051839 19588
-sys/src/cmd/ip/ipconfig/main.c - 664 sys sys 1178051838 37982
+sys/src/cmd/ip/ipconfig/main.c - 664 sys sys 1178483060 37952
 sys/src/cmd/ip/ipconfig/mkfile - 664 sys sys 1177092388 236
 sys/src/cmd/ip/ipconfig/ppp.c - 664 sys sys 1177092388 1128
 sys/src/cmd/ip/linklocal.c - 664 sys sys 1177099730 867
@@ -12544,7 +12544,7 @@ sys/src/cmd/ip/pptp.c - 664 sys sys 1143759344 16573
 sys/src/cmd/ip/pptpd.c - 664 sys sys 1135487970 23548
 sys/src/cmd/ip/rarpd.c - 664 sys sys 1084470989 3389
 sys/src/cmd/ip/rexexec.c - 664 sys sys 1121977160 742
-sys/src/cmd/ip/rip.c - 664 sys sys 1143759344 12432
+sys/src/cmd/ip/rip.c - 664 sys sys 1178482790 12383
 sys/src/cmd/ip/rlogind.c - 664 sys sys 1121977161 757
 sys/src/cmd/ip/snoopy - 20000000775 sys sys 1144955676 0
 sys/src/cmd/ip/snoopy/arp.c - 664 sys sys 1128179536 1914
@@ -12590,7 +12590,7 @@ sys/src/cmd/ip/telnet.h - 664 sys sys 1015090250 5902
 sys/src/cmd/ip/telnetd.c - 664 sys sys 1135487948 11772
 sys/src/cmd/ip/tftpd.c - 664 sys sys 1106943821 7646
 sys/src/cmd/ip/traceroute.c - 664 sys sys 1169162086 8637
-sys/src/cmd/ip/udpecho.c - 664 sys sys 1050714674 855
+sys/src/cmd/ip/udpecho.c - 664 sys sys 1178483004 789
 sys/src/cmd/join.c - 664 sys sys 1158251357 7550
 sys/src/cmd/jpg - 20000000775 sys sys 1132458749 0
 sys/src/cmd/jpg/bmp.c - 664 sys sys 1108852826 4222
@@ -12781,7 +12781,7 @@ sys/src/cmd/mk/var.c - 664 sys sys 1131289510 530
 sys/src/cmd/mk/varsub.c - 664 sys sys 1174930010 4297
 sys/src/cmd/mk/word.c - 664 sys sys 1174930010 2709
 sys/src/cmd/mkdir.c - 664 sys sys 1082593106 1026
-sys/src/cmd/mkfile - 664 sys sys 1176520958 2674
+sys/src/cmd/mkfile - 664 sys sys 1178487482 2603
 sys/src/cmd/mklib - 664 sys sys 1101213349 618
 sys/src/cmd/mkmany - 664 sys sys 1123818681 1304
 sys/src/cmd/mkone - 664 sys sys 1123943673 910
@@ -12800,15 +12800,15 @@ sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1175901604 21010
 sys/src/cmd/ndb/dn.c - 664 sys sys 1177811830 32939
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
-sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1175901450 3147
-sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1177818627 30221
+sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1178508075 3140
+sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1178508075 30139
 sys/src/cmd/ndb/dns.c - 664 sys sys 1177811831 16021
 sys/src/cmd/ndb/dns.h - 664 sys sys 1175901645 10640
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1176746985 8741
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1175901160 4392
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1174626126 2435
 sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1175901148 7440
-sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1175925609 5251
+sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1178508075 5166
 sys/src/cmd/ndb/ipquery.c - 664 sys sys 1124711423 773
 sys/src/cmd/ndb/mkdb.c - 664 sys sys 957402054 2886
 sys/src/cmd/ndb/mkfile - 664 sys sys 1174623575 1984
@@ -15727,7 +15727,7 @@ sys/src/libsunrpc/prog.c - 664 sys sys 1046367120 1704
 sys/src/libsunrpc/rpc.c - 664 sys sys 1045589225 9235
 sys/src/libsunrpc/server.c - 664 sys sys 1048645438 5237
 sys/src/libsunrpc/suncall.c - 664 sys sys 1046367121 257
-sys/src/libsunrpc/udp.c - 664 sys sys 1050717777 2193
+sys/src/libsunrpc/udp.c - 664 sys sys 1178482539 2164
 sys/src/libthread - 20000000775 sys sys 1127405454 0
 sys/src/libthread/386.c - 664 sys sys 1014928156 448
 sys/src/libthread/alpha.c - 664 sys sys 1014928156 664

+ 25 - 0
dist/replica/plan9.log

@@ -48556,3 +48556,28 @@
 1178402416 0 c sys/src/cmd/scuzz/scuzz.c - 664 sys sys 1178401100 37903
 1178418611 0 c sys/games/lib/fortunes - 664 sys sys 1178418339 265010
 1178422217 0 c 386/bin/scuzz - 775 sys sys 1178422014 115094
+1178483416 0 c sys/src/cmd/9nfs/mport.c - 664 sys sys 1178482676 3749
+1178483416 1 c sys/src/cmd/9nfs/server.c - 664 sys sys 1178482676 11229
+1178483416 2 c sys/src/cmd/aux/timesync.c - 664 sys sys 1178482886 25828
+1178483416 3 c sys/src/cmd/ip/dhcp.h - 664 sys sys 1178483074 3419
+1178483416 4 c sys/src/cmd/ip/dhcpclient.c - 664 sys sys 1178482836 11969
+1178483416 5 c sys/src/cmd/ip/dhcpd/dhcpd.c - 664 sys sys 1178482946 33301
+1178483416 6 c sys/src/cmd/ip/ipconfig/main.c - 664 sys sys 1178483060 37952
+1178483416 7 c sys/src/cmd/ip/rip.c - 664 sys sys 1178482790 12383
+1178483416 8 c sys/src/cmd/ip/udpecho.c - 664 sys sys 1178483004 789
+1178483416 9 c sys/src/libsunrpc/udp.c - 664 sys sys 1178482539 2164
+1178485215 0 c sys/man/3/ip - 664 sys sys 1178484285 24566
+1178488816 0 c sys/src/cmd/mkfile - 664 sys sys 1178487482 2603
+1178508616 0 c 386/bin/aux/nfsserver - 775 sys sys 1178508497 185834
+1178508616 1 c 386/bin/aux/pcnfsd - 775 sys sys 1178508497 129734
+1178508616 2 c 386/bin/aux/portmapper - 775 sys sys 1178508497 128815
+1178508616 3 c 386/bin/aux/timesync - 775 sys sys 1178508498 128678
+1178508616 4 c 386/bin/ip/dhcpclient - 775 sys sys 1178508498 94390
+1178508616 5 c 386/bin/ip/dhcpd - 775 sys sys 1178508499 151191
+1178508616 6 c 386/bin/ip/ipconfig - 775 sys sys 1178508499 158686
+1178508616 7 c 386/bin/ip/rip - 775 sys sys 1178508500 91306
+1178508616 8 c 386/bin/ip/udpecho - 775 sys sys 1178508500 43095
+1178508616 9 c 386/lib/libsunrpc.a - 664 sys sys 1178508502 353148
+1178508616 10 c sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1178508075 3140
+1178508616 11 c sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1178508075 30139
+1178508616 12 c sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1178508075 5166

+ 8 - 4
sys/man/3/ip

@@ -665,7 +665,10 @@ If, after an
 one of the following messages is written to
 .BR ctl ,
 then all messages sent to the announced port
-are received on the announced connection prefixed with the given structure.
+are received on the announced connection prefixed
+with the corresponding structure,
+declared in
+.BR <ip.h> .
 .TP
 .B headers
 .EX
@@ -693,7 +696,7 @@ struct OUdphdr
 .EE
 .PP
 .L oldheaders
-is now considered obsolete and should not be used in new programs.
+is now seriously obsolete and will vanish soon.
 .PP
 Before a write, a user must prefix a similar structure to each message.
 The system overrides the user specified local port with the announced
@@ -1077,9 +1080,10 @@ header length errors
 .in -0.25i
 .EE
 .SH "SEE ALSO"
-.IR listen (8),
 .IR dial (2),
-.IR ndb (6)
+.IR ip (2),
+.IR ndb (6),
+.IR listen (8)
 .SH SOURCE
 .B /sys/src/9/ip
 .SH BUGS

+ 0 - 1
sys/src/cmd/9nfs/mport.c

@@ -50,7 +50,6 @@ main(int argc, char **argv)
 		fprint(2, "can't set header mode: %r\n");
 		exits("headers");
 	}
-	fprint(r.ctl, "oldheaders");
 	sprint(name, "%s/remote", dir);
 	fd = open(name, OREAD);
 	if(fd < 0){

+ 10 - 14
sys/src/cmd/9nfs/server.c

@@ -10,7 +10,7 @@ static void	cachereply(Rpccall*, void*, int);
 static int	replycache(int, Rpccall*, long (*)(int, void*, long));
 static void	udpserver(int, Progmap*);
 static void	tcpserver(int, Progmap*);
-static void	getendpoints(OUdphdr*, char*);
+static void	getendpoints(Udphdr*, char*);
 static long	readtcp(int, void*, long);
 static long	writetcp(int, void*, long);
 static int	servemsg(int, long (*)(int, void*, long), long (*)(int, void*, long),
@@ -115,10 +115,8 @@ udpserver(int myport, Progmap *progmap)
 		panic("can't announce %s: %r\n", service);
 	if(fprint(ctlfd, "headers") < 0)
 		panic("can't set header mode: %r\n");
-	fprint(ctlfd, "oldheaders");
 
 	snprint(data, sizeof data, "%s/data", devdir);
-
 	datafd = open(data, ORDWR);
 	if(datafd < 0)
 		panic("can't open udp data: %r\n");
@@ -126,10 +124,8 @@ udpserver(int myport, Progmap *progmap)
 
 	chatsrv(0);
 	clog("%s: listening to port %d\n", argv0, myport);
-	for(;;){
-		if(servemsg(datafd, read, write, myport, progmap) < 0)
-			break;
-	}
+	while (servemsg(datafd, read, write, myport, progmap) >= 0)
+		continue;
 	exits(0);
 }
 
@@ -173,7 +169,7 @@ tcpserver(int myport, Progmap *progmap)
 			if(data < 0)
 				exits(0);
 
-			getendpoints((OUdphdr*)buf, ldir);
+			getendpoints((Udphdr*)buf, ldir);
 
 			for(;;){
 				if(servemsg(data, readtcp, writetcp, myport, progmap) < 0)
@@ -333,7 +329,7 @@ getendpoint(char *dir, char *file, uchar *addr, uchar *port)
 }
 
 static void
-getendpoints(OUdphdr *ep, char *dir)
+getendpoints(Udphdr *ep, char *dir)
 {
 	getendpoint(dir, "local", ep->laddr, ep->lport);
 	getendpoint(dir, "remote", ep->raddr, ep->rport);
@@ -348,8 +344,8 @@ readtcp(int fd, void *vbuf, long blen)
 	char *buf;
 
 	buf = vbuf;
-	buf += OUdphdrsize;
-	blen -= OUdphdrsize;
+	buf += Udphdrsize;
+	blen -= Udphdrsize;
 
 	done = 0;
 	for(sofar = 0; !done; sofar += n){
@@ -365,7 +361,7 @@ readtcp(int fd, void *vbuf, long blen)
 		if(m != n)
 			return 0;
 	}
-	return sofar + OUdphdrsize;
+	return sofar + Udphdrsize;
 }
 
 static long
@@ -374,8 +370,8 @@ writetcp(int fd, void *vbuf, long len)
 	char *buf;
 
 	buf = vbuf;
-	buf += OUdphdrsize;
-	len -= OUdphdrsize;
+	buf += Udphdrsize;
+	len -= Udphdrsize;
 
 	buf -= 4;
 	buf[0] = 0x80 | (len>>24);

+ 4 - 6
sys/src/cmd/aux/timesync.c

@@ -1116,13 +1116,11 @@ openlisten(char *net)
 		sysfatal("can't announce");
 	if(fprint(cfd, "headers") < 0)
 		sysfatal("can't set header mode");
-	fprint(cfd, "oldheaders");
 
 	sprint(data, "%s/data", devdir);
-
 	fd = open(data, ORDWR);
 	if(fd < 0)
-		sysfatal("open udp data");
+		sysfatal("open %s: %r", data);
 	return fd;
 }
 static void
@@ -1158,10 +1156,10 @@ ntpserver(char *servenet)
 		gettime(&recvts, 0, 0);
 		if(n < 0)
 			return;
-		if(n < OUdphdrsize + NTPSIZE)
+		if(n < Udphdrsize + NTPSIZE)
 			continue;
 
-		ntp = (NTPpkt*)(buf+OUdphdrsize);
+		ntp = (NTPpkt*)(buf + Udphdrsize);
 		mode = ntp->mode & 7;
 		vers = (ntp->mode>>3) & 7;
 		if(mode != 3)
@@ -1178,7 +1176,7 @@ ntpserver(char *servenet)
 		memmove(ntp->rootid, rootid, sizeof(ntp->rootid));
 		gettime(&x, 0, 0);
 		hnputts(ntp->xmitts, x);
-		write(fd, buf, NTPSIZE+OUdphdrsize);
+		write(fd, buf, NTPSIZE + Udphdrsize);
 	}
 }
 

+ 1 - 1
sys/src/cmd/ip/dhcp.h

@@ -133,7 +133,7 @@ typedef struct Bootp	Bootp;
 struct Bootp
 {
 	/* Udphdr (included because of structure alignment on the alpha) */
-	uchar	udphdr[OUdphdrsize];
+	uchar	udphdr[Udphdrsize];
 
 	uchar	op;			/* opcode */
 	uchar	htype;			/* hardware type */

+ 57 - 56
sys/src/cmd/ip/dhcpclient.c

@@ -3,25 +3,25 @@
 #include <ip.h>
 #include "dhcp.h"
 
-void	usage(void);
 void	bootpdump(uchar *p, int n);
-int	openlisten(char*);
 void	dhcpinit(void);
-uchar	*optadd(uchar*, int, void*, int);
+void	dhcprecv(void);
+void	dhcpsend(int);
+void	myfatal(char *fmt, ...);
+int	openlisten(char*);
+uchar	*optaddaddr(uchar*, int, uchar*);
 uchar	*optaddbyte(uchar*, int, int);
+uchar	*optadd(uchar*, int, void*, int);
 uchar	*optaddulong(uchar*, int, ulong);
-uchar	*optaddaddr(uchar*, int, uchar*);
 uchar	*optget(Bootp*, int, int);
+int	optgetaddr(Bootp*, int, uchar*);
 int	optgetbyte(Bootp*, int);
 ulong	optgetulong(Bootp*, int);
-int	optgetaddr(Bootp*, int, uchar*);
-void	dhcpsend(int);
-void	dhcprecv(void);
-void	timerthread(void*);
-void	stdinthread(void*);
 Bootp	*parse(uchar*, int);
+void	stdinthread(void*);
 ulong	thread(void(*f)(void*), void *a);
-void	myfatal(char *fmt, ...);
+void	timerthread(void*);
+void	usage(void);
 
 struct {
 	QLock	lk;
@@ -63,14 +63,14 @@ main(int argc, char *argv[])
 	fmtinstall('V', eipfmt);
 
 	dhcpinit();
-	
+
 	rfork(RFNOTEG|RFREND);
 
 	thread(timerthread, 0);
 	thread(stdinthread, 0);
 
 	qlock(&dhcp.lk);
-	dhcp.starttime = time(0);	
+	dhcp.starttime = time(0);
 	dhcp.fd = openlisten(net);
 	dhcpsend(Discover);
 	dhcp.state = Sselecting;
@@ -92,11 +92,11 @@ main(int argc, char *argv[])
 	for(;;) {
 //fprint(2, "got lease for %d\n", dhcp.lease);
 		qunlock(&dhcp.lk);
-		sleep(dhcp.lease*500);		// wait half of lease time
+		sleep(dhcp.lease*500);	/* wait half of lease time */
 		qlock(&dhcp.lk);
 
 //fprint(2, "try renue\n", dhcp.lease);
-		dhcp.starttime = time(0);	
+		dhcp.starttime = time(0);
 		dhcp.fd = openlisten(net);
 		dhcp.xid = time(0)*getpid();
 		dhcpsend(Request);
@@ -130,7 +130,7 @@ timerthread(void*)
 			qunlock(&dhcp.lk);
 			continue;
 		}
-	
+
 		switch(dhcp.state) {
 		default:
 			myfatal("timerthread: unknown state %d", dhcp.state);
@@ -178,7 +178,7 @@ stdinthread(void*)
 {
 	uchar buf[100];
 	int n;
-	
+
 	for(;;) {
 		n = read(0, buf, sizeof(buf));
 		if(n <= 0)
@@ -219,19 +219,19 @@ dhcpinit(void)
 void
 dhcpsend(int type)
 {
-	Bootp bp;
-	OUdphdr *up;
-	uchar *p;
 	int n;
+	uchar *p;
+	Bootp bp;
+	Udphdr *up;
 
-	memset(&bp, 0, sizeof(bp));
-	up = (OUdphdr*)bp.udphdr;
+	memset(&bp, 0, sizeof bp);
+	up = (Udphdr*)bp.udphdr;
 
 	hnputs(up->rport, 67);
 	bp.op = Bootrequest;
 	hnputl(bp.xid, dhcp.xid);
-	hnputs(bp.secs, time(0)-dhcp.starttime);
-	hnputs(bp.flags, Fbroadcast);	// reply must be broadcast
+	hnputs(bp.secs, time(0) - dhcp.starttime);
+	hnputs(bp.flags, Fbroadcast);		/* reply must be broadcast */
 	memmove(bp.optmagic, optmagic, 4);
 	p = bp.optdata;
 	p = optaddbyte(p, ODtype, type);
@@ -240,20 +240,20 @@ dhcpsend(int type)
 	default:
 		myfatal("dhcpsend: unknown message type: %d", type);
 	case Discover:
-		ipmove(up->raddr, IPv4bcast);	// broadcast
+		ipmove(up->raddr, IPv4bcast);	/* broadcast */
 		break;
 	case Request:
 		if(dhcp.state == Sbound || dhcp.state == Srenewing)
 			ipmove(up->raddr, dhcp.server);
 		else
-			ipmove(up->raddr, IPv4bcast);	// broadcast
+			ipmove(up->raddr, IPv4bcast);	/* broadcast */
 		p = optaddulong(p, ODlease, dhcp.lease);
 		if(dhcp.state == Sselecting || dhcp.state == Srequesting) {
-			p = optaddaddr(p, ODipaddr, dhcp.client);	// mistake??
+			p = optaddaddr(p, ODipaddr, dhcp.client);	/* mistake?? */
 			p = optaddaddr(p, ODserverid, dhcp.server);
 		} else
 			v6tov4(bp.ciaddr, dhcp.client);
-		break;	
+		break;
 	case Release:
 		ipmove(up->raddr, dhcp.server);
 		v6tov4(bp.ciaddr, dhcp.client);
@@ -290,7 +290,7 @@ dhcprecv(void)
 	if(bp == 0)
 		return;
 
-if(0) {
+if(1) {
 fprint(2, "recved\n");
 bootpdump(buf, n);
 }
@@ -318,7 +318,7 @@ bootpdump(buf, n);
 		ipmove(dhcp.mask, mask);
 		memmove(dhcp.sname, bp->sname, sizeof(dhcp.sname));
 		dhcp.sname[sizeof(dhcp.sname)-1] = 0;
-	
+
 		dhcpsend(Request);
 		dhcp.state = Srequesting;
 		dhcp.resend = 0;
@@ -349,35 +349,30 @@ bootpdump(buf, n);
 int
 openlisten(char *net)
 {
-	int fd, cfd;
-	char data[128];
-	char devdir[40];
-	int n;
+	int n, fd, cfd;
+	char data[128], devdir[40];
 
 //	sprint(data, "%s/udp!*!bootpc", net);
 	sprint(data, "%s/udp!*!68", net);
-	for(n=0;;n++) {
+	for(n = 0; ; n++) {
 		cfd = announce(data, devdir);
 		if(cfd >= 0)
 			break;
 		/* might be another client - wait and try again */
-		fprint(2, "dhcpclient: can't announce: %r");
+		fprint(2, "dhcpclient: can't announce %s: %r", data);
 		sleep(1000);
-		if(n>10)
+		if(n > 10)
 			myfatal("can't announce: giving up: %r");
 	}
 
 	if(fprint(cfd, "headers") < 0)
 		myfatal("can't set header mode: %r");
-	fprint(cfd, "oldheaders");
 
 	sprint(data, "%s/data", devdir);
-
 	fd = open(data, ORDWR);
 	if(fd < 0)
-		myfatal("open udp data: %r");
+		myfatal("open %s: %r", data);
 	close(cfd);
-
 	return fd;
 }
 
@@ -490,7 +485,8 @@ parse(uchar *p, int n)
 	}
 
 	if(dhcp.xid != nhgetl(bp->xid)) {
-		fprint(2, "dhcpclient: parse: bad xid: got %ux expected %lux\n", nhgetl(bp->xid), dhcp.xid);
+		fprint(2, "dhcpclient: parse: bad xid: got %ux expected %lux\n",
+			nhgetl(bp->xid), dhcp.xid);
 		return 0;
 	}
 
@@ -507,7 +503,8 @@ parse(uchar *p, int n)
 		return 0;
 	}
 	if(memcmp(optmagic, p, 4) != 0) {
-		fprint(2, "dhcpclient: parse: bad opt magic %ux %ux %ux %ux\n", p[0], p[1], p[2], p[3]);
+		fprint(2, "dhcpclient: parse: bad opt magic %ux %ux %ux %ux\n",
+			p[0], p[1], p[2], p[3]);
 		return 0;
 	}
 	p += 4;
@@ -530,7 +527,7 @@ parse(uchar *p, int n)
 			return 0;
 		}
 		p += len;
-		n -= len;		
+		n -= len;
 	}
 
 	/* fix up nonstandard packets */
@@ -543,22 +540,24 @@ parse(uchar *p, int n)
 void
 bootpdump(uchar *p, int n)
 {
-	Bootp *bp;
-	OUdphdr *up;
 	int len, i, code;
+	Bootp *bp;
+	Udphdr *up;
 
 	bp = (Bootp*)p;
-	up = (OUdphdr*)bp->udphdr;
+	up = (Udphdr*)bp->udphdr;
 
 	if(n < bp->optmagic - p) {
 		fprint(2, "dhcpclient: short bootp packet");
 		return;
 	}
 
-	fprint(2, "laddr=%I lport=%d raddr=%I rport=%d\n", up->laddr, nhgets(up->lport),
-			up->raddr, nhgets(up->rport));
-	fprint(2, "op=%d htype=%d hlen=%d hops=%d\n", bp->op, bp->htype, bp->hlen, bp->hops);
-	fprint(2, "xid=%ux secs=%d flags=%ux\n", nhgetl(bp->xid), nhgets(bp->secs), nhgets(bp->flags));
+	fprint(2, "laddr=%I lport=%d raddr=%I rport=%d\n", up->laddr,
+		nhgets(up->lport), up->raddr, nhgets(up->rport));
+	fprint(2, "op=%d htype=%d hlen=%d hops=%d\n", bp->op, bp->htype,
+		bp->hlen, bp->hops);
+	fprint(2, "xid=%ux secs=%d flags=%ux\n", nhgetl(bp->xid),
+		nhgets(bp->secs), nhgets(bp->flags));
 	fprint(2, "ciaddr=%V yiaddr=%V siaddr=%V giaddr=%V\n",
 		bp->ciaddr, bp->yiaddr, bp->siaddr, bp->giaddr);
 	fprint(2, "chaddr=");
@@ -567,14 +566,15 @@ bootpdump(uchar *p, int n)
 	fprint(2, "\n");
 	fprint(2, "sname=%s\n", bp->sname);
 	fprint(2, "file = %s\n", bp->file);
-	
+
 	n -= bp->optmagic - p;
 	p = bp->optmagic;
 
 	if(n < 4)
 		return;
 	if(memcmp(optmagic, p, 4) != 0)
-		fprint(2, "dhcpclient: bad opt magic %ux %ux %ux %ux\n", p[0], p[1], p[2], p[3]);
+		fprint(2, "dhcpclient: bad opt magic %ux %ux %ux %ux\n",
+			p[0], p[1], p[2], p[3]);
 	p += 4;
 	n -= 4;
 
@@ -608,7 +608,7 @@ bootpdump(uchar *p, int n)
 			for(i = 0; i<len; i++)
 				fprint(2, "%ux ", p[i]);
 			fprint(2, "\n");
-			break;	
+			break;
 		case ODlease:
 			fprint(2, "lease=%d\n", nhgetl(p));
 			break;
@@ -623,7 +623,7 @@ bootpdump(uchar *p, int n)
 			break;
 		}
 		p += len;
-		n -= len;		
+		n -= len;
 	}
 }
 
@@ -631,13 +631,14 @@ ulong
 thread(void(*f)(void*), void *a)
 {
 	int pid;
-	pid=rfork(RFNOWAIT|RFMEM|RFPROC);
+
+	pid = rfork(RFNOWAIT|RFMEM|RFPROC);
 	if(pid < 0)
 		myfatal("rfork failed: %r");
 	if(pid != 0)
 		return pid;
 	(*f)(a);
-	return 0; // never reaches here
+	return 0;	/* never reaches here */
 }
 
 void

+ 9 - 11
sys/src/cmd/ip/dhcpd/dhcpd.c

@@ -14,7 +14,7 @@ struct Req
 {
 	int	fd;			/* for reply */
 	Bootp	*bp;
-	OUdphdr	*up;
+	Udphdr	*up;
 	uchar	*e;			/* end of received message */
 	uchar	*p;			/* options pointer */
 	uchar	*max;			/* max end of reply */
@@ -299,7 +299,7 @@ main(int argc, char **argv)
 		memset(&r, 0, sizeof(r));
 		r.fd = fd;
 		n = readlast(r.fd, r.buf, sizeof(r.buf));
-		if(n < OUdphdrsize)
+		if(n < Udphdrsize)
 			fatal(1, "error reading requests");
 		start = nsec()/1000;
 		op = optbuf;
@@ -320,8 +320,8 @@ proto(Req *rp, int n)
 
 	rp->e = rp->buf + n;
 	rp->bp = (Bootp*)rp->buf;
-	rp->up = (OUdphdr*)rp->buf;
-	rp->max = rp->buf + OUdphdrsize + MINSUPPORTED - IPUDPHDRSIZE;
+	rp->up = (Udphdr*)rp->buf;
+	rp->max = rp->buf + Udphdrsize + MINSUPPORTED - IPUDPHDRSIZE;
 	rp->p = rp->bp->optdata;
 	v4tov6(rp->giaddr, rp->bp->giaddr);
 	v4tov6(rp->ciaddr, rp->bp->ciaddr);
@@ -708,7 +708,7 @@ sendoffer(Req *rp, uchar *ip, int offer)
 	int n;
 	ushort flags;
 	Bootp *bp;
-	OUdphdr *up;
+	Udphdr *up;
 
 	bp = rp->bp;
 	up = rp->up;
@@ -768,7 +768,7 @@ sendack(Req *rp, uchar *ip, int offer, int sendlease)
 	int n;
 	ushort flags;
 	Bootp *bp;
-	OUdphdr *up;
+	Udphdr *up;
 
 	bp = rp->bp;
 	up = rp->up;
@@ -828,7 +828,7 @@ sendnak(Req *rp, char *msg)
 {
 	int n;
 	Bootp *bp;
-	OUdphdr *up;
+	Udphdr *up;
 
 	bp = rp->bp;
 	up = rp->up;
@@ -881,7 +881,7 @@ bootp(Req *rp)
 {
 	int n;
 	Bootp *bp;
-	OUdphdr *up;
+	Udphdr *up;
 	ushort flags;
 	Iplifc *lifc;
 	Info *iip;
@@ -1067,7 +1067,7 @@ parseoptions(Req *rp)
 		case ODmaxmsg:
 			c = nhgets(o);
 			c -= 28;
-			c += OUdphdrsize;
+			c += Udphdrsize;
 			if(c > 0)
 				rp->max = rp->buf + c;
 			break;
@@ -1274,10 +1274,8 @@ openlisten(char *net)
 		fatal(1, "can't announce");
 	if(fprint(cfd, "headers") < 0)
 		fatal(1, "can't set header mode");
-	fprint(cfd, "oldheaders");
 
 	sprint(data, "%s/data", devdir);
-
 	fd = open(data, ORDWR);
 	if(fd < 0)
 		fatal(1, "open udp data");

+ 2 - 3
sys/src/cmd/ip/ipconfig/main.c

@@ -1024,7 +1024,7 @@ dhcpsend(int type)
 	uchar *p;
 	int n;
 	uchar vendor[64];
-	OUdphdr *up = (OUdphdr*)bp.udphdr;
+	Udphdr *up = (Udphdr*)bp.udphdr;
 
 	memset(&bp, 0, sizeof bp);
 
@@ -1290,12 +1290,11 @@ openlisten(void)
 
 	if(fprint(cfd, "headers") < 0)
 		sysfatal("can't set header mode: %r");
-	fprint(cfd, "oldheaders");
 
 	sprint(data, "%s/data", devdir);
 	fd = open(data, ORDWR);
 	if(fd < 0)
-		sysfatal("open udp data: %r");
+		sysfatal("open %s: %r", data);
 	close(cfd);
 	return fd;
 }

+ 23 - 29
sys/src/cmd/ip/rip.c

@@ -201,19 +201,17 @@ usage(void)
 void
 main(int argc, char *argv[])
 {
-	int i, n;
-	OUdphdr *up;
-	Ripmsg *m;
-	Rip *r;
-	Route route;
-	Bnet *bn, **l;
-	int dobroadcast;
-	char buf[2*1024];
+	int dobroadcast, i, n;
 	long diff;
 	char *p;
-	static long btime;
+	char buf[2*1024];
 	uchar raddr[Pasize];
-
+	Bnet *bn, **l;
+	Udphdr *up;
+	Rip *r;
+	Ripmsg *m;
+	Route route;
+	static long btime;
 
 	setnetmtpt(netdir, sizeof(netdir), nil);
 	dobroadcast = 0;
@@ -292,12 +290,12 @@ main(int argc, char *argv[])
 		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);
@@ -324,9 +322,8 @@ main(int argc, char *argv[])
 int
 openport(void)
 {
-	char data[128];
-	char devdir[40];
 	int ripctl, rip;
+	char data[128], devdir[40];
 
 	snprint(data, sizeof(data), "%s/udp!*!rip", netdir);
 	ripctl = announce(data, devdir);
@@ -334,10 +331,8 @@ openport(void)
 		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);
-
 	rip = open(data, ORDWR);
 	if(rip < 0)
 		fatal(1, "open udp data");
@@ -370,14 +365,14 @@ readifcs(void)
 			ip->cmask = v4defmask(ip->net);
 			v4maskip(ip->net, ip->cmask, ip->cnet);
 			ip->bcast = 0;
-	
+
 			/* add as a route */
 			memmove(route.mask, ip->mask, Pasize);
 			memmove(route.dest, ip->net, Pasize);
 			memset(route.gate, 0, Pasize);
 			route.metric = 0;
 			considerroute(&route);
-	
+
 			/* mark as broadcast */
 			if(bnets == 0)
 				ip->bcast = 1;
@@ -614,18 +609,17 @@ void
 sendto(Ifc *ip)
 {
 	int h, n;
-	Route *r;
-	uchar mbuf[OUdphdrsize+512];
+	uchar raddr[Pasize], mbuf[Udphdrsize+512];
 	Ripmsg *m;
-	OUdphdr *u;
-	uchar raddr[Pasize];
+	Route *r;
+	Udphdr *u;
 
-	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)
@@ -663,17 +657,18 @@ sendto(Ifc *ip)
 			hnputs(m->rip[n].family, AF_INET);
 
 			if(debug)
-				fprint(2, " %16V & %16V -> %16V %2d\n", r->dest, r->mask, r->gate, r->metric);
+				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)
@@ -685,7 +680,6 @@ broadcast(void)
 		if(ialloc.ifc[i].bcast)
 			sendto(&ialloc.ifc[i]);
 	}
-
 }
 
 /*

+ 9 - 19
sys/src/cmd/ip/udpecho.c

@@ -13,40 +13,30 @@ void
 main(int argc, char **argv)
 {
 	int fd, cfd, n;
-	char data[128];
-	char devdir[40];
-	char buf[4096];
-	char net[32];
-	char *p;
+	char buf[4096], data[128], devdir[40], net[32];
 
-	setnetmtpt(net, sizeof(net), nil);
+	setnetmtpt(net, sizeof net, nil);
 
 	ARGBEGIN{
 	case 'x':
-		p = ARGF();
-		if(p == nil)
-			usage();
-		setnetmtpt(net, sizeof(net), p);
+		setnetmtpt(net, sizeof net, EARGF(usage()));
 		break;
 	}ARGEND;
 
 	sprint(data, "%s/udp!*!echo", net);
 	cfd = announce(data, devdir);
 	if(cfd < 0)
-		sysfatal("can't announce: %r");
+		sysfatal("can't announce %s: %r", data);
 	if(fprint(cfd, "headers") < 0)
 		sysfatal("can't set header mode: %r");
-	fprint(cfd, "oldheaders");
 
 	sprint(data, "%s/data", devdir);
-
 	fd = open(data, ORDWR);
 	if(fd < 0)
-		sysfatal("open udp data");
-	for(;;){
-		n = read(fd, buf, sizeof(buf));
-		if(n < 0)
-			sysfatal("error reading: %r");
+		sysfatal("open %s: %r", data);
+	while ((n = read(fd, buf, sizeof buf)) > 0)
 		write(fd, buf, n);
-	}
+	if (n < 0)
+		sysfatal("error reading: %r");
+	exits(0);
 }

+ 3 - 3
sys/src/cmd/mkfile

@@ -7,9 +7,9 @@ PROGS=${TARG:%=$O.%}
 LDFLAGS=
 YFLAGS=-d
 
-NOTSYS=sml|dup
-BUGGERED=gc|lmlvideo|dwb|unix|perl|celp|mosml|ovac|vfs|aviation|_vnc|postscript|nventi|cvsold|cvs
-OUTOFDATE=old|ssls
+NOTSYS=sml|dup|.+\..+
+BUGGERED=unix|postscript
+OUTOFDATE=old
 
 NOMK=$NOTSYS|$BUGGERED|$OUTOFDATE
 

+ 5 - 5
sys/src/cmd/ndb/dnnotify.c

@@ -58,9 +58,9 @@ send_notify(char *slave, RR *soa, Request *req)
 {
 	int i, len, n, reqno, status, fd;
 	char *err;
-	uchar ibuf[Maxudp+OUdphdrsize], obuf[Maxudp+OUdphdrsize];
+	uchar ibuf[Maxudp+Udphdrsize], obuf[Maxudp+Udphdrsize];
 	RR *rp;
-	OUdphdr *up = (OUdphdr*)obuf;
+	Udphdr *up = (Udphdr*)obuf;
 	DNSmsg repmsg;
 
 	/* create the request */
@@ -85,7 +85,7 @@ send_notify(char *slave, RR *soa, Request *req)
 	notify(ding);
 
 	/* send 3 times or until we get anything back */
-	n += OUdphdrsize;
+	n += Udphdrsize;
 	for(i = 0; i < 3; i++){
 		dnslog("sending %d byte notify to %s/%I.%d about %s", n, slave,
 			up->raddr, nhgets(up->rport), soa->owner->name);
@@ -94,10 +94,10 @@ send_notify(char *slave, RR *soa, Request *req)
 		alarm(2*1000);
 		len = read(fd, ibuf, sizeof ibuf);
 		alarm(0);
-		if(len <= OUdphdrsize)
+		if(len <= Udphdrsize)
 			continue;
 		memset(&repmsg, 0, sizeof repmsg);
-		err = convM2DNS(&ibuf[OUdphdrsize], len, &repmsg, nil);
+		err = convM2DNS(&ibuf[Udphdrsize], len, &repmsg, nil);
 		if(err != nil) {
 			free(err);
 			continue;

+ 11 - 13
sys/src/cmd/ndb/dnresolve.c

@@ -446,7 +446,6 @@ walkup(char *name)
  *  into "headers" mode.
  */
 static char *hmsg = "headers";
-static char *ohmsg = "oldheaders";
 
 int
 udpport(char *mtpt)
@@ -468,7 +467,6 @@ udpport(char *mtpt)
 		warning(hmsg);
 		return -1;
 	}
-	write(ctl, ohmsg, strlen(ohmsg));
 
 	/* grab the data file */
 	snprint(ds, sizeof ds, "%s/data", adir);
@@ -485,7 +483,7 @@ mkreq(DN *dp, int type, uchar *buf, int flags, ushort reqno)
 {
 	DNSmsg m;
 	int len;
-	OUdphdr *uh = (OUdphdr*)buf;
+	Udphdr *uh = (Udphdr*)buf;
 
 	/* stuff port number into output buffer */
 	memset(uh, 0, sizeof *uh);
@@ -498,7 +496,7 @@ mkreq(DN *dp, int type, uchar *buf, int flags, ushort reqno)
 	m.qd = rralloc(type);
 	m.qd->owner = dp;
 	m.qd->type = type;
-	len = convDNS2M(&m, &buf[OUdphdrsize], Maxudp);
+	len = convDNS2M(&m, &buf[Udphdrsize], Maxudp);
 	rrfree(m.qd);
 	return len;
 }
@@ -542,12 +540,12 @@ readnet(Query *qp, int medium, uchar *ibuf, ulong endtime, uchar **replyp,
 		if (qp->udpfd <= 0) 
 			dnslog("readnet: qp->udpfd closed");
 		else {
-			len = read(qp->udpfd, ibuf, OUdphdrsize+Maxudpin);
+			len = read(qp->udpfd, ibuf, Udphdrsize+Maxudpin);
 			if (len >= IPaddrlen)
 				memmove(srcip, ibuf, IPaddrlen);
-			if (len >= OUdphdrsize) {
-				len   -= OUdphdrsize;
-				reply += OUdphdrsize;
+			if (len >= Udphdrsize) {
+				len   -= Udphdrsize;
+				reply += Udphdrsize;
 			}
 		}
 	} else {
@@ -843,8 +841,8 @@ mydnsquery(Query *qp, int medium, uchar *udppkt, int len)
 		if (qp->udpfd <= 0)
 			dnslog("mydnsquery: qp->udpfd closed");
 		else {
-			if (write(qp->udpfd, udppkt, len+OUdphdrsize) !=
-			    len+OUdphdrsize)
+			if (write(qp->udpfd, udppkt, len+Udphdrsize) !=
+			    len+Udphdrsize)
 				warning("sending udp msg %r");
 			rv = 0;
 		}
@@ -873,7 +871,7 @@ mydnsquery(Query *qp, int medium, uchar *udppkt, int len)
 			belen[0] = len >> 8;
 			belen[1] = len;
 			if (write(qp->tcpfd, belen, 2) != 2 ||
-			    write(qp->tcpfd, udppkt + OUdphdrsize, len) != len)
+			    write(qp->tcpfd, udppkt + Udphdrsize, len) != len)
 				warning("sending tcp msg %r");
 		}
 		free(domain);
@@ -1237,9 +1235,9 @@ udpquery(Query *qp, char *mntpt, int depth, int patient, int inns)
 	static ulong lastmount;
 
 	/* use alloced buffers rather than ones from the stack */
-	// ibuf = emalloc(Maxudpin+OUdphdrsize);
+	// ibuf = emalloc(Maxudpin+Udphdrsize);
 	ibuf = emalloc(64*1024);		/* max. tcp reply size */
-	obuf = emalloc(Maxudp+OUdphdrsize);
+	obuf = emalloc(Maxudp+Udphdrsize);
 
 	fd = udpport(mntpt);
 	while (fd < 0 && cfg.straddle && strcmp(mntpt, "/net.alt") == 0) {

+ 14 - 16
sys/src/cmd/ndb/dnudpserver.c

@@ -20,7 +20,7 @@ typedef struct Inprogress Inprogress;
 struct Inprogress
 {
 	int	inuse;
-	OUdphdr	uh;
+	Udphdr	uh;
 	DN	*owner;
 	int	type;
 	int	id;
@@ -35,9 +35,9 @@ static Inprogress*
 clientrxmit(DNSmsg *req, uchar *buf)
 {
 	Inprogress *p, *empty;
-	OUdphdr *uh;
+	Udphdr *uh;
 
-	uh = (OUdphdr *)buf;
+	uh = (Udphdr *)buf;
 	empty = nil;
 	for(p = inprog; p < &inprog[Maxactive]; p++){
 		if(p->inuse == 0){
@@ -48,7 +48,7 @@ clientrxmit(DNSmsg *req, uchar *buf)
 		if(req->id == p->id)
 		if(req->qd->owner == p->owner)
 		if(req->qd->type == p->type)
-		if(memcmp(uh, &p->uh, OUdphdrsize) == 0)
+		if(memcmp(uh, &p->uh, Udphdrsize) == 0)
 			return nil;
 	}
 	if(empty == nil)
@@ -57,7 +57,7 @@ clientrxmit(DNSmsg *req, uchar *buf)
 	empty->id = req->id;
 	empty->owner = req->qd->owner;
 	empty->type = req->qd->type;
-	memmove(&empty->uh, uh, OUdphdrsize);
+	memmove(&empty->uh, uh, Udphdrsize);
 	empty->inuse = 1;
 	return empty;
 }
@@ -69,13 +69,13 @@ void
 dnudpserver(char *mntpt)
 {
 	int fd, len, op, rcode;
-	uchar buf[OUdphdrsize + Maxudp + 1024];
+	uchar buf[Udphdrsize + Maxudp + 1024];
 	char *err;
 	char tname[32];
 	Request req;
 	DNSmsg reqmsg, repmsg;
 	Inprogress *p;
-	OUdphdr *uh;
+	Udphdr *uh;
 
 	/* fork sharing text, data, and bss with parent */
 	switch(rfork(RFPROC|RFNOTEG|RFMEM|RFNOWAIT)){
@@ -112,18 +112,18 @@ restart:
 		alarm(60*1000);
 		len = read(fd, buf, sizeof buf);
 		alarm(0);
-		if(len <= OUdphdrsize)
+		if(len <= Udphdrsize)
 			goto restart;
-		uh = (OUdphdr*)buf;
-		len -= OUdphdrsize;
+		uh = (Udphdr*)buf;
+		len -= Udphdrsize;
 
 		// dnslog("read received UDP from %I to %I",
-		//	((OUdphdr*)buf)->raddr, ((OUdphdr*)buf)->laddr);
+		//	((Udphdr*)buf)->raddr, ((Udphdr*)buf)->laddr);
 		getactivity(&req, 0);
 		req.aborttime = now + Maxreqtm;
 		rcode = 0;
 
-		err = convM2DNS(&buf[OUdphdrsize], len, &reqmsg, &rcode);
+		err = convM2DNS(&buf[Udphdrsize], len, &reqmsg, &rcode);
 		if(err){
 			/* first bytes in buf are source IP addr */
 			dnslog("server: input error: %s from %I", err, buf);
@@ -196,7 +196,6 @@ freereq:
  *  announce on udp port and set message style interface
  */
 static char *hmsg = "headers";
-static char *ohmsg = "oldheaders";
 
 static int
 udpannounce(char *mntpt)
@@ -218,7 +217,6 @@ udpannounce(char *mntpt)
 	/* turn on header style interface */
 	if(write(ctl, hmsg, strlen(hmsg)) , 0)
 		abort();			/* hmsg */
-	write(ctl, ohmsg, strlen(ohmsg));
 	data = open(datafile, ORDWR);
 	if(data < 0){
 		close(ctl);
@@ -244,8 +242,8 @@ reply(int fd, uchar *buf, DNSmsg *rep, Request *reqp)
 			rrname(rep->qd->type, tname, sizeof tname),
 			rep->qd, rep->an, rep->ns, rep->ar);
 
-	len = convDNS2M(rep, &buf[OUdphdrsize], Maxudp);
-	len += OUdphdrsize;
+	len = convDNS2M(rep, &buf[Udphdrsize], Maxudp);
+	len += Udphdrsize;
 	if(write(fd, buf, len) != len)
 		dnslog("error sending reply: %r");
 }

+ 8 - 8
sys/src/libsunrpc/udp.c

@@ -7,23 +7,24 @@
 typedef struct SunMsgUdp SunMsgUdp;
 struct SunMsgUdp
 {
-	SunMsg msg;
-	Udphdr udp;
+	SunMsg	msg;
+	Udphdr	udp;
 };
 
 typedef struct Arg Arg;
 struct Arg
 {
-	SunSrv *srv;
-	Channel *creply;
-	Channel *csync;
-	int fd;
+	SunSrv	*srv;
+	Channel	*creply;
+	Channel	*csync;
+	int 	fd;
 };
 
 enum
 {
 	UdpMaxRead = 65536+Udphdrsize
 };
+
 static void
 sunUdpRead(void *v)
 {
@@ -87,7 +88,6 @@ sunSrvUdp(SunSrv *srv, char *address)
 		close(acfd);
 		return -1;
 	}
-	write(acfd, "oldheaders", 10);
 	snprint(data, sizeof data, "%s/data", adir);
 	if((fd = open(data, ORDWR)) < 0){
 		werrstr("open %s: %r", data);
@@ -100,7 +100,7 @@ sunSrvUdp(SunSrv *srv, char *address)
 	arg->fd = fd;
 	arg->srv = srv;
 	arg->creply = chancreate(sizeof(SunMsg*), 10);
-	arg->csync = chancreate(sizeof(void*), 10);
+	arg->csync =  chancreate(sizeof(void*), 10);
 
 	proccreate(sunUdpRead, arg, SunStackSize);
 	proccreate(sunUdpWrite, arg, SunStackSize);