diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-01-12 10:56:54 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-01-12 10:56:54 +0000 |
| commit | d73c382a734d54298c615f6b87482e877396862b (patch) | |
| tree | c4afa0baacfed9fbf1b1ef9120e07e4a4adf433b | |
| parent | b0a2d7ad0dbaec2ff9f6f5f87c20c534857c849b (diff) | |
| download | upstream-d73c382a734d54298c615f6b87482e877396862b.tar.gz upstream-d73c382a734d54298c615f6b87482e877396862b.tar.bz2 upstream-d73c382a734d54298c615f6b87482e877396862b.zip | |
map: ignore psid and psidlen if psidlen is 0
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 43946
| -rw-r--r-- | package/network/ipv6/map/Makefile | 4 | ||||
| -rw-r--r-- | package/network/ipv6/map/src/mapcalc.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile index 382fe0a8ba..2848fe9ea2 100644 --- a/package/network/ipv6/map/Makefile +++ b/package/network/ipv6/map/Makefile @@ -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 diff --git a/package/network/ipv6/map/src/mapcalc.c b/package/network/ipv6/map/src/mapcalc.c index afce6d24d7..b4b3d736f0 100644 --- a/package/network/ipv6/map/src/mapcalc.c +++ b/package/network/ipv6/map/src/mapcalc.c @@ -2,7 +2,7 @@ * mapcalc - MAP parameter calculation * * Author: Steven Barth <cyrus@openwrt.org> - * 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 @@ int main(int argc, char *argv[]) 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); |