Unverified Commit cbb16389 authored by Xin.Zh's avatar Xin.Zh Committed by GitHub

Merge pull request #5 from hudangwei/master

LGTM
parents 388d0a67 f8bedfec
......@@ -135,8 +135,9 @@ func (c PBCodec) Decode(data []byte, i interface{}) error {
////////////////////////////////////////////
const (
gettyPackageMagic = 0x20160905
maxPackageLen = 1024 * 1024
gettyPackageMagic = 0x20160905
maxPackageLen = 1024 * 1024
rpcPackagePlaceholderLen = 2
)
var (
......@@ -220,7 +221,7 @@ func (p *GettyPackage) Marshal() (*bytes.Buffer, error) {
func (p *GettyPackage) Unmarshal(buf *bytes.Buffer) (int, error) {
var err error
if buf.Len() < 2+gettyPackageHeaderLen {
if buf.Len() < rpcPackagePlaceholderLen+gettyPackageHeaderLen {
return 0, ErrNotEnoughStream
}
var packLen uint16
......@@ -244,7 +245,7 @@ func (p *GettyPackage) Unmarshal(buf *bytes.Buffer) (int, error) {
return 0, ErrIllegalMagic
}
if int(packLen) > gettyPackageHeaderLen {
if int(packLen) > rpcPackagePlaceholderLen+gettyPackageHeaderLen {
if err := p.B.Unmarshal(p.H.CodecType, bytes.NewBuffer(buf.Next(int(packLen)-gettyPackageHeaderLen))); err != nil {
return 0, jerrors.Trace(err)
}
......
......@@ -11,6 +11,7 @@ import (
func main() {
log.LoadConfiguration("client_log.xml")
client := rpc.NewClient("client_config.toml")
// client.SetCodecType(rpc.ProtoBuffer)//默认是json序列化
defer client.Close()
for i := 0; i < 100; i++ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment