diff options
| author | Steven Barth <steven@midlink.org> | 2015-01-13 19:02:32 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-01-13 19:02:32 +0000 |
| commit | ae69e6dbf8dbd95128838f2b55b4057bc29ada02 (patch) | |
| tree | a4e2cb0c4a8347f7d88750d06e545ae5d963d1e6 /package/network/ipv6/map/src/mapcalc.c | |
| parent | 231a34f6204d064d9a88ad9a6c3829137eda969d (diff) | |
| download | upstream-ae69e6dbf8dbd95128838f2b55b4057bc29ada02.tar.gz upstream-ae69e6dbf8dbd95128838f2b55b4057bc29ada02.tar.bz2 upstream-ae69e6dbf8dbd95128838f2b55b4057bc29ada02.zip | |
map: backport fixes from trunk
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@43962 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/ipv6/map/src/mapcalc.c')
| -rw-r--r-- | package/network/ipv6/map/src/mapcalc.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |