summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-08-26 20:02:36 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-08-26 20:02:36 +0000
commit2c53b6584d1f5e814f2ea4d48080385836a380e7 (patch)
tree6e457f8539f70bbcdd4704b6373217d63969a808 /sys/netinet
parent685a19c16803716b9d0ad42deb2236204d438380 (diff)
indent
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/icmp_var.h4
-rw-r--r--sys/netinet/in_pcb.h4
-rw-r--r--sys/netinet/ip_icmp.h12
-rw-r--r--sys/netinet/tcp_debug.h4
-rw-r--r--sys/netinet/tcp_input.c10
-rw-r--r--sys/netinet/tcp_output.c32
-rw-r--r--sys/netinet/tcp_subr.c6
-rw-r--r--sys/netinet/tcp_timer.c4
-rw-r--r--sys/netinet/tcpip.h4
-rw-r--r--sys/netinet/udp_var.h4
10 files changed, 42 insertions, 42 deletions
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index 5f0303cab7f..42e34bac175 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp_var.h,v 1.2 1997/02/24 14:06:33 niklas Exp $ */
+/* $OpenBSD: icmp_var.h,v 1.3 1997/08/26 20:02:30 deraadt Exp $ */
/* $NetBSD: icmp_var.h,v 1.8 1995/03/26 20:32:19 jtc Exp $ */
/*
@@ -47,7 +47,7 @@ struct icmpstat {
u_long icps_oldicmp; /* no error 'cuz old was icmp */
u_long icps_outhist[ICMP_MAXTYPE + 1];
/* statistics related to input messages processed */
- u_long icps_badcode; /* icmp_code out of range */
+ u_long icps_badcode; /* icmp_code out of range */
u_long icps_tooshort; /* packet < ICMP_MINLEN */
u_long icps_checksum; /* bad checksum */
u_long icps_badlen; /* calculated bound mismatch */
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index a4919bca233..3c58a150412 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_pcb.h,v 1.8 1997/08/19 06:29:50 millert Exp $ */
+/* $OpenBSD: in_pcb.h,v 1.9 1997/08/26 20:02:30 deraadt Exp $ */
/* $NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $ */
/*
@@ -60,7 +60,7 @@ struct inpcb {
struct ip inp_ip; /* header prototype; should have more */
struct mbuf *inp_options; /* IP options */
struct ip_moptions *inp_moptions; /* IP multicast options */
- u_char inp_seclevel[4]; /* Only the first 3 are used for now */
+ u_char inp_seclevel[4]; /* Only the first 3 are used for now */
#define SL_AUTH 0 /* Authentication level */
#define SL_ESP_TRANS 1 /* ESP transport level */
#define SL_ESP_NETWORK 2 /* ESP network (encapsulation) level */
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index fa61837b497..a8cc793302c 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_icmp.h,v 1.7 1997/02/04 16:58:48 kstailey Exp $ */
+/* $OpenBSD: ip_icmp.h,v 1.8 1997/08/26 20:02:31 deraadt Exp $ */
/* $NetBSD: ip_icmp.h,v 1.10 1996/02/13 23:42:28 christos Exp $ */
/*
@@ -134,16 +134,16 @@ struct icmp {
#define ICMP_UNREACH_PORT 3 /* bad port */
#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */
#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */
-#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */
-#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */
+#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */
+#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */
#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */
#define ICMP_UNREACH_NET_PROHIB 9 /* for crypto devs */
-#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */
+#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */
#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */
#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */
#define ICMP_UNREACH_FILTER_PROHIB 13 /* prohibited access */
-#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* precedence violat'n*/
-#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* precedence cutoff */
+#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* precedence violat'n*/
+#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* precedence cutoff */
#define ICMP_SOURCEQUENCH 4 /* packet lost, slow down */
#define ICMP_REDIRECT 5 /* shorter route, codes: */
#define ICMP_REDIRECT_NET 0 /* for network */
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index 5c29983dc78..be53b602410 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_debug.h,v 1.2 1997/02/24 14:06:45 niklas Exp $ */
+/* $OpenBSD: tcp_debug.h,v 1.3 1997/08/26 20:02:31 deraadt Exp $ */
/* $NetBSD: tcp_debug.h,v 1.5 1994/06/29 06:38:38 cgd Exp $ */
/*
@@ -46,7 +46,7 @@ struct tcp_debug {
struct tcpcb td_cb;
};
-#define TA_INPUT 0
+#define TA_INPUT 0
#define TA_OUTPUT 1
#define TA_USER 2
#define TA_RESPOND 3
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 5cbfd174029..9c3e8f93985 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_input.c,v 1.14 1997/08/16 01:34:41 angelos Exp $ */
+/* $OpenBSD: tcp_input.c,v 1.15 1997/08/26 20:02:32 deraadt Exp $ */
/* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */
/*
@@ -1306,7 +1306,7 @@ trimthenstep6:
}
break;
- /*
+ /*
* In CLOSING STATE in addition to the processing for
* the ESTABLISHED state if the ACK acknowledges our FIN
* then enter the TIME-WAIT state, otherwise ignore
@@ -1461,14 +1461,14 @@ dodata: /* XXX */
}
switch (tp->t_state) {
- /*
+ /*
* In ESTABLISHED STATE enter the CLOSE_WAIT state.
*/
case TCPS_ESTABLISHED:
tp->t_state = TCPS_CLOSE_WAIT;
break;
- /*
+ /*
* If still in FIN_WAIT_1 STATE FIN has not been acked so
* enter the CLOSING state.
*/
@@ -1476,7 +1476,7 @@ dodata: /* XXX */
tp->t_state = TCPS_CLOSING;
break;
- /*
+ /*
* In FIN_WAIT_2 state enter the TIME_WAIT state,
* starting the time-wait timer, turning off the other
* standard timers.
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 8cf04f566aa..05414949bcf 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_output.c,v 1.6 1997/06/19 10:49:05 deraadt Exp $ */
+/* $OpenBSD: tcp_output.c,v 1.7 1997/08/26 20:02:33 deraadt Exp $ */
/* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */
/*
@@ -306,27 +306,27 @@ send:
optlen += 4;
}
}
- }
+ }
- /*
+ /*
* Send a timestamp and echo-reply if this is a SYN and our side
* wants to use timestamps (TF_REQ_TSTMP is set) or both our side
* and our peer have sent timestamps in our SYN's.
- */
- if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
- (flags & TH_RST) == 0 &&
- ((flags & (TH_SYN|TH_ACK)) == TH_SYN ||
+ */
+ if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP &&
+ (flags & TH_RST) == 0 &&
+ ((flags & (TH_SYN|TH_ACK)) == TH_SYN ||
(tp->t_flags & TF_RCVD_TSTMP))) {
u_int32_t *lp = (u_int32_t *)(opt + optlen);
- /* Form timestamp option as shown in appendix A of RFC 1323. */
- *lp++ = htonl(TCPOPT_TSTAMP_HDR);
- *lp++ = htonl(tcp_now);
- *lp = htonl(tp->ts_recent);
- optlen += TCPOLEN_TSTAMP_APPA;
- }
-
- hdrlen += optlen;
+ /* Form timestamp option as shown in appendix A of RFC 1323. */
+ *lp++ = htonl(TCPOPT_TSTAMP_HDR);
+ *lp++ = htonl(tcp_now);
+ *lp = htonl(tp->ts_recent);
+ optlen += TCPOLEN_TSTAMP_APPA;
+ }
+
+ hdrlen += optlen;
/*
* Adjust data length if insertion of options will
@@ -339,7 +339,7 @@ send:
}
#ifdef DIAGNOSTIC
- if (max_linkhdr + hdrlen > MHLEN)
+ if (max_linkhdr + hdrlen > MHLEN)
panic("tcphdr too big");
#endif
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index c53bc198c12..b02054e591b 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_subr.c,v 1.8 1997/02/05 15:48:25 deraadt Exp $ */
+/* $OpenBSD: tcp_subr.c,v 1.9 1997/08/26 20:02:33 deraadt Exp $ */
/* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */
/*
@@ -64,8 +64,8 @@
#include <dev/rndvar.h>
/* patchable/settable parameters for tcp */
-int tcp_mssdflt = TCP_MSS;
-int tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ;
+int tcp_mssdflt = TCP_MSS;
+int tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ;
/*
* Configure kernel with options "TCP_DO_RFC1323=0" to disable RFC1323 stuff.
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index ba972adff32..357fa300db2 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_timer.c,v 1.7 1997/02/05 15:48:26 deraadt Exp $ */
+/* $OpenBSD: tcp_timer.c,v 1.8 1997/08/26 20:02:34 deraadt Exp $ */
/* $NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $ */
/*
@@ -302,7 +302,7 @@ tcp_timers(tp, timer)
goto dropit;
if (tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE &&
tp->t_state <= TCPS_CLOSE_WAIT) {
- if (tp->t_idle >= tcp_keepidle + tcp_maxidle)
+ if (tp->t_idle >= tcp_keepidle + tcp_maxidle)
goto dropit;
/*
* Send a packet designed to force a response
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index ff94d4502b3..3e5f7829942 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpip.h,v 1.3 1997/02/24 14:06:47 niklas Exp $ */
+/* $OpenBSD: tcpip.h,v 1.4 1997/08/26 20:02:35 deraadt Exp $ */
/* $NetBSD: tcpip.h,v 1.6 1995/11/21 01:07:44 cgd Exp $ */
/*
@@ -40,7 +40,7 @@
* Tcp+ip header, after ip options removed.
*/
struct tcpiphdr {
- struct ipovly ti_i; /* overlaid ip structure */
+ struct ipovly ti_i; /* overlaid ip structure */
struct tcphdr ti_t; /* tcp header */
};
#define ti_x1 ti_i.ih_x1
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 43dd5ac32d4..aa979c34260 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp_var.h,v 1.4 1997/08/09 23:36:28 millert Exp $ */
+/* $OpenBSD: udp_var.h,v 1.5 1997/08/26 20:02:35 deraadt Exp $ */
/* $NetBSD: udp_var.h,v 1.12 1996/02/13 23:44:41 christos Exp $ */
/*
@@ -40,7 +40,7 @@
* UDP kernel structures and variables.
*/
struct udpiphdr {
- struct ipovly ui_i; /* overlaid ip structure */
+ struct ipovly ui_i; /* overlaid ip structure */
struct udphdr ui_u; /* udp header */
};
#define ui_x1 ui_i.ih_x1