Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/npf - rename ext_normalise to ext_normalize
details: https://anonhg.NetBSD.org/src/rev/988bf9b762e6
branches: trunk
changeset: 785363:988bf9b762e6
user: christos <christos%NetBSD.org@localhost>
date: Sun Mar 10 21:41:05 2013 +0000
description:
- rename ext_normalise to ext_normalize
- move modules to from /usr/lib to /lib
- centralize make rules
diffstat:
lib/npf/Makefile | 4 +-
lib/npf/Makefile.inc | 8 --
lib/npf/ext_log/Makefile | 23 +------
lib/npf/ext_normalise/Makefile | 21 ------
lib/npf/ext_normalise/npfext_normalise.c | 100 -------------------------------
lib/npf/ext_normalise/shlib_version | 4 -
lib/npf/ext_normalize/Makefile | 4 +
lib/npf/ext_normalize/shlib_version | 4 +
lib/npf/ext_rndblock/Makefile | 23 +------
lib/npf/mod.mk | 25 +++++++
10 files changed, 41 insertions(+), 175 deletions(-)
diffs (266 lines):
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/Makefile
--- a/lib/npf/Makefile Sun Mar 10 21:40:05 2013 +0000
+++ b/lib/npf/Makefile Sun Mar 10 21:41:05 2013 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/12/10 00:32:24 rmind Exp $
+# $NetBSD: Makefile,v 1.3 2013/03/10 21:41:05 christos Exp $
.include <bsd.own.mk>
.if ${MKPIC} != "no"
-SUBDIR= ext_log ext_normalise ext_rndblock
+SUBDIR= ext_log ext_normalize ext_rndblock
.endif
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/Makefile.inc
--- a/lib/npf/Makefile.inc Sun Mar 10 21:40:05 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2012/09/16 13:47:42 rmind Exp $
-
-WARNS= 5
-MKLINT= no
-
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/ext_log/Makefile
--- a/lib/npf/ext_log/Makefile Sun Mar 10 21:40:05 2013 +0000
+++ b/lib/npf/ext_log/Makefile Sun Mar 10 21:41:05 2013 +0000
@@ -1,21 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/12/09 22:06:21 spz Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.3 2013/03/10 21:41:06 christos Exp $
-LIBISMODULE= yes
-.if defined(MLIBDIR)
-LIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/npf
-.else
-LIBDIR= /usr/lib/npf
-SHLIBDIR= /usr/lib/npf
-SHLIBINSTALLDIR=/usr/lib/npf
-.endif
-
-LIB= ext_log
-
-SRCS= npfext_log.c
-WARNS= 5
-
-.include <bsd.lib.mk>
+MOD= ext_log
+.include "${.CURDIR}/../mod.mk"
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/ext_normalise/Makefile
--- a/lib/npf/ext_normalise/Makefile Sun Mar 10 21:40:05 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2012/12/09 22:06:21 spz Exp $
-
-.include <bsd.own.mk>
-
-LIBISMODULE= yes
-.if defined(MLIBDIR)
-LIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/npf
-.else
-LIBDIR= /usr/lib/npf
-SHLIBDIR= /usr/lib/npf
-SHLIBINSTALLDIR=/usr/lib/npf
-.endif
-
-LIB= ext_normalise
-
-SRCS= npfext_normalise.c
-WARNS= 5
-
-.include <bsd.lib.mk>
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/ext_normalise/npfext_normalise.c
--- a/lib/npf/ext_normalise/npfext_normalise.c Sun Mar 10 21:40:05 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/* $NetBSD: npfext_normalise.c,v 1.1 2012/09/16 13:47:42 rmind Exp $ */
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: npfext_normalise.c,v 1.1 2012/09/16 13:47:42 rmind Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <errno.h>
-
-#include <npf.h>
-
-int npfext_normalise_init(void);
-nl_ext_t * npfext_normalise_construct(const char *);
-int npfext_normalise_param(nl_ext_t *, const char *, const char *);
-
-int
-npfext_normalise_init(void)
-{
- /* Nothing to initialise. */
- return 0;
-}
-
-nl_ext_t *
-npfext_normalise_construct(const char *name)
-{
- assert(strcmp(name, "normalise") == 0);
- return npf_ext_construct(name);
-}
-
-int
-npfext_normalise_param(nl_ext_t *ext, const char *param, const char *val)
-{
- enum ptype {
- PARAM_BOOL,
- PARAM_U32
- };
- static const struct param {
- const char * name;
- enum ptype type;
- bool reqval;
- } params[] = {
- { "random-id", PARAM_BOOL, false },
- { "no-df", PARAM_BOOL, false },
- { "min-ttl", PARAM_U32, true },
- { "max-mss", PARAM_U32, true },
- };
-
- for (unsigned i = 0; i < __arraycount(params); i++) {
- const char *name = params[i].name;
-
- if (strcmp(name, param) != 0) {
- continue;
- }
- if (val == NULL && params[i].reqval) {
- return EINVAL;
- }
-
- switch (params[i].type) {
- case PARAM_BOOL:
- npf_ext_param_bool(ext, name, true);
- break;
- case PARAM_U32:
- npf_ext_param_u32(ext, name, atol(val));
- break;
- default:
- assert(false);
- }
- return 0;
- }
-
- /* Invalid parameter, if not found. */
- return EINVAL;
-}
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/ext_normalise/shlib_version
--- a/lib/npf/ext_normalise/shlib_version Sun Mar 10 21:40:05 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# $NetBSD: shlib_version,v 1.1 2012/09/16 13:47:42 rmind Exp $
-
-major=0
-minor=0
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/ext_normalize/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/npf/ext_normalize/Makefile Sun Mar 10 21:41:05 2013 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile,v 1.1 2013/03/10 21:41:06 christos Exp $
+
+MOD= ext_normalize
+.include "${.CURDIR}/../mod.mk"
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/ext_normalize/shlib_version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/npf/ext_normalize/shlib_version Sun Mar 10 21:41:05 2013 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2013/03/10 21:41:06 christos Exp $
+
+major=0
+minor=0
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/ext_rndblock/Makefile
--- a/lib/npf/ext_rndblock/Makefile Sun Mar 10 21:40:05 2013 +0000
+++ b/lib/npf/ext_rndblock/Makefile Sun Mar 10 21:41:05 2013 +0000
@@ -1,21 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/12/10 00:32:24 rmind Exp $
-
-.include <bsd.own.mk>
+# $NetBSD: Makefile,v 1.2 2013/03/10 21:41:06 christos Exp $
-LIBISMODULE= yes
-.if defined(MLIBDIR)
-LIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBDIR= /usr/lib/${MLIBDIR}/npf
-SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/npf
-.else
-LIBDIR= /usr/lib/npf
-SHLIBDIR= /usr/lib/npf
-SHLIBINSTALLDIR=/usr/lib/npf
-.endif
-
-LIB= ext_rndblock
-
-SRCS= npfext_rndblock.c
-WARNS= 5
-
-.include <bsd.lib.mk>
+MOD= ext_rndblock
+.include "${.CURDIR}/../mod.mk"
diff -r ff95106e004f -r 988bf9b762e6 lib/npf/mod.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/npf/mod.mk Sun Mar 10 21:41:05 2013 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: mod.mk,v 1.1 2013/03/10 21:41:05 christos Exp $
+
+WARNS= 5
+MKLINT= no
+LIBISMODULE= yes
+LIBROOTDIR=/lib
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include "${.CURDIR}/../../Makefile.inc"
+.endif
+
+.if defined(MLIBDIR)
+LIBDIR= ${LIBROOTDIR}/${MLIBDIR}/npf
+SHLIBDIR= ${LIBROOTDIR}/${MLIBDIR}/npf
+SHLIBINSTALLDIR=${LIBROOTDIR}/${MLIBDIR}/npf
+.else
+LIBDIR= ${LIBROOTDIR}/npf
+SHLIBDIR= ${LIBROOTDIR}/npf
+SHLIBINSTALLDIR=${LIBROOTDIR}/npf
+.endif
+
+LIB=${MOD}
+SRCS=npf${MOD}.c
+
+.include <bsd.lib.mk>
Home |
Main Index |
Thread Index |
Old Index