1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-07 14:25:26 -04:00

simplify ray stream

This commit is contained in:
Darien Raymond
2017-04-16 09:57:28 +02:00
parent d809973621
commit 2f565bfd5e
9 changed files with 120 additions and 168 deletions

View File

@@ -4,6 +4,7 @@ package freedom
import (
"context"
"io"
"runtime"
"time"
@@ -112,8 +113,13 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial
ctx, timer := signal.CancelAfterInactivity(ctx, timeout)
requestDone := signal.ExecuteAsync(func() error {
v2writer := buf.NewWriter(conn)
if err := buf.PipeUntilEOF(timer, input, v2writer); err != nil {
var writer buf.Writer
if destination.Network == net.Network_TCP {
writer = buf.NewWriter(conn)
} else {
writer = &seqWriter{writer: conn}
}
if err := buf.PipeUntilEOF(timer, input, writer); err != nil {
return err
}
return nil
@@ -145,3 +151,19 @@ func init() {
return New(ctx, config.(*Config))
}))
}
type seqWriter struct {
writer io.Writer
}
func (w *seqWriter) Write(mb buf.MultiBuffer) error {
defer mb.Release()
for _, b := range mb {
if _, err := w.writer.Write(b.Bytes()); err != nil {
return err
}
}
return nil
}