Skip to content
This repository was archived by the owner on Jan 3, 2024. It is now read-only.

Commit e848dd1

Browse files
mikmavkrasnov
authored andcommitted
Fix missing fwmark in api get responses (cloudflare#132)
The fwmark key must be included before any peers.
1 parent 8befa3a commit e848dd1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/device/api.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ fn api_get<T: Tun, S: Sock>(writer: &mut BufWriter<&UnixStream>, d: &Device<T, S
128128
writeln!(writer, "listen_port={}", d.listen_port);
129129
}
130130

131+
if let Some(fwmark) = d.fwmark {
132+
writeln!(writer, "fwmark={}", fwmark);
133+
}
134+
131135
for (k, p) in d.peers.iter() {
132136
writeln!(writer, "public_key={}", encode_hex(k.as_bytes()));
133137

@@ -139,10 +143,6 @@ fn api_get<T: Tun, S: Sock>(writer: &mut BufWriter<&UnixStream>, d: &Device<T, S
139143
writeln!(writer, "persistent_keepalive_interval={}", keepalive);
140144
}
141145

142-
if let Some(fwmark) = d.fwmark {
143-
writeln!(writer, "fwmark={}", fwmark);
144-
}
145-
146146
if let Some(ref addr) = p.endpoint().addr {
147147
writeln!(writer, "endpoint={}", addr);
148148
}

0 commit comments

Comments
 (0)