diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-05-16 10:12:15 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-05-16 10:12:15 +0000 |
| commit | 1ffe824e81442089f0c70c40a3968313aa9b537f (patch) | |
| tree | bc9cf70cca3ee04438aabf140e935783f11da77c /package/network | |
| parent | 356a9f0280f36bdbca83bc0bc9f6e80106fc446c (diff) | |
| download | upstream-1ffe824e81442089f0c70c40a3968313aa9b537f.tar.gz upstream-1ffe824e81442089f0c70c40a3968313aa9b537f.tar.bz2 upstream-1ffe824e81442089f0c70c40a3968313aa9b537f.zip | |
map: set ealen to psidlen for lw4over6
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 45689
Diffstat (limited to 'package/network')
| -rw-r--r-- | package/network/ipv6/map/Makefile | 2 | ||||
| -rw-r--r-- | package/network/ipv6/map/src/mapcalc.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile index 2a029f8fe8..09ba523ec0 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:=3 -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 b4b3d736f0..b61e157fc3 100644 --- a/package/network/ipv6/map/src/mapcalc.c +++ b/package/network/ipv6/map/src/mapcalc.c @@ -226,6 +226,9 @@ int main(int argc, char *argv[]) if (offset < 0) offset = (lw4o6) ? 0 : (legacy) ? 4 : 6; + if (lw4o6 && ealen < 0 && psidlen >= 0) + ealen = psidlen; + // Find PD struct blob_attr *c, *cur; unsigned rem; |