root
/
telebit
mirror of https://github.com/therootcompany/telebit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more debugging

This commit is contained in:
AJ ONeal 2020-07-15 04:40:31 +00:00
parent ce09953167
commit 4a566f7dca
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mplexer/decoder.go
View File

@ -1,6 +1,7 @@
package telebit package telebit
import ( import (
"encoding/hex"
"fmt" "fmt"
"io" "io"
) )
@ -44,12 +45,9 @@ func (d *Decoder) Decode(out Router) error {
}() }()
for { for {
//fmt.Println("poopers gonna poop")
select { select {
// TODO, do we actually need ctx here?
// would it be sufficient to expect the reader to be closed by the caller instead?
case b := <-rx: case b := <-rx:
fmt.Println("[debug] [decoder] [srv] Tunnel write", len(b), string(b)) fmt.Println("[debug] [decoder] [srv] Tunnel write", len(b), hex.EncodeToString(b))
_, err := p.Write(b) _, err := p.Write(b)
if nil != err { if nil != err {
fmt.Println("[debug] [decoder] [srv] Tunnel write error") fmt.Println("[debug] [decoder] [srv] Tunnel write error")

6
mplexer/v1.go
View File

@ -125,8 +125,7 @@ func (p *Parser) unpackV1Header(b []byte, n int) ([]byte, error) {
if p.state.headerLen != len(p.state.header) { if p.state.headerLen != len(p.state.header) {
return b, nil return b, nil
} }
parts := strings.Split(string(p.state.header), ",") parts := strings.Split(strings.TrimSpace(string(p.state.header)), ",")
fmt.Println("[debug] Tun Header", string(p.state.header))
p.state.header = nil p.state.header = nil
if len(parts) < 5 { if len(parts) < 5 {
return nil, errors.New("error unpacking header") return nil, errors.New("error unpacking header")
@ -141,8 +140,7 @@ func (p *Parser) unpackV1Header(b []byte, n int) ([]byte, error) {
port, _ := strconv.Atoi(parts[PortIndex]) port, _ := strconv.Atoi(parts[PortIndex])
service := parts[ServiceIndex] service := parts[ServiceIndex]
fmt.Printf("[debug] parts: %s\n", parts) fmt.Printf("[debug] parts: %s\n", strings.Join(parts, " | "))
fmt.Printf("[debug] service: %s\n", service)
if "control" == service { if "control" == service {
fmt.Printf("[debug] control: %s\n", service) fmt.Printf("[debug] control: %s\n", service)
return nil, errors.New("'control' messages not implemented") return nil, errors.New("'control' messages not implemented")