From owner-svn-src-projects@FreeBSD.ORG Tue Jan 10 02:21:49 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 334E81065673; Tue, 10 Jan 2012 02:21:49 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 04D418FC19; Tue, 10 Jan 2012 02:21:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0A2LmHc077357; Tue, 10 Jan 2012 02:21:48 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0A2Lmtw077355; Tue, 10 Jan 2012 02:21:48 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201201100221.q0A2Lmtw077355@svn.freebsd.org> From: Lawrence Stewart Date: Tue, 10 Jan 2012 02:21:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229903 - projects/diffused_head/sys/netinet/ipfw X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2012 02:21:49 -0000 Author: lstewart Date: Tue Jan 10 02:21:48 2012 New Revision: 229903 URL: http://svn.freebsd.org/changeset/base/229903 Log: Fix more places to use the correct structure types (_ctl_) for kernel/userspace control messages which were not caught during refactoring. Submitted by: Nigel Williams Modified: projects/diffused_head/sys/netinet/ipfw/ip_diffuse.c Modified: projects/diffused_head/sys/netinet/ipfw/ip_diffuse.c ============================================================================== --- projects/diffused_head/sys/netinet/ipfw/ip_diffuse.c Tue Jan 10 02:16:38 2012 (r229902) +++ projects/diffused_head/sys/netinet/ipfw/ip_diffuse.c Tue Jan 10 02:21:48 2012 (r229903) @@ -536,7 +536,7 @@ export_instance_used(void) } static int -add_export_instance(const char *name, struct di_export *e_conf, +add_export_instance(const char *name, struct di_ctl_export *e_conf, struct socket *sock) { struct di_export *s, *e; @@ -1490,7 +1490,7 @@ config_feature(struct di_ctl_feature *f, /* Config export. */ static int -config_export(struct di_export *e, struct di_oid *arg) +config_export(struct di_ctl_export *e, struct di_oid *arg) { struct socket *sock; int ret; @@ -1854,13 +1854,13 @@ get_info(struct sockopt *sopt) if (oid.subtype == DI_FEATURE) { DID("show feature"); - l += sizeof(struct di_feature); + l += sizeof(struct di_ctl_feature); } else if (oid.subtype == DI_CLASSIFIER) { DID("show classifier"); - l += sizeof(struct di_classifier); + l += sizeof(struct di_ctl_classifier); } else if (oid.subtype == DI_EXPORT) { DID("show export"); - l += sizeof(struct di_export); + l += sizeof(struct di_ctl_export); } else { DID("show flow table"); } @@ -2079,7 +2079,7 @@ do_config(void *p, int l) DID("delete feature"); DI_WLOCK(); err = remove_feature_instance( - ((struct di_feature *)o)->name); + ((struct di_ctl_feature *)o)->name); DI_UNLOCK(); } break; @@ -2099,7 +2099,7 @@ do_config(void *p, int l) DID("delete classifier"); DI_WLOCK(); err = remove_classifier_instance( - ((struct di_classifier *)o)->name); + ((struct di_ctl_classifier *)o)->name); DI_UNLOCK(); } break; @@ -2107,12 +2107,13 @@ do_config(void *p, int l) case DI_EXPORT: if (action == DI_CMD_CONFIG) { DID("configure export"); - err = config_export((struct di_export *)o, arg); + err = config_export((struct di_ctl_export *)o, + arg); } else if (action == DI_CMD_DELETE) { DID("delete export"); DI_WLOCK(); err = remove_export_instance( - ((struct di_export *)o)->name); + ((struct di_ctl_export *)o)->name); DI_UNLOCK(); } break;