diff options
| author | Steven Barth <steven@midlink.org> | 2015-09-07 16:21:15 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-09-07 16:21:15 +0000 |
| commit | b2d1ff8b81188be3c0338b87a705f8387d207d3f (patch) | |
| tree | 6516356f6ba03bdb1b88ba788fe06aa52ed2273a /package/network/ipv6/map | |
| parent | 0bc39ad3714c07d1476b938c60291ec1f5a36630 (diff) | |
| download | master-187ad058-b2d1ff8b81188be3c0338b87a705f8387d207d3f.tar.gz master-187ad058-b2d1ff8b81188be3c0338b87a705f8387d207d3f.tar.bz2 master-187ad058-b2d1ff8b81188be3c0338b87a705f8387d207d3f.zip | |
map: ignore insignificant PSID bits
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46804 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6/map')
| -rw-r--r-- | package/network/ipv6/map/Makefile | 2 | ||||
| -rw-r--r-- | package/network/ipv6/map/src/mapcalc.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile index a45e9bc1fd..1d423150b9 100644 --- a/package/network/ipv6/map/Makefile +++ b/package/network/ipv6/map/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map PKG_VERSION:=4 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/ipv6/map/src/mapcalc.c b/package/network/ipv6/map/src/mapcalc.c index b9fab4d923..7aa28e57d5 100644 --- a/package/network/ipv6/map/src/mapcalc.c +++ b/package/network/ipv6/map/src/mapcalc.c @@ -314,7 +314,9 @@ int main(int argc, char *argv[]) psid = be16_to_cpu(psid16); } - psid16 = cpu_to_be16(psid >> (16 - psidlen)); + psid = psid >> (16 - psidlen); + psid16 = cpu_to_be16(psid); + psid = psid << (16 - psidlen); if (prefix4len < 0 || prefix6len < 0 || ealen < 0 || ealen < psidlen) { fprintf(stderr, "Skipping invalid or incomplete rule: %s\n", argv[i]); |