projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compaq changes
[unix-history]
/
usr
/
src
/
sys
/
netns
/
ns.h
diff --git
a/usr/src/sys/netns/ns.h
b/usr/src/sys/netns/ns.h
index
1390c4d
..
9db9714
100644
(file)
--- a/
usr/src/sys/netns/ns.h
+++ b/
usr/src/sys/netns/ns.h
@@
-1,9
+1,10
@@
/*
/*
- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved. The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
+ * All rights reserved.
*
*
- * @(#)ns.h 6.6 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ * @(#)ns.h 7.7 (Berkeley) %G%
*/
/*
*/
/*
@@
-53,6
+54,7
@@
#define SO_NSIP_ROUTE 5
#define SO_SEQNO 6
#define SO_ALL_PACKETS 7
#define SO_NSIP_ROUTE 5
#define SO_SEQNO 6
#define SO_ALL_PACKETS 7
+#define SO_MTU 8
/*
/*
@@
-68,6
+70,11
@@
union ns_net {
u_short s_net[2];
};
u_short s_net[2];
};
+union ns_net_u {
+ union ns_net net_e;
+ u_long long_e;
+};
+
struct ns_addr {
union ns_net x_net;
union ns_host x_host;
struct ns_addr {
union ns_net x_net;
union ns_host x_host;
@@
-78,13
+85,19
@@
struct ns_addr {
* Socket address, Xerox style
*/
struct sockaddr_ns {
* Socket address, Xerox style
*/
struct sockaddr_ns {
- u_short sns_family;
+ u_char sns_len;
+ u_char sns_family;
struct ns_addr sns_addr;
char sns_zero[2];
};
#define sns_port sns_addr.x_port
struct ns_addr sns_addr;
char sns_zero[2];
};
#define sns_port sns_addr.x_port
-#define ns_netof(a) (*(long *) & ((a).x_net))
+#ifdef vax
+#define ns_netof(a) (*(long *) & ((a).x_net)) /* XXX - not needed */
+#endif
+#define ns_neteqnn(a,b) (((a).s_net[0]==(b).s_net[0]) && \
+ ((a).s_net[1]==(b).s_net[1]))
+#define ns_neteq(a,b) ns_neteqnn((a).x_net, (b).x_net)
#define satons_addr(sa) (((struct sockaddr_ns *)&(sa))->sns_addr)
#define ns_hosteqnh(s,t) ((s).s_host[0] == (t).s_host[0] && \
(s).s_host[1] == (t).s_host[1] && (s).s_host[2] == (t).s_host[2])
#define satons_addr(sa) (((struct sockaddr_ns *)&(sa))->sns_addr)
#define ns_hosteqnh(s,t) ((s).s_host[0] == (t).s_host[0] && \
(s).s_host[1] == (t).s_host[1] && (s).s_host[2] == (t).s_host[2])
@@
-92,22
+105,20
@@
struct sockaddr_ns {
#define ns_nullhost(x) (((x).x_host.s_host[0]==0) && \
((x).x_host.s_host[1]==0) && ((x).x_host.s_host[2]==0))
#define ns_nullhost(x) (((x).x_host.s_host[0]==0) && \
((x).x_host.s_host[1]==0) && ((x).x_host.s_host[2]==0))
-#if !defined(vax)
-#if !defined(INET)
-/*
- * Macros for number representation conversion.
- */
-#define ntohl(x) (x)
-#define ntohs(x) (x)
-#define htonl(x) (x)
-#define htons(x) (x)
-#endif
-#endif
-
#ifdef KERNEL
extern struct domain nsdomain;
#ifdef KERNEL
extern struct domain nsdomain;
-extern union ns_host ns_thishost;
-extern union ns_host ns_zerohost;
-extern union ns_host ns_broadhost;
+union ns_host ns_thishost;
+union ns_host ns_zerohost;
+union ns_host ns_broadhost;
+union ns_net ns_zeronet;
+union ns_net ns_broadnet;
u_short ns_cksum();
u_short ns_cksum();
+#else
+#ifdef __STDC__
+extern struct ns_addr ns_addr(const char *);
+extern char *ns_ntoa(struct ns_addr);
+#else
+extern struct ns_addr ns_addr();
+extern char *ns_ntoa();
+#endif
#endif
#endif