svn commit: r234642 - projects/pf/head/sys/contrib/pf/net

[Gleb Smirnoff]

Author: glebius
Date: Tue Apr 24 08:30:36 2012
New Revision: 234642
URL: http://svn.freebsd.org/changeset/base/234642

Log:
  Move pf_tbladdr_*() from pf.c to pf_ioctl.c, since they are used
  only in the latter.

Modified:
  projects/pf/head/sys/contrib/pf/net/pf.c
  projects/pf/head/sys/contrib/pf/net/pf_ioctl.c
  projects/pf/head/sys/contrib/pf/net/pfvar.h

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Tue Apr 24 08:29:00 2012	(r234641)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Tue Apr 24 08:30:36 2012	(r234642)
@@ -1512,39 +1512,6 @@ relock:
 	}
 }
 
-int
-pf_tbladdr_setup(struct pf_ruleset *rs, struct pf_addr_wrap *aw)
-{
-	if (aw->type != PF_ADDR_TABLE)
-		return (0);
-	if ((aw->p.tbl = pfr_attach_table(rs, aw->v.tblname)) == NULL)
-		return (ENOMEM);
-	return (0);
-}
-
-void
-pf_tbladdr_remove(struct pf_addr_wrap *aw)
-{
-	if (aw->type != PF_ADDR_TABLE || aw->p.tbl == NULL)
-		return;
-	pfr_detach_table(aw->p.tbl);
-	aw->p.tbl = NULL;
-}
-
-void
-pf_tbladdr_copyout(struct pf_addr_wrap *aw)
-{
-	struct pfr_ktable *kt = aw->p.tbl;
-
-	if (aw->type != PF_ADDR_TABLE || kt == NULL)
-		return;
-	if (!(kt->pfrkt_flags & PFR_TFLAG_ACTIVE) && kt->pfrkt_root != NULL)
-		kt = kt->pfrkt_root;
-	aw->p.tbl = NULL;
-	aw->p.tblcnt = (kt->pfrkt_flags & PFR_TFLAG_ACTIVE) ?
-		kt->pfrkt_cnt : -1;
-}
-
 void
 pf_print_host(struct pf_addr *addr, u_int16_t p, sa_family_t af)
 {

Modified: projects/pf/head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Tue Apr 24 08:29:00 2012	(r234641)
+++ projects/pf/head/sys/contrib/pf/net/pf_ioctl.c	Tue Apr 24 08:30:36 2012	(r234642)
@@ -175,6 +175,10 @@ struct cdev *pf_dev;
 static void		 pf_clear_states(void);
 static int		 pf_clear_tables(void);
 static void		 pf_clear_srcnodes(struct pf_src_node *);
+static int		 pf_tbladdr_setup(struct pf_ruleset *,
+			    struct pf_addr_wrap *);
+static void		 pf_tbladdr_remove(struct pf_addr_wrap *);
+static void		 pf_tbladdr_copyout(struct pf_addr_wrap *);
  
 /*
  * Wrapper functions for pfil(9) hooks
@@ -3381,6 +3385,39 @@ pfsync_state_export(struct pfsync_state 
 
 }
 
+static int
+pf_tbladdr_setup(struct pf_ruleset *rs, struct pf_addr_wrap *aw)
+{
+	if (aw->type != PF_ADDR_TABLE)
+		return (0);
+	if ((aw->p.tbl = pfr_attach_table(rs, aw->v.tblname)) == NULL)
+		return (ENOMEM);
+	return (0);
+}
+
+static void
+pf_tbladdr_remove(struct pf_addr_wrap *aw)
+{
+	if (aw->type != PF_ADDR_TABLE || aw->p.tbl == NULL)
+		return;
+	pfr_detach_table(aw->p.tbl);
+	aw->p.tbl = NULL;
+}
+
+static void
+pf_tbladdr_copyout(struct pf_addr_wrap *aw)
+{
+	struct pfr_ktable *kt = aw->p.tbl;
+
+	if (aw->type != PF_ADDR_TABLE || kt == NULL)
+		return;
+	if (!(kt->pfrkt_flags & PFR_TFLAG_ACTIVE) && kt->pfrkt_root != NULL)
+		kt = kt->pfrkt_root;
+	aw->p.tbl = NULL;
+	aw->p.tblcnt = (kt->pfrkt_flags & PFR_TFLAG_ACTIVE) ?
+		kt->pfrkt_cnt : -1;
+}
+
 /*
  * XXX - Check for version missmatch!!!
  */

Modified: projects/pf/head/sys/contrib/pf/net/pfvar.h
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pfvar.h	Tue Apr 24 08:29:00 2012	(r234641)
+++ projects/pf/head/sys/contrib/pf/net/pfvar.h	Tue Apr 24 08:30:36 2012	(r234642)
@@ -1756,10 +1756,6 @@ VNET_DECLARE(struct pf_poolqueue *,	 pf_
 void				 pf_initialize(void);
 void				 pf_cleanup(void);
 
-extern int			 pf_tbladdr_setup(struct pf_ruleset *,
-				    struct pf_addr_wrap *);
-extern void			 pf_tbladdr_remove(struct pf_addr_wrap *);
-extern void			 pf_tbladdr_copyout(struct pf_addr_wrap *);
 extern void			 pf_calc_skip_steps(struct pf_rulequeue *);
 #ifdef ALTQ
 extern	void			 pf_altq_ifnet_event(struct ifnet *, int);