1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-30 05:56:54 -05:00

wait only when data was written into piep

This commit is contained in:
Darien Raymond 2018-04-17 23:35:53 +02:00
parent a657ec49a0
commit 3137eba542
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 11 additions and 7 deletions

View File

@ -31,9 +31,11 @@ func New(ctx context.Context, config *Config) (*Handler, error) {
// Process implements OutboundHandler.Dispatch(). // Process implements OutboundHandler.Dispatch().
func (h *Handler) Process(ctx context.Context, link *core.Link, dialer proxy.Dialer) error { func (h *Handler) Process(ctx context.Context, link *core.Link, dialer proxy.Dialer) error {
h.response.WriteTo(link.Writer) nBytes := h.response.WriteTo(link.Writer)
// Sleep a little here to make sure the response is sent to client. if nBytes > 0 {
time.Sleep(time.Second) // Sleep a little here to make sure the response is sent to client.
time.Sleep(time.Second)
}
pipe.CloseError(link.Writer) pipe.CloseError(link.Writer)
return nil return nil
} }

View File

@ -19,17 +19,19 @@ Content-Length: 0
// ResponseConfig is the configuration for blackhole responses. // ResponseConfig is the configuration for blackhole responses.
type ResponseConfig interface { type ResponseConfig interface {
// WriteTo writes predefined response to the give buffer. // WriteTo writes predefined response to the give buffer.
WriteTo(buf.Writer) WriteTo(buf.Writer) int32
} }
// WriteTo implements ResponseConfig.WriteTo(). // WriteTo implements ResponseConfig.WriteTo().
func (*NoneResponse) WriteTo(buf.Writer) {} func (*NoneResponse) WriteTo(buf.Writer) int32 { return 0 }
// WriteTo implements ResponseConfig.WriteTo(). // WriteTo implements ResponseConfig.WriteTo().
func (*HTTPResponse) WriteTo(writer buf.Writer) { func (*HTTPResponse) WriteTo(writer buf.Writer) int32 {
b := buf.New() b := buf.New()
common.Must(b.AppendSupplier(serial.WriteString(http403response))) common.Must(b.Reset(serial.WriteString(http403response)))
n := b.Len()
writer.WriteMultiBuffer(buf.NewMultiBufferValue(b)) writer.WriteMultiBuffer(buf.NewMultiBufferValue(b))
return n
} }
// GetInternalResponse converts response settings from proto to internal data structure. // GetInternalResponse converts response settings from proto to internal data structure.