Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mirrors
openwrt
routing
比较版本
527fe47ceba2336c810a9f9fae033fb0eaa50954...36d862e94a9c4279b89286e63d049a9b336675f0
R
routing
项目概览
mirrors
/
openwrt
/
routing
大约 1 年 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
routing
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
源分支
36d862e94a9c4279b89286e63d049a9b336675f0
选择Git版本
...
目标分支
527fe47ceba2336c810a9f9fae033fb0eaa50954
选择Git版本
比较
Commits (4)
https://gitcode.net/mirror/openwrt/routing/-/commit/3f746aa08987d5fc234bf9399568884b17542f5c
babeld: update to 1.13
2023-07-31T08:29:47+02:00
Nick Hainke
vincent@systemli.org
Announcement: <a href="https://alioth-lists.debian.net/pipermail/babel-users/2023-July/004100.html" rel="nofollow noreferrer noopener" target="_blank">https://alioth-lists.debian.net/pipermail/babel-users/2023-July/004100.html</a> Babeld removed diversity routing [0], so we need to adjust ubus bindings. Further. we need to add a patch that makes local_kind accessible again: "100-local-make-local_kind-function-accessible.patch" Refresh patches: - 600-add-ubus.patch [0] - <a href="https://github.com/jech/babeld/commit/a0816083356e5d33fb71e0e30d92aa3bf335d7ea" rel="nofollow noreferrer noopener" target="_blank">https://github.com/jech/babeld/commit/a0816083356e5d33fb71e0e30d92aa3bf335d7ea</a>Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:vincent@systemli.org" title="vincent@systemli.org"></a><a href="javascript:void(0)" class="avatar s16 avatar-inline identicon bg3" style="text-decoration: none">N</a><a href="mailto:vincent@systemli.org" title="vincent@systemli.org">Nick Hainke</a> <<a href="mailto:vincent@systemli.org" title="vincent@systemli.org">vincent@systemli.org</a>></span> (cherry picked from commit <a href="/mirror/openwrt/routing/-/commit/9e13652bbf0ff9333465c38308850389c55936da" data-original="9e13652bbf0ff9333465c38308850389c55936da" data-link="false" data-link-reference="false" data-project="28801" data-commit="9e13652bbf0ff9333465c38308850389c55936da" data-reference-type="commit" data-container="body" data-placement="top" title="babeld: update to 1.13" class="gfm gfm-commit has-tooltip">9e13652b</a>)
https://gitcode.net/mirror/openwrt/routing/-/commit/02cbc8f61bf2c797975a5568fe419e36759c5532
babeld: update to 1.13.1
2023-07-31T08:29:47+02:00
Nick Hainke
vincent@systemli.org
Announcement: <a href="https://alioth-lists.debian.net/pipermail/babel-users/2023-July/004125.html" rel="nofollow noreferrer noopener" target="_blank">https://alioth-lists.debian.net/pipermail/babel-users/2023-July/004125.html</a> Remove upstreamed patch: - 100-local-make-local_kind-function-accessible.patch Refresh patch: - 600-add-ubus.patch Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:vincent@systemli.org" title="vincent@systemli.org"></a><a href="javascript:void(0)" class="avatar s16 avatar-inline identicon bg6" style="text-decoration: none">N</a><a href="mailto:vincent@systemli.org" title="vincent@systemli.org">Nick Hainke</a> <<a href="mailto:vincent@systemli.org" title="vincent@systemli.org">vincent@systemli.org</a>></span> (cherry picked from commit <a href="/mirror/openwrt/routing/-/commit/eb8978ebf786387eb44a1f937583a0981fdc1efb" data-original="eb8978ebf786387eb44a1f937583a0981fdc1efb" data-link="false" data-link-reference="false" data-project="28801" data-commit="eb8978ebf786387eb44a1f937583a0981fdc1efb" data-reference-type="commit" data-container="body" data-placement="top" title="babeld: update to 1.13.1" class="gfm gfm-commit has-tooltip">eb8978eb</a>)
https://gitcode.net/mirror/openwrt/routing/-/commit/e571e5878537ef1e5f08f9a633e8588a28330e37
opennds: Release v10.1.2
2023-08-04T17:58:23+02:00
Rob White
rob@blue-wave.net
Maintainer: Rob White rob@blue-wave.net Compile tested: arm_cortex-a7_neon-vfpv4, mipsel_24kc, x86-64 Run tested: arm_cortex-a7_neon-vfpv4, mipsel_24kc, x86-64; on snapshot, 23.05, 22.03 Description: opennds (10.1.2) Security Advisory. This version contains fixes for multiple potential security vulnerabilities Credit - Stanislav Dashevskyi - standash.github.io [standash] It also contains some minor bug fixes * Fix - Generate unique sha256 faskey if not set in config - CVE-2023-38324 [bluewavenet] * Fix - NULL pointer dereference if user_agent is NULL - CVE-2023-38320, CVE-2023-38322 [bluewavenet] * Fix - NULL pointer dereference if authdir is called with an incomplete or missing query string - CVE-2023-38313, CVE-2023-38314, CVE-2023-38315 [bluewavenet] * Fix - remove deprecated and non-functioning unescape callback - CVE-2023-38316 [bluewavenet] * Fix - prevent potential recursive dependency and detect if conflicting package is installed [bluewavenet] Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:rob@blue-wave.net" title="rob@blue-wave.net"></a><a href="javascript:void(0)" class="avatar s16 avatar-inline identicon bg2" style="text-decoration: none">N</a><a href="mailto:rob@blue-wave.net" title="rob@blue-wave.net">Rob White</a> <<a href="mailto:rob@blue-wave.net" title="rob@blue-wave.net">rob@blue-wave.net</a>></span> (cherry picked from commit <a href="/mirror/openwrt/routing/-/commit/3eb9aa30566eb34608e6aacc55157dad46550a6a" data-original="3eb9aa30566eb34608e6aacc55157dad46550a6a" data-link="false" data-link-reference="false" data-project="28801" data-commit="3eb9aa30566eb34608e6aacc55157dad46550a6a" data-reference-type="commit" data-container="body" data-placement="top" title="opennds: Release v10.1.2" class="gfm gfm-commit has-tooltip">3eb9aa30</a>)
https://gitcode.net/mirror/openwrt/routing/-/commit/36d862e94a9c4279b89286e63d049a9b336675f0
mesh11sd: Release v2.0.0
2023-08-09T12:47:56+02:00
Rob White
rob@blue-wave.net
Maintainer: Rob White rob@blue-wave.net Compile tested: All Run tested: arm_cortex-a7_neon-vfpv4, mipsel_24kc, x86-64, on 21.02, 22.03 and snapshot. Description: mesh11sd (2.0.0) This release contains new functionality. Autonomous portal mode is introduced. This simplifies the rollout of meshnodes allowing a common configuration to be used on all nodes. Remote administration is introduced, allowing files to be copied and terminal sessions to be opened on established meshnodes, identifying remote nodes by mac address. * Add - Update config file [bluewavenet] * Add - implementation of remote copy [bluewavenet] * Add - implementation of remote connect [bluewavenet] * Add - Autonomous portal mode [bluewavenet] -- Rob White dot@blue-wave.net Mon, 31 Jul 2023 16:59:52 +0000 Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:rob@blue-wave.net" title="rob@blue-wave.net"></a><a href="javascript:void(0)" class="avatar s16 avatar-inline identicon bg2" style="text-decoration: none">N</a><a href="mailto:rob@blue-wave.net" title="rob@blue-wave.net">Rob White</a> <<a href="mailto:rob@blue-wave.net" title="rob@blue-wave.net">rob@blue-wave.net</a>></span> (cherry picked from commit <a href="/mirror/openwrt/routing/-/commit/5beb3be9b86ddd1e859dd9ad38d1fb9a1a32dc65" data-original="5beb3be9b86ddd1e859dd9ad38d1fb9a1a32dc65" data-link="false" data-link-reference="false" data-project="28801" data-commit="5beb3be9b86ddd1e859dd9ad38d1fb9a1a32dc65" data-reference-type="commit" data-container="body" data-placement="top" title="mesh11sd: Release v2.0.0" class="gfm gfm-commit has-tooltip">5beb3be9</a>)
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
32 deletion
+15
-32
babeld/Makefile
babeld/Makefile
+2
-2
babeld/patches/600-add-ubus.patch
babeld/patches/600-add-ubus.patch
+5
-5
babeld/src/ubus.c
babeld/src/ubus.c
+0
-19
mesh11sd/Makefile
mesh11sd/Makefile
+6
-3
opennds/Makefile
opennds/Makefile
+2
-3
未找到文件。
babeld/Makefile
浏览文件 @
36d862e9
...
...
@@ -6,12 +6,12 @@
include
$(TOPDIR)/rules.mk
PKG_NAME
:=
babeld
PKG_VERSION
:=
1.1
2.2
PKG_VERSION
:=
1.1
3.1
PKG_RELEASE
:=
1
PKG_SOURCE
:=
$(PKG_NAME)
-
$(PKG_VERSION)
.tar.gz
PKG_SOURCE_URL
:=
https://www.irif.fr/~jch/software/files/
PKG_HASH
:=
1
db22b6193070ea2450a1ab51196fd72f58a1329f780cb0388e2e4b2e7768cbb
PKG_HASH
:=
1
5f24d26da0ccfc073abcdef0309f281e4684f2aa71126f826572c4c845e8dd9
PKG_MAINTAINER
:=
Gabriel Kerneis <gabriel@kerneis.info>,
\
Baptiste Jonglez <openwrt-pkg@bitsofnetworks.org>,
\
...
...
babeld/patches/600-add-ubus.patch
浏览文件 @
36d862e9
...
...
@@ -9,7 +9,7 @@
struct timeval now;
unsigned char myid[8];
@@ -5
21,6 +523
,9 @@
main(int argc, char **argv)
@@ -5
05,6 +507
,9 @@
main(int argc, char **argv)
}
}
...
...
@@ -19,7 +19,7 @@
init_signals();
rc = resize_receive_buffer(1500);
if(rc < 0)
@@ -
616,6 +621
,8 @@
main(int argc, char **argv)
@@ -
597,6 +602
,8 @@
main(int argc, char **argv)
FD_SET(local_sockets[i].fd, &readfds);
maxfd = MAX(maxfd, local_sockets[i].fd);
}
...
...
@@ -28,7 +28,7 @@
rc = select(maxfd + 1, &readfds, NULL, NULL, &tv);
if(rc < 0) {
if(errno != EINTR) {
@@ -6
84,6 +691
,9 @@
main(int argc, char **argv)
@@ -6
65,6 +672
,9 @@
main(int argc, char **argv)
i++;
}
...
...
@@ -57,7 +57,7 @@
static struct filter *input_filters = NULL;
static struct filter *output_filters = NULL;
static struct filter *redistribute_filters = NULL;
@@ -10
36,7 +1038
,8 @@
parse_option(int c, gnc_t gnc, void *clo
@@ -10
24,7 +1026
,8 @@
parse_option(int c, gnc_t gnc, void *clo
strcmp(token, "daemonise") == 0 ||
strcmp(token, "skip-kernel-setup") == 0 ||
strcmp(token, "ipv6-subtrees") == 0 ||
...
...
@@ -67,7 +67,7 @@
int b;
c = getbool(c, &b, gnc, closure);
if(c < -1)
@@ -10
54,6 +1057
,8 @@
parse_option(int c, gnc_t gnc, void *clo
@@ -10
42,6 +1045
,8 @@
parse_option(int c, gnc_t gnc, void *clo
has_ipv6_subtrees = b;
else if(strcmp(token, "reflect-kernel-metric") == 0)
reflect_kernel_metric = b;
...
...
babeld/src/ubus.c
浏览文件 @
36d862e9
...
...
@@ -245,23 +245,6 @@ static int babeld_ubus_get_xroutes(struct ubus_context *ctx_local,
static
void
babeld_add_route_buf
(
struct
babel_route
*
route
,
struct
blob_buf
*
b
)
{
void
*
prefix
;
char
channels
[
100
];
if
(
route
->
channels_len
==
0
)
{
channels
[
0
]
=
'\0'
;
}
else
{
int
i
,
j
=
0
;
snprintf
(
channels
,
sizeof
(
channels
),
" chan ("
);
j
=
strlen
(
channels
);
for
(
i
=
0
;
i
<
route
->
channels_len
;
i
++
)
{
if
(
i
>
0
)
channels
[
j
++
]
=
','
;
snprintf
(
channels
+
j
,
sizeof
(
channels
)
-
j
,
"%u"
,
(
unsigned
)
route
->
channels
[
i
]);
j
=
strlen
(
channels
);
}
snprintf
(
channels
+
j
,
sizeof
(
channels
)
-
j
,
")"
);
}
prefix
=
blobmsg_open_table
(
b
,
format_prefix
(
route
->
src
->
prefix
,
route
->
src
->
plen
));
...
...
@@ -274,7 +257,6 @@ static void babeld_add_route_buf(struct babel_route *route,
blobmsg_add_u32
(
b
,
"refmetric"
,
route
->
refmetric
);
blobmsg_add_string
(
b
,
"id"
,
format_eui64
(
route
->
src
->
id
));
blobmsg_add_u32
(
b
,
"seqno"
,
(
uint32_t
)
route
->
seqno
);
blobmsg_add_string
(
b
,
"channels"
,
channels
);
blobmsg_add_u32
(
b
,
"age"
,
(
int
)(
now
.
tv_sec
-
route
->
time
));
blobmsg_add_string
(
b
,
"via"
,
format_address
(
route
->
neigh
->
address
));
if
(
memcmp
(
route
->
nexthop
,
route
->
neigh
->
address
,
16
)
!=
0
)
...
...
@@ -357,7 +339,6 @@ static void babeld_add_neighbour_buf(struct neighbour *neigh,
blobmsg_add_u32
(
b
,
"rxcost"
,
neighbour_rxcost
(
neigh
));
blobmsg_add_u32
(
b
,
"txcost"
,
neigh
->
txcost
);
blobmsg_add_string
(
b
,
"rtt"
,
format_thousands
(
neigh
->
rtt
));
blobmsg_add_u32
(
b
,
"channel"
,
neigh
->
ifp
->
channel
);
blobmsg_add_u8
(
b
,
"if_up"
,
if_up
(
neigh
->
ifp
));
blobmsg_close_table
(
b
,
neighbour
);
}
...
...
mesh11sd/Makefile
浏览文件 @
36d862e9
...
...
@@ -8,8 +8,8 @@
include
$(TOPDIR)/rules.mk
PKG_NAME
:=
mesh11sd
PKG_VERSION
:=
1.2
.0
PKG_RELEASE
:=
3
PKG_VERSION
:=
2.0
.0
PKG_RELEASE
:=
1
PKG_MAINTAINER
:=
Rob White <rob@blue-wave.net>
PKG_LICENSE
:=
GPL-2.0-or-later
...
...
@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE
:=
$(PKG_NAME)
-
$(PKG_VERSION)
.tar.gz
PKG_SOURCE_URL
:=
https://codeload.github.com/opennds/mesh11sd/tar.gz/v
$(PKG_VERSION)
?
PKG_HASH
:=
b719eaacf63eb3684d0cd6a026f4357a4f400f2339f5d5a6cf74ba3744fe30d8
PKG_HASH
:=
741d219ea9c6fcb5e58771130c319c5b983274caf08f5c1cd5a458864e928649
PKG_BUILD_DIR
:=
$(BUILD_DIR)
/mesh11sd-
$(PKG_VERSION)
include
$(INCLUDE_DIR)/package.mk
...
...
@@ -41,6 +41,9 @@ define Package/mesh11sd/description
Without
mesh11sd,
many
mesh
parameters
cannot
be
set
in
the
uci
wireless
config
file
as
the
mesh
interface
must
be
up
before
the
parameters
can
be
set.
Some
of
those
that
are
supported,
would
fail
to
be
implemented
when
the
network
is
(re)started
resulting
in
errors
or
dropped
nodes.
The
mesh11sd
daemon
dynamically
checks
configured
parameters
and
sets
them
as
required.
Upstream
wan
connectivity
is
checked
(eg
Internet
feed)
and
when
not
present,
layer
2
peer
mode
is
autonomously
enabled,
and
when
it
is
present,
layer
3
portal
mode
is
enabled.
This
allows
the
same
simple
router
configuration
to
be
used
on
all
meshnodes
in
the
layer
2
mesh.
Remote
terminal
sessions
and
remote
file
transfers
are
supported
using
the
meshnode
mac
address
as
an
identifier.
This
version
does
not
require
a
Captive
Portal
to
be
running.
endef
...
...
opennds/Makefile
浏览文件 @
36d862e9
...
...
@@ -6,12 +6,12 @@
include
$(TOPDIR)/rules.mk
PKG_NAME
:=
opennds
PKG_VERSION
:=
10.1.
1
PKG_VERSION
:=
10.1.
2
PKG_RELEASE
:=
1
PKG_SOURCE
:=
$(PKG_NAME)
-
$(PKG_VERSION)
.tar.gz
PKG_SOURCE_URL
:=
https://codeload.github.com/opennds/opennds/tar.gz/v
$(PKG_VERSION)
?
PKG_HASH
:=
60ce15f5aa96f7e7f3b239a0029f74c0ba900d3db72b209ba6e6d36a5bbef138
PKG_HASH
:=
818c24a8704e584665b493857086bccc3c55629977841ddffc185f7d082ef279
PKG_BUILD_DIR
:=
$(BUILD_DIR)
/openNDS-
$(PKG_VERSION)
PKG_MAINTAINER
:=
Rob White <rob@blue-wave.net>
...
...
@@ -66,7 +66,6 @@ define Package/opennds/install
$(CP)
$(PKG_BUILD_DIR)/forward_authentication_service/PreAuth/theme_user-email-login-custom-placeholders.sh
$(1)/usr/lib/opennds/
$(CP)
$(PKG_BUILD_DIR)/forward_authentication_service/libs/get_client_interface.sh
$(1)/usr/lib/opennds/
$(CP)
$(PKG_BUILD_DIR)/forward_authentication_service/libs/client_params.sh
$(1)/usr/lib/opennds/
$(CP)
$(PKG_BUILD_DIR)/forward_authentication_service/libs/unescape.sh
$(1)/usr/lib/opennds/
$(CP)
$(PKG_BUILD_DIR)/forward_authentication_service/libs/authmon.sh
$(1)/usr/lib/opennds/
$(CP)
$(PKG_BUILD_DIR)/forward_authentication_service/libs/dnsconfig.sh
$(1)/usr/lib/opennds/
$(CP)
$(PKG_BUILD_DIR)/forward_authentication_service/libs/download_resources.sh
$(1)/usr/lib/opennds/
...
...