diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-14 09:33:16 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-14 09:33:16 -0200 |
| commit | 58b7eab7d39d983cc70f6f1d611f00470a76fca1 (patch) | |
| tree | bb36653da0e7ff3eb5ec994f6923513a77973ba0 /sys/netinet/tcp_output.c | |
| parent | 3e0bf52f358eb969d165c4b1e54942ee94cf2c8d (diff) | |
| parent | e9becf4ed022809a585e21a1d3da8a3a233ff648 (diff) | |
| download | FreeBSD-src-58b7eab7d39d983cc70f6f1d611f00470a76fca1.zip FreeBSD-src-58b7eab7d39d983cc70f6f1d611f00470a76fca1.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index c7dc547..2ca0fb5 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -745,8 +745,8 @@ send: * segments. Options for SYN-ACK segments are handled in TCP * syncache. */ + to.to_flags = 0; if ((tp->t_flags & TF_NOOPT) == 0) { - to.to_flags = 0; /* Maximum segment size. */ if (flags & TH_SYN) { tp->snd_nxt = tp->iss; @@ -1226,7 +1226,7 @@ send: tp->snd_up = tp->snd_una; /* drag it along */ #ifdef TCP_SIGNATURE - if (tp->t_flags & TF_SIGNATURE) { + if (to.to_flags & TOF_SIGNATURE) { int sigoff = to.to_signature - opt; tcp_signature_compute(m, 0, len, optlen, (u_char *)(th + 1) + sigoff, IPSEC_DIR_OUTBOUND); @@ -1696,6 +1696,7 @@ tcp_addoptions(struct tcpopt *to, u_char *optp) bcopy((u_char *)&to->to_tsecr, optp, sizeof(to->to_tsecr)); optp += sizeof(to->to_tsecr); break; +#ifdef TCP_SIGNATURE case TOF_SIGNATURE: { int siglen = TCPOLEN_SIGNATURE - 2; @@ -1714,6 +1715,7 @@ tcp_addoptions(struct tcpopt *to, u_char *optp) *optp++ = 0; break; } +#endif case TOF_SACK: { int sackblks = 0; |
