lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-10-17 22:44:08 -04:00
Code Issues Releases Wiki Activity

merge duplicated code

Browse Source
This commit is contained in:
Darien Raymond
2018-10-21 21:27:05 +02:00
parent 275c92b6fa
commit c29f1c8cf0
2 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/proxyman/command/command.go
View File

@@ -70,15 +70,11 @@ type handlerServer struct {
}
func (s *handlerServer) AddInbound(ctx context.Context, request *AddInboundRequest) (*AddInboundResponse, error) {
rawHandler, err := core.CreateObject(s.s, request.Inbound)
if err != nil {
if err := core.AddInboundHandler(s.s, request.Inbound); err != nil {
return nil, err
}
handler, ok := rawHandler.(inbound.Handler)
if !ok {
return nil, newError("not an InboundHandler.")
}
return &AddInboundResponse{}, s.ihm.AddHandler(ctx, handler)
return &AddInboundResponse{}, nil
}
func (s *handlerServer) RemoveInbound(ctx context.Context, request *RemoveInboundRequest) (*RemoveInboundResponse, error) {
@@ -104,15 +100,10 @@ func (s *handlerServer) AlterInbound(ctx context.Context, request *AlterInboundR
}
func (s *handlerServer) AddOutbound(ctx context.Context, request *AddOutboundRequest) (*AddOutboundResponse, error) {
rawHandler, err := core.CreateObject(s.s, request.Outbound)
if err != nil {
if err := core.AddOutboundHandler(s.s, request.Outbound); err != nil {
return nil, err
}
handler, ok := rawHandler.(outbound.Handler)
if !ok {
return nil, newError("not an OutboundHandler.")
}
return &AddOutboundResponse{}, s.ohm.AddHandler(ctx, handler)
return &AddOutboundResponse{}, nil
}
func (s *handlerServer) RemoveOutbound(ctx context.Context, request *RemoveOutboundRequest) (*RemoveOutboundResponse, error) {