Deleted Added
full compact
ip_divert.c (126239) ip_divert.c (126253)
1/*
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*
2 * Copyright (c) 1982, 1986, 1988, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/sys/netinet/ip_divert.c 126239 2004-02-25 19:55:29Z mlaier $
33 * $FreeBSD: head/sys/netinet/ip_divert.c 126253 2004-02-26 00:27:04Z truckman $
34 */
35
36#include "opt_inet.h"
37#include "opt_ipfw.h"
38#include "opt_ipdivert.h"
39#include "opt_ipsec.h"
40#include "opt_mac.h"
41

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

583 /*
584 * OK, now we're committed to doing something.
585 */
586 INP_INFO_RLOCK(&divcbinfo);
587 gencnt = divcbinfo.ipi_gencnt;
588 n = divcbinfo.ipi_count;
589 INP_INFO_RUNLOCK(&divcbinfo);
590
34 */
35
36#include "opt_inet.h"
37#include "opt_ipfw.h"
38#include "opt_ipdivert.h"
39#include "opt_ipsec.h"
40#include "opt_mac.h"
41

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

583 /*
584 * OK, now we're committed to doing something.
585 */
586 INP_INFO_RLOCK(&divcbinfo);
587 gencnt = divcbinfo.ipi_gencnt;
588 n = divcbinfo.ipi_count;
589 INP_INFO_RUNLOCK(&divcbinfo);
590
591 sysctl_wire_old_buffer(req, 2 * sizeof(xig) + n*sizeof(struct xinpcb));
591 error = sysctl_wire_old_buffer(req,
592 2 * sizeof(xig) + n*sizeof(struct xinpcb));
593 if (error != 0)
594 return (error);
592
593 xig.xig_len = sizeof xig;
594 xig.xig_count = n;
595 xig.xig_gen = gencnt;
596 xig.xig_sogen = so_gencnt;
597 error = SYSCTL_OUT(req, &xig, sizeof xig);
598 if (error)
599 return error;

--- 81 unchanged lines hidden ---
595
596 xig.xig_len = sizeof xig;
597 xig.xig_count = n;
598 xig.xig_gen = gencnt;
599 xig.xig_sogen = so_gencnt;
600 error = SYSCTL_OUT(req, &xig, sizeof xig);
601 if (error)
602 return error;

--- 81 unchanged lines hidden ---