Author: cyrus Date: 2015-01-12 11:56:54 +0100 (Mon, 12 Jan 2015) New Revision: 43946
Modified: trunk/package/network/ipv6/map/Makefile trunk/package/network/ipv6/map/src/mapcalc.c Log: map: ignore psid and psidlen if psidlen is 0 Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/ipv6/map/Makefile =================================================================== --- trunk/package/network/ipv6/map/Makefile 2015-01-12 09:32:33 UTC (rev 43945) +++ trunk/package/network/ipv6/map/Makefile 2015-01-12 10:56:54 UTC (rev 43946) @@ -1,5 +1,5 @@ # -# Copyright (C) 2014 OpenWrt.org +# Copyright (C) 2014-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=map -PKG_VERSION:=2 +PKG_VERSION:=3 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 Modified: trunk/package/network/ipv6/map/src/mapcalc.c =================================================================== --- trunk/package/network/ipv6/map/src/mapcalc.c 2015-01-12 09:32:33 UTC (rev 43945) +++ trunk/package/network/ipv6/map/src/mapcalc.c 2015-01-12 10:56:54 UTC (rev 43946) @@ -2,7 +2,7 @@ * mapcalc - MAP parameter calculation * * Author: Steven Barth <[email protected]> - * Copyright (c) 2014 cisco Systems, Inc. + * Copyright (c) 2014-2015 cisco Systems, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -271,8 +271,10 @@ if (ealen < 0 && pdlen >= 0) ealen = pdlen - prefix6len; - if (psidlen < 0) + if (psidlen <= 0) { psidlen = ealen - (32 - prefix4len); + psid = -1; + } if (psid < 0 && psidlen <= 16 && psidlen >= 0 && pdlen >= 0 && ealen >= psidlen) { bmemcpys64(&psid16, &pd, prefix6len + ealen - psidlen, psidlen); _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
