change raw handler

tangeping · Sep 6, 2016 · e2fc311 · e2fc311
1 parent 308dca4
commit e2fc311
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/network/json/json.go b/network/json/json.go
@@ -84,12 +84,7 @@ func (p *Processor) SetHandler(msg interface{}, msgHandler MsgHandler) {
 }
 
 // It's dangerous to call the method on routing or marshaling (unmarshaling)
-func (p *Processor) SetRawHandler(msg interface{}, msgRawHandler MsgHandler) {
-	msgType := reflect.TypeOf(msg)
-	if msgType == nil || msgType.Kind() != reflect.Ptr {
-		log.Fatal("json message pointer required")
-	}
-	msgID := msgType.Elem().Name()
+func (p *Processor) SetRawHandler(msgID string, msgRawHandler MsgHandler) {
 	i, ok := p.msgInfo[msgID]
 	if !ok {
 		log.Fatal("message %v not registered", msgID)

diff --git a/network/protobuf/protobuf.go b/network/protobuf/protobuf.go
@@ -90,11 +90,9 @@ func (p *Processor) SetHandler(msg proto.Message, msgHandler MsgHandler) {
 }
 
 // It's dangerous to call the method on routing or marshaling (unmarshaling)
-func (p *Processor) SetRawHandler(msg proto.Message, msgRawHandler MsgHandler) {
-	msgType := reflect.TypeOf(msg)
-	id, ok := p.msgID[msgType]
-	if !ok {
-		log.Fatal("message %s not registered", msgType)
+func (p *Processor) SetRawHandler(id uint16, msgRawHandler MsgHandler) {
+	if id >= uint16(len(p.msgInfo)) {
+		log.Fatal("message id %v not registered", id)
 	}
 
 	p.msgInfo[id].msgRawHandler = msgRawHandler