| tcp_syncache.c (182129) | tcp_syncache.c (183001) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 McAfee, Inc. 3 * Copyright (c) 2006 Andre Oppermann, Internet Business Solutions AG 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Jonathan Lemon 7 * and McAfee Research, the Security Research Division of McAfee, Inc. under 8 * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 17 unchanged lines hidden (view full) --- 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001 McAfee, Inc. 3 * Copyright (c) 2006 Andre Oppermann, Internet Business Solutions AG 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Jonathan Lemon 7 * and McAfee Research, the Security Research Division of McAfee, Inc. under 8 * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 17 unchanged lines hidden (view full) --- 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/netinet/tcp_syncache.c 182129 2008-08-25 00:33:30Z julian $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/tcp_syncache.c 183001 2008-09-13 17:26:46Z bz $"); |
| 35 36#include "opt_inet.h" 37#include "opt_inet6.h" 38#include "opt_ipsec.h" 39#include "opt_mac.h" 40 41#include <sys/param.h> 42#include <sys/systm.h> --- 1309 unchanged lines hidden (view full) --- 1352 1353 /* Adjust headers by option size. */ 1354 th->th_off = (sizeof(struct tcphdr) + optlen) >> 2; 1355 m->m_len += optlen; 1356 m->m_pkthdr.len += optlen; 1357 1358#ifdef TCP_SIGNATURE 1359 if (sc->sc_flags & SCF_SIGNATURE) | 35 36#include "opt_inet.h" 37#include "opt_inet6.h" 38#include "opt_ipsec.h" 39#include "opt_mac.h" 40 41#include <sys/param.h> 42#include <sys/systm.h> --- 1309 unchanged lines hidden (view full) --- 1352 1353 /* Adjust headers by option size. */ 1354 th->th_off = (sizeof(struct tcphdr) + optlen) >> 2; 1355 m->m_len += optlen; 1356 m->m_pkthdr.len += optlen; 1357 1358#ifdef TCP_SIGNATURE 1359 if (sc->sc_flags & SCF_SIGNATURE) |
| 1360 tcp_signature_compute(m, sizeof(struct ip), 0, optlen, | 1360 tcp_signature_compute(m, 0, 0, optlen, |
| 1361 to.to_signature, IPSEC_DIR_OUTBOUND); 1362#endif 1363#ifdef INET6 1364 if (sc->sc_inc.inc_isipv6) 1365 ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) + optlen); 1366 else 1367#endif 1368 ip->ip_len += optlen; --- 368 unchanged lines hidden --- | 1361 to.to_signature, IPSEC_DIR_OUTBOUND); 1362#endif 1363#ifdef INET6 1364 if (sc->sc_inc.inc_isipv6) 1365 ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) + optlen); 1366 else 1367#endif 1368 ip->ip_len += optlen; --- 368 unchanged lines hidden --- |