diff options
| author | wollman <wollman@FreeBSD.org> | 1995-02-09 23:13:27 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-02-09 23:13:27 +0000 |
| commit | 72af2aa44a98381d496043f67a333df345e987a9 (patch) | |
| tree | 6b8f4500f8844dcde0c5fcc625cf24bb530f5240 /sys/netinet/in_proto.c | |
| parent | 93f26e434abdf6c41008b87288c038fa1ada912f (diff) | |
| download | FreeBSD-src-72af2aa44a98381d496043f67a333df345e987a9.zip FreeBSD-src-72af2aa44a98381d496043f67a333df345e987a9.tar.gz | |
Merge Transaction TCP, courtesy of Andras Olah <olah@cs.utwente.nl> and
Bob Braden <braden@isi.edu>.
NB: This has not had David's TCP ACK hack re-integrated. It is not clear
what the correct solution to this problem is, if any. If a better solution
doesn't pop up in response to this message, I'll put David's code back in
(or he's welcome to do so himself).
Diffstat (limited to 'sys/netinet/in_proto.c')
| -rw-r--r-- | sys/netinet/in_proto.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 9455875..e14e9d8 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -97,15 +97,12 @@ struct protosw inetsw[] = { #ifdef TTCP { SOCK_STREAM, &inetdomain, IPPROTO_TCP, PR_CONNREQUIRED|PR_IMPLOPCL|PR_WANTRCVD, - tcp_input, 0, tcp_ctlinput, tcp_ctloutput, - tcp_usrreq, - tcp_init, tcp_fasttimo, tcp_slowtimo, tcp_drain, tcp_sysctl #else { SOCK_STREAM, &inetdomain, IPPROTO_TCP, PR_CONNREQUIRED|PR_WANTRCVD, +#endif tcp_input, 0, tcp_ctlinput, tcp_ctloutput, tcp_usrreq, - tcp_init, tcp_fasttimo, tcp_slowtimo, tcp_drain, -#endif + tcp_init, tcp_fasttimo, tcp_slowtimo, tcp_drain, tcp_sysctl }, { SOCK_RAW, &inetdomain, IPPROTO_RAW, PR_ATOMIC|PR_ADDR, rip_input, rip_output, 0, rip_ctloutput, |
