Deleted Added
full compact
ip_dummynet.c (218741) ip_dummynet.c (220203)
1/*-
2 * Copyright (c) 1998-2002,2010 Luigi Rizzo, Universita` di Pisa
3 * Portions Copyright (c) 2000 Akamba Corp.
4 * All rights reserved
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998-2002,2010 Luigi Rizzo, Universita` di Pisa
3 * Portions Copyright (c) 2000 Akamba Corp.
4 * All rights reserved
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/netinet/ipfw/ip_dummynet.c 218741 2011-02-16 15:43:35Z pluknet $");
29__FBSDID("$FreeBSD: head/sys/netinet/ipfw/ip_dummynet.c 220203 2011-03-31 15:10:41Z ae $");
30
31/*
32 * Configuration and internal object management for dummynet.
33 */
34
35#include "opt_inet6.h"
36
37#include <sys/param.h>

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

743 int a = (int)arg;
744 ND("sched %d arg %s%s",
745 s->sch.sched_nr,
746 a&DN_DESTROY ? "DEL ":"",
747 a&DN_DELETE_FS ? "DEL_FS":"");
748#endif
749 fsk_detach_list(&s->fsk_list, arg ? DN_DESTROY : 0);
750 /* no more flowset pointing to us now */
30
31/*
32 * Configuration and internal object management for dummynet.
33 */
34
35#include "opt_inet6.h"
36
37#include <sys/param.h>

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

743 int a = (int)arg;
744 ND("sched %d arg %s%s",
745 s->sch.sched_nr,
746 a&DN_DESTROY ? "DEL ":"",
747 a&DN_DELETE_FS ? "DEL_FS":"");
748#endif
749 fsk_detach_list(&s->fsk_list, arg ? DN_DESTROY : 0);
750 /* no more flowset pointing to us now */
751 if (s->sch.flags & DN_HAVE_MASK)
751 if (s->sch.flags & DN_HAVE_MASK) {
752 dn_ht_scan(s->siht, si_destroy, NULL);
752 dn_ht_scan(s->siht, si_destroy, NULL);
753 else if (s->siht)
753 dn_ht_free(s->siht, 0);
754 } else if (s->siht)
754 si_destroy(s->siht, NULL);
755 if (s->profile) {
756 free(s->profile, M_DUMMYNET);
757 s->profile = NULL;
758 }
759 s->siht = NULL;
760 if (s->fp->destroy)
761 s->fp->destroy(s);

--- 1552 unchanged lines hidden ---
755 si_destroy(s->siht, NULL);
756 if (s->profile) {
757 free(s->profile, M_DUMMYNET);
758 s->profile = NULL;
759 }
760 s->siht = NULL;
761 if (s->fp->destroy)
762 s->fp->destroy(s);

--- 1552 unchanged lines hidden ---