aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_output.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet/tcp_output.c')
-rw-r--r--sys/netinet/tcp_output.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 5eb58fb5c9a3..d3e1b8d89cb6 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)tcp_output.c 7.22 (Berkeley) 8/31/90
- * $Id: tcp_output.c,v 1.2 1993/10/16 18:26:29 rgrimes Exp $
+ * $Id: tcp_output.c,v 1.4 1994/01/24 05:12:34 davidg Exp $
*/
#include "param.h"
@@ -57,10 +57,8 @@
#include "tcp_timer.h"
#include "tcp_var.h"
#include "tcpip.h"
+#ifdef TCPDEBUG
#include "tcp_debug.h"
-
-#ifdef notyet
-extern struct mbuf *m_copypack();
#endif
/*
@@ -71,6 +69,7 @@ u_char tcp_initopt[4] = { TCPOPT_MAXSEG, 4, 0x0, 0x0, };
/*
* Tcp output routine: figure out what should be sent and send it.
*/
+int
tcp_output(tp)
register struct tcpcb *tp;
{
@@ -79,7 +78,7 @@ tcp_output(tp)
int off, flags, error;
register struct mbuf *m;
register struct tcpiphdr *ti;
- u_char *opt;
+ u_char *opt = 0;
unsigned optlen, hdrlen;
int idle, sendalot;
@@ -434,11 +433,13 @@ send:
if (SEQ_GT(tp->snd_nxt + len, tp->snd_max))
tp->snd_max = tp->snd_nxt + len;
+#ifdef TCPDEBUG
/*
* Trace.
*/
if (so->so_options & SO_DEBUG)
tcp_trace(TA_OUTPUT, tp->t_state, tp, ti, 0);
+#endif
/*
* Fill in IP length and desired time to live and
@@ -460,7 +461,7 @@ send:
if (error) {
out:
if (error == ENOBUFS) {
- tcp_quench(tp->t_inpcb);
+ tcp_quench(tp->t_inpcb, 0);
return (0);
}
if ((error == EHOSTUNREACH || error == ENETDOWN)
@@ -486,6 +487,7 @@ out:
return (0);
}
+void
tcp_setpersist(tp)
register struct tcpcb *tp;
{