Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
tun
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Railgun
tun
Commits
d4fdd8b5
Commit
d4fdd8b5
authored
Jun 03, 2025
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add multi endpoint
parent
f5ffc9fe
Pipeline
#37140
passed with stages
in 3 minutes and 16 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
4 deletions
+37
-4
src/main.rs
src/main.rs
+26
-4
src/router.rs
src/router.rs
+11
-0
No files found.
src/main.rs
View file @
d4fdd8b5
...
...
@@ -8,6 +8,7 @@ use std::intrinsics::transmute;
use
std
::
io
::{
Read
,
Write
};
use
std
::
mem
::
MaybeUninit
;
use
std
::
sync
::
Arc
;
use
std
::
time
::{
Duration
,
Instant
};
#[repr(C)]
pub
struct
Meta
{
...
...
@@ -93,10 +94,26 @@ fn main() -> Result<(), Box<dyn Error>> {
loop
{
let
n
=
router
.tun_reader
.read
(
&
mut
buffer
[
meta_size
..
])
.unwrap
();
if
let
Some
(
ref
addr
)
=
*
router
.endpoint
.read
()
.unwrap
()
{
router
.encrypt
(
&
mut
buffer
[
meta_size
..
meta_size
+
n
]);
#[cfg(target_os
=
"linux"
)]
let
_
=
router
.socket
.set_mark
(
router
.config.mark
);
// 加密 payload
router
.encrypt
(
&
mut
buffer
[
meta_size
..
meta_size
+
n
]);
#[cfg(target_os
=
"linux"
)]
let
_
=
router
.socket
.set_mark
(
router
.config.mark
);
// 计算是否超时
let
now
=
Instant
::
now
();
let
last_seen
=
*
router
.last_seen
.read
()
.unwrap
();
let
elapsed
=
now
.duration_since
(
last_seen
);
if
elapsed
>
Duration
::
from_secs
(
5
)
{
// ⏱ 超时,广播给所有 endpoints
let
endpoints
=
router
.endpoints
.read
()
.unwrap
();
for
addr
in
endpoints
.iter
()
{
let
_
=
router
.socket
.send_to
(
&
buffer
[
..
meta_size
+
n
],
addr
);
}
}
else
if
let
Some
(
ref
addr
)
=
*
router
.endpoint
.read
()
.unwrap
()
{
// ✅ 正常单播
let
_
=
router
.socket
.send_to
(
&
buffer
[
..
meta_size
+
n
],
addr
);
}
}
...
...
@@ -125,6 +142,11 @@ fn main() -> Result<(), Box<dyn Error>> {
.get_mut
(
&
meta
.src_id
)
.ok_or
(
"missing router"
)
?
;
*
router
.endpoint
.write
()
.unwrap
()
=
Some
(
addr
);
*
router
.last_seen
.write
()
.unwrap
()
=
Instant
::
now
();
// ✅ 更新时间戳
let
mut
endpoints
=
router
.endpoints
.write
()
.unwrap
();
endpoints
.insert
(
addr
);
// ✅ 加入新的地址
router
.decrypt
(
payload
,
&
local_secret
);
router
.tun_writer
.write_all
(
payload
)
?
;
}
...
...
src/router.rs
View file @
d4fdd8b5
...
...
@@ -52,6 +52,8 @@ pub struct Router<'a> {
pub
tun_writer
:
Writer
,
pub
socket
:
Arc
<
Socket
>
,
pub
endpoint
:
Arc
<
RwLock
<
Option
<
SockAddr
>>>
,
pub
endpoints
:
Arc
<
RwLock
<
HashSet
<
SocketAddr
>>>
,
pub
last_seen
:
Arc
<
RwLock
<
Instant
>>
,
}
impl
<
'a
>
Router
<
'a
>
{
...
...
@@ -122,6 +124,13 @@ impl<'a> Router<'a> {
let
(
tun_reader
,
tun_writer
)
=
Self
::
create_tun_device
(
&
config
)
?
;
Self
::
run_up_script
(
&
config
)
?
;
let
mut
endpoints_set
=
HashSet
::
new
();
if
let
Some
(
addr
)
=
*
endpoint
.read
()
.unwrap
()
{
endpoints_set
.insert
(
addr
);
}
let
endpoints
=
Arc
::
new
(
RwLock
::
new
(
endpoints_set
));
let
last_seen
=
Arc
::
new
(
RwLock
::
new
(
Instant
::
now
()));
let
router
=
Router
{
config
,
secret
,
...
...
@@ -129,6 +138,8 @@ impl<'a> Router<'a> {
tun_reader
,
tun_writer
,
socket
,
endpoints
,
last_seen
,
};
Ok
(
router
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment