Skip to content

Commit

Permalink
fix: rm addr str
Browse files Browse the repository at this point in the history
  • Loading branch information
joway committed Oct 10, 2024
1 parent 35b2343 commit 9fcc089
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions pkg/streamx/provider/ttstream/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,23 +137,19 @@ func (t *transport) loadStreamIO(sid int32) (sio *streamIO, ok bool) {
}

func (t *transport) readFrame(reader bufiox.Reader) error {
addr := t.conn.RemoteAddr().String()
if t.kind == clientTransport {
addr = t.conn.LocalAddr().String()
}
fr, err := DecodeFrame(context.Background(), reader)
if err != nil {
return err
}
klog.Debugf("transport[%d-%s] DecodeFrame: fr=%v", t.kind, addr, fr)
klog.Debugf("transport[%d] DecodeFrame: fr=%v", t.kind, fr)

switch fr.typ {
case metaFrameType:
sio, ok := t.loadStreamIO(fr.sid)
if ok {
err = sio.stream.readMetaFrame(fr.meta, fr.header, fr.payload)
} else {
klog.Errorf("transport[%d-%s] read a unknown stream meta: sid=%d", t.kind, addr, fr.sid)
klog.Errorf("transport[%d] read a unknown stream meta: sid=%d", t.kind, fr.sid)
}
case headerFrameType:
switch t.kind {
Expand All @@ -169,8 +165,8 @@ func (t *transport) readFrame(reader bufiox.Reader) error {
if ok {
err = sio.stream.readHeader(fr.header)
} else {
klog.Errorf("transport[%d-%s] read a unknown stream header: sid=%d header=%v",
t.kind, addr, fr.sid, fr.header)
klog.Errorf("transport[%d] read a unknown stream header: sid=%d header=%v",
t.kind, fr.sid, fr.header)
}
}
case dataFrameType:
Expand All @@ -179,7 +175,7 @@ func (t *transport) readFrame(reader bufiox.Reader) error {
if ok {
sio.input(context.Background(), fr)
} else {
klog.Errorf("transport[%d-%s] read a unknown stream data: sid=%d", t.kind, addr, fr.sid)
klog.Errorf("transport[%d] read a unknown stream data: sid=%d", t.kind, fr.sid)
}
case trailerFrameType:
// Trailer Frame: recv trailer, Close read direction
Expand All @@ -190,8 +186,8 @@ func (t *transport) readFrame(reader bufiox.Reader) error {
// client recv an unknown trailer is in exception,
// because the client stream may already be GCed,
// but the connection is still active so peer server can send a trailer
klog.Errorf("transport[%d-%s] read a unknown stream trailer: sid=%d trailer=%v",
t.kind, addr, fr.sid, fr.trailer)
klog.Errorf("transport[%d] read a unknown stream trailer: sid=%d trailer=%v",
t.kind, fr.sid, fr.trailer)
}
}
return err
Expand Down

0 comments on commit 9fcc089

Please sign in to comment.