Deleted Added
full compact
ip_sync.c (147367) ip_sync.c (153876)
1/* $FreeBSD: head/sys/contrib/ipfilter/netinet/ip_sync.c 147367 2005-06-14 09:18:26Z darrenr $ */
1/* $FreeBSD: head/sys/contrib/ipfilter/netinet/ip_sync.c 153876 2005-12-30 11:32:23Z guido $ */
2
3/*
4 * Copyright (C) 1995-1998 by Darren Reed.
5 *
6 * See the IPFILTER.LICENCE file for details on licencing.
7 */
8#if defined(KERNEL) || defined(_KERNEL)
9# undef KERNEL

--- 83 unchanged lines hidden (view full) ---

93# if defined(_KERNEL) && !defined(IPFILTER_LKM)
94# include <sys/libkern.h>
95# include <sys/systm.h>
96# endif
97#endif
98/* END OF INCLUDES */
99
100#if !defined(lint)
2
3/*
4 * Copyright (C) 1995-1998 by Darren Reed.
5 *
6 * See the IPFILTER.LICENCE file for details on licencing.
7 */
8#if defined(KERNEL) || defined(_KERNEL)
9# undef KERNEL

--- 83 unchanged lines hidden (view full) ---

93# if defined(_KERNEL) && !defined(IPFILTER_LKM)
94# include <sys/libkern.h>
95# include <sys/systm.h>
96# endif
97#endif
98/* END OF INCLUDES */
99
100#if !defined(lint)
101static const char rcsid[] = "@(#)Id: ip_sync.c,v 2.40.2.3 2005/02/18 13:06:29 darrenr Exp";
101static const char rcsid[] = "@(#)$Id: ip_sync.c,v 2.40.2.5 2005/09/04 12:51:12 darrenr Exp $";
102#endif
103
104#define SYNC_STATETABSZ 256
105#define SYNC_NATTABSZ 256
106
107#ifdef IPFILTER_SYNC
108ipfmutex_t ipf_syncadd, ipsl_mutex;
109ipfrwlock_t ipf_syncstate, ipf_syncnat;

--- 116 unchanged lines hidden (view full) ---

226 ipfsync_tcporder(way, &ips->is_tcp.ts_data[0]);
227 ipfsync_tcporder(way, &ips->is_tcp.ts_data[1]);
228
229 if (way) {
230 ips->is_hv = htonl(ips->is_hv);
231 ips->is_die = htonl(ips->is_die);
232 ips->is_pass = htonl(ips->is_pass);
233 ips->is_flags = htonl(ips->is_flags);
102#endif
103
104#define SYNC_STATETABSZ 256
105#define SYNC_NATTABSZ 256
106
107#ifdef IPFILTER_SYNC
108ipfmutex_t ipf_syncadd, ipsl_mutex;
109ipfrwlock_t ipf_syncstate, ipf_syncnat;

--- 116 unchanged lines hidden (view full) ---

226 ipfsync_tcporder(way, &ips->is_tcp.ts_data[0]);
227 ipfsync_tcporder(way, &ips->is_tcp.ts_data[1]);
228
229 if (way) {
230 ips->is_hv = htonl(ips->is_hv);
231 ips->is_die = htonl(ips->is_die);
232 ips->is_pass = htonl(ips->is_pass);
233 ips->is_flags = htonl(ips->is_flags);
234 ips->is_opt = htonl(ips->is_opt);
235 ips->is_optmsk = htonl(ips->is_optmsk);
234 ips->is_opt[0] = htonl(ips->is_opt[0]);
235 ips->is_opt[1] = htonl(ips->is_opt[1]);
236 ips->is_optmsk[0] = htonl(ips->is_optmsk[0]);
237 ips->is_optmsk[1] = htonl(ips->is_optmsk[1]);
236 ips->is_sec = htons(ips->is_sec);
237 ips->is_secmsk = htons(ips->is_secmsk);
238 ips->is_auth = htons(ips->is_auth);
239 ips->is_authmsk = htons(ips->is_authmsk);
240 ips->is_s0[0] = htonl(ips->is_s0[0]);
241 ips->is_s0[1] = htonl(ips->is_s0[1]);
242 ips->is_smsk[0] = htons(ips->is_smsk[0]);
243 ips->is_smsk[1] = htons(ips->is_smsk[1]);
244 } else {
245 ips->is_hv = ntohl(ips->is_hv);
246 ips->is_die = ntohl(ips->is_die);
247 ips->is_pass = ntohl(ips->is_pass);
248 ips->is_flags = ntohl(ips->is_flags);
238 ips->is_sec = htons(ips->is_sec);
239 ips->is_secmsk = htons(ips->is_secmsk);
240 ips->is_auth = htons(ips->is_auth);
241 ips->is_authmsk = htons(ips->is_authmsk);
242 ips->is_s0[0] = htonl(ips->is_s0[0]);
243 ips->is_s0[1] = htonl(ips->is_s0[1]);
244 ips->is_smsk[0] = htons(ips->is_smsk[0]);
245 ips->is_smsk[1] = htons(ips->is_smsk[1]);
246 } else {
247 ips->is_hv = ntohl(ips->is_hv);
248 ips->is_die = ntohl(ips->is_die);
249 ips->is_pass = ntohl(ips->is_pass);
250 ips->is_flags = ntohl(ips->is_flags);
249 ips->is_opt = ntohl(ips->is_opt);
250 ips->is_optmsk = ntohl(ips->is_optmsk);
251 ips->is_opt[0] = ntohl(ips->is_opt[0]);
252 ips->is_opt[1] = ntohl(ips->is_opt[1]);
253 ips->is_optmsk[0] = ntohl(ips->is_optmsk[0]);
254 ips->is_optmsk[1] = ntohl(ips->is_optmsk[1]);
251 ips->is_sec = ntohs(ips->is_sec);
252 ips->is_secmsk = ntohs(ips->is_secmsk);
253 ips->is_auth = ntohs(ips->is_auth);
254 ips->is_authmsk = ntohs(ips->is_authmsk);
255 ips->is_s0[0] = ntohl(ips->is_s0[0]);
256 ips->is_s0[1] = ntohl(ips->is_s0[1]);
257 ips->is_smsk[0] = ntohl(ips->is_smsk[0]);
258 ips->is_smsk[1] = ntohl(ips->is_smsk[1]);

--- 748 unchanged lines hidden ---
255 ips->is_sec = ntohs(ips->is_sec);
256 ips->is_secmsk = ntohs(ips->is_secmsk);
257 ips->is_auth = ntohs(ips->is_auth);
258 ips->is_authmsk = ntohs(ips->is_authmsk);
259 ips->is_s0[0] = ntohl(ips->is_s0[0]);
260 ips->is_s0[1] = ntohl(ips->is_s0[1]);
261 ips->is_smsk[0] = ntohl(ips->is_smsk[0]);
262 ips->is_smsk[1] = ntohl(ips->is_smsk[1]);

--- 748 unchanged lines hidden ---