Date: Wed, 17 Feb 2010 17:34:55 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r204011 - user/luigi/ipfw3-head/sys/netinet/ipfw Message-ID: <201002171734.o1HHYtwt009768@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luigi Date: Wed Feb 17 17:34:55 2010 New Revision: 204011 URL: http://svn.freebsd.org/changeset/base/204011 Log: diff reduction Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Wed Feb 17 17:34:30 2010 (r204010) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c Wed Feb 17 17:34:55 2010 (r204011) @@ -1676,20 +1676,20 @@ dummynet_get(struct sockopt *sopt, void struct dn_id cmd; struct copy_args a; + /* save and restore original sopt_valsize around copyin */ sopt_valsize = sopt->sopt_valsize; if (!compat) { D("standard mode"); - /* save and restore original sopt_valsize around copyin */ - error = sooptcopyin(sopt, &cmd, sizeof(cmd), sizeof(cmd)); - sopt->sopt_valsize = sopt_valsize; - if (error) - return error; + error = sooptcopyin(sopt, &cmd, sizeof(cmd), sizeof(cmd)); + sopt->sopt_valsize = sopt_valsize; + if (error) + return error; } else { cmd.type = DN_CMD_GET; cmd.len = sizeof(struct dn_id); cmd.subtype = DN_GET_COMPAT; -// cmd.id = sopt_valsize; + // cmd.id = sopt_valsize; D("compatibility mode"); } /* Count space (under lock) and allocate (outside lock). @@ -1721,9 +1721,8 @@ dummynet_get(struct sockopt *sopt, void if (start == NULL) { if (compat) { *compat = NULL; - return 1; + return 1; // XXX } - else return sooptcopyout(sopt, &cmd, sizeof(cmd)); } ND("have %d:%d sched %d, %d:%d links %d, %d:%d flowsets %d, "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002171734.o1HHYtwt009768>