diff options
| author | Garrett Wollman <wollman@FreeBSD.org> | 1995-02-07 02:01:57 +0000 |
|---|---|---|
| committer | Garrett Wollman <wollman@FreeBSD.org> | 1995-02-07 02:01:57 +0000 |
| commit | 24e16f2e1c1c0e85496a6d276a9c7783df4601ce (patch) | |
| tree | 01d12d095d27d717ff009dabbfe019411374fd09 /sys/net | |
| parent | 6b8fda4d12c938e834161988da8e0f5c02ae8606 (diff) | |
| download | src-24e16f2e1c1c0e85496a6d276a9c7783df4601ce.tar.gz src-24e16f2e1c1c0e85496a6d276a9c7783df4601ce.zip | |
Merge in the socket-level support for Transaction TCP from the OLAH_TTCP
branch.
Submitted by: Andras Olah <olah@cs.utwente.nl>
Notes
Notes:
svn path=/head/; revision=6223
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/route.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/net/route.h b/sys/net/route.h index 97ec9e4d36a4..94b9be77d83b 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.h 8.3 (Berkeley) 4/19/94 - * $Id: route.h,v 1.7 1995/01/23 02:00:35 wollman Exp $ + * $Id: route.h,v 1.8 1995/01/24 04:47:33 bde Exp $ */ #ifndef _NET_ROUTE_H_ @@ -184,7 +184,17 @@ struct rt_msghdr { struct rt_metrics rtm_rmx; /* metrics themselves */ }; +<<<<<<< route.h #define RTM_VERSION 5 /* Up the ante and ignore older versions */ +||||||| 1.5.4.1 +#define RTM_VERSION 3 /* Up the ante and ignore older versions */ +======= +#define RTM_VERSION 3 /* Up the ante and ignore older versions */ +#ifdef TTCP +#undef RTM_VERSION +#define RTM_VERSION 4 /* T/TCP requires changes in the rmx */ +#endif +>>>>>>> /tmp/T4000726 #define RTM_ADD 0x1 /* Add Route */ #define RTM_DELETE 0x2 /* Delete Route */ |