diff options
| author | Steven Barth <steven@midlink.org> | 2015-05-16 10:12:15 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-05-16 10:12:15 +0000 |
| commit | 90d3261e1243402238730720adc80d6ccfe66b9c (patch) | |
| tree | d8095bfe62f0db3857a81f6d503ce3c8c6108350 /package/network | |
| parent | 169904863d137d8de6912e25d352818546a7f88a (diff) | |
| download | upstream-90d3261e1243402238730720adc80d6ccfe66b9c.tar.gz upstream-90d3261e1243402238730720adc80d6ccfe66b9c.tar.bz2 upstream-90d3261e1243402238730720adc80d6ccfe66b9c.zip | |
map: set ealen to psidlen for lw4over6
Signed-off-by: Steven Barth <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45689 3c298f89-4303-0410-b956-a3cf2f4a3e73
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; |