Author: cyrus Date: 2015-09-07 18:21:15 +0200 (Mon, 07 Sep 2015) New Revision: 46804
Modified: trunk/package/network/ipv6/map/Makefile trunk/package/network/ipv6/map/src/mapcalc.c Log: map: ignore insignificant PSID bits Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/ipv6/map/Makefile =================================================================== --- trunk/package/network/ipv6/map/Makefile 2015-09-07 13:31:36 UTC (rev 46803) +++ trunk/package/network/ipv6/map/Makefile 2015-09-07 16:21:15 UTC (rev 46804) @@ -9,7 +9,7 @@ PKG_NAME:=map PKG_VERSION:=4 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk Modified: trunk/package/network/ipv6/map/src/mapcalc.c =================================================================== --- trunk/package/network/ipv6/map/src/mapcalc.c 2015-09-07 13:31:36 UTC (rev 46803) +++ trunk/package/network/ipv6/map/src/mapcalc.c 2015-09-07 16:21:15 UTC (rev 46804) @@ -314,7 +314,9 @@ 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]); _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
