opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove port when assignning to CallHdr.Host

Browse Source
This commit is contained in:
iamqizhao
2015-02-19 13:55:18 -08:00
parent bdce4ae018
commit dbe8c6ed11
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
call.go
View File

@ -35,6 +35,7 @@ package grpc
import ( import (
"io" "io"
"net"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -114,8 +115,12 @@ func Invoke(ctx context.Context, method string, args, reply proto.Message, cc *C
o.after(&c) o.after(&c)
} }
}() }()
host, _, err := net.SplitHostPort(cc.target)
if err != nil {
return toRPCErr(err)
}
callHdr := &transport.CallHdr{ callHdr := &transport.CallHdr{
Host: cc.target, Host: host,
Method: method, Method: method,
} }
topts := &transport.Options{ topts := &transport.Options{

7
stream.go
View File

@ -36,6 +36,7 @@ package grpc
import ( import (
"fmt" "fmt"
"io" "io"
"net"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -95,8 +96,12 @@ type ClientStream interface {
// by generated code. // by generated code.
func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) { func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (ClientStream, error) {
// TODO(zhaoq): CallOption is omitted. Add support when it is needed. // TODO(zhaoq): CallOption is omitted. Add support when it is needed.
host, _, err := net.SplitHostPort(cc.target)
if err != nil {
return nil, toRPCErr(err)
}
callHdr := &transport.CallHdr{ callHdr := &transport.CallHdr{
Host: cc.target, Host: host,
Method: method, Method: method,
} }
t, _, err := cc.wait(ctx, 0) t, _, err := cc.wait(ctx, 0)