Developing lightweight computation at the DSG edge

Commit 3d63d726 authored by Simó Albert i Beltran's avatar Simó Albert i Beltran
Browse files

Merge branch 'issue-#136' into testing, references #136.

parents 42cba912 c6e03bcc
......@@ -33,14 +33,14 @@ Public Sources:
PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
#PKG_REV:=3434d7fddf8de71d3d4829cb6d5adcefbbf7fe4f
PKG_REV:=fcba5ac9ebd315ed07b3d3f7f42e646a73c6ff5d
PKG_REV:=e75cde58f3da249881762e96ff42b89f18221d5c
Private Sources:
#PKG_SOURCE_URL:=file:///usr/src/bmx6/bmx6-private.git
PKG_VERSION:=r2012042401
PKG_VERSION:=r2012060601
PKG_RELEASE:=2
PKG_RELEASE:=3
#PKG_INSTALL:=1 # this tries to install straight to /usr/sbin/bmx6
PKG_SOURCE_VERSION:=$(PKG_REV)
......
Author: Simó Albert i Beltran
Description: Fix tablePrefTuns and tableTuns options.
--- a/ip.c
+++ b/ip.c
@@ -2938,7 +2938,7 @@ int32_t opt_ip_version(uint8_t cmd, uint
if (val) {
- if (is_policy_rt_supported() != val) {
+ if (!is_policy_rt_supported()) {
dbgf_sys(DBGT_ERR, "Kernel policy-routing support required for %s=%d %c%s=%d",
ARG_IP, ip_tmp, LONG_OPT_ARG_DELIMITER_CHAR, c->opt->name, val);
Author: Simó Albert i Beltran
Description: Fix throwRules option.
--- a/ip.c
+++ b/ip.c
@@ -2456,8 +2456,10 @@ int update_interface_rules(void)
assertion(-500609, is_ip_set(&ian->ip_addr));
+/*
if (ian->ifa.ifa_family != AF_CFG)
continue;
+*/
if (!ian->ifa.ifa_prefixlen)
continue;
@@ -2482,10 +2484,11 @@ int update_interface_rules(void)
continue;
struct net_key throw;
- setNet(&throw, AF_CFG, ian->ifa.ifa_prefixlen, &ian->ip_addr);
+ setNet(&throw, ian->ifa.ifa_family, ian->ifa.ifa_prefixlen, &ian->ip_addr);
ip_netmask_validate(&throw.ip, throw.mask, throw.af, YES);
- ip(IP_THROW_MY_NET, ADD, NO, &throw, RT_TABLE_HNA, 0, 0, 0, 0, 0, 0);
+ ip(IP_THROW_MY_NET, ADD, NO, &throw, RT_TABLE_HNA, RT_PRIO_HNA, 0, throw.af == AF_INET6, 0, 0, 0);
+ ip(IP_THROW_MY_NET, ADD, NO, &throw, RT_TABLE_TUN, RT_PRIO_TUNS, 0, throw.af == AF_INET6, 0, 0, 0);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment