burble.dn42/bird-lg-go
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Merge pull request #6 from petabyteboy/master

Browse Source 
preserve leading spaces
This commit is contained in:
Yuhui Xu 2020-11-19 23:22:00 +08:00 committed by GitHub
commit 5cf2ac57b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
proxy/bird.go
View File

@ -30,34 +30,16 @@ func birdReadln(bird io.Reader, w io.Writer) bool {
// print(string(c[:])) // print(string(c[:]))
// Remove preceding status number, different situations // Remove preceding status number, different situations
if pos < 4 { if pos > 4 && isNumeric(c[0]) && isNumeric(c[1]) && isNumeric(c[2]) && isNumeric(c[3]) {
// Line is too short to have a status number
if w != nil {
pos = 0
for c[pos] == byte(' ') {
pos++
}
w.Write(c[pos:])
}
return true
} else if isNumeric(c[0]) && isNumeric(c[1]) && isNumeric(c[2]) && isNumeric(c[3]) {
// There is a status number at beginning, remove first 5 bytes // There is a status number at beginning, remove first 5 bytes
if w != nil && pos > 6 { if w != nil && pos > 6 {
pos = 5 pos = 5
for c[pos] == byte(' ') {
pos++
}
w.Write(c[pos:]) w.Write(c[pos:])
} }
return c[0] != byte('0') && c[0] != byte('8') && c[0] != byte('9') return c[0] != byte('0') && c[0] != byte('8') && c[0] != byte('9')
} else { } else {
// There is no status number, only remove preceding spaces
if w != nil { if w != nil {
pos = 0 w.Write(c[1:])
for c[pos] == byte(' ') {
pos++
}
w.Write(c[pos:])
} }
return true return true
} }