From 63d2c81f0129c5ec81760d6b464c2798a319e54a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 19 Jul 2012 19:51:53 +0000 Subject: [PATCH] [package] owipcalc: add "prefix" operation to set prefix of base address during calculation git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32782 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/owipcalc/Makefile | 2 +- package/owipcalc/src/owipcalc.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/package/owipcalc/Makefile b/package/owipcalc/Makefile index 9ff9b24c2c..ec65c84c96 100644 --- a/package/owipcalc/Makefile +++ b/package/owipcalc/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=owipcalc -PKG_RELEASE:=1 +PKG_RELEASE:=2 include $(INCLUDE_DIR)/package.mk diff --git a/package/owipcalc/src/owipcalc.c b/package/owipcalc/src/owipcalc.c index 6d7a8aaf43..06d163e2f8 100644 --- a/package/owipcalc/src/owipcalc.c +++ b/package/owipcalc/src/owipcalc.c @@ -518,6 +518,12 @@ static bool cidr_howmany(struct cidr *a, struct cidr *b) return true; } +static bool cidr_prefix(struct cidr *a, struct cidr *b) +{ + a->prefix = b->prefix; + return true; +} + static bool cidr_quiet(struct cidr *a) { quiet = true; @@ -545,6 +551,11 @@ struct op ops[] = { .desc = "Turn base address into broadcast address", .f4.a1 = cidr_broadcast4 }, + { .name = "prefix", + .desc = "Set the prefix of base address to argument", + .f4.a2 = cidr_prefix, + .f6.a2 = cidr_prefix }, + { .name = "netmask", .desc = "Print netmask of base address, does not change base address", .f4.a1 = cidr_netmask4 },