sysmocom
/
openwrt
11
0
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
cyrus 2015-01-13 19:02:32 +00:00
parent 0da41e430e
commit 3a2fa00474
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/network/ipv6/map/Makefile
View File

@ -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,8 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=map
PKG_VERSION:=2
PKG_RELEASE:=1
PKG_VERSION:=3
PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

3
package/network/ipv6/map/files/map.sh
View File

@ -52,6 +52,7 @@ proto_map_setup() {
fi
fi
echo "rule=$rule" > /tmp/map-$cfg.rules
RULE_DATA=$(mapcalc ${tunlink:-\*} $rule)
if [ "$?" != 0 ]; then
proto_notify_error "$cfg" "INVALID_MAP_RULE"
@ -59,6 +60,7 @@ proto_map_setup() {
return
fi
echo "$RULE_DATA" >> /tmp/map-$cfg.rules
eval $RULE_DATA
if [ -z "$RULE_BMR" ]; then
@ -188,6 +190,7 @@ proto_map_setup() {
proto_map_teardown() {
local cfg="$1"
ifdown "${cfg}_local"
rm -f /tmp/map-$cfg.rules
}
proto_map_init_config() {

6
package/network/ipv6/map/src/mapcalc.c
View File

@ -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);