generate/generate.go

@@ -221,7 +221,7 @@ func (this *Protocol) unmarshalMessage(out io.Writer, message Message) error {
 	fmt.Fprintf(out, "\t}\n")
 	if requiredTotal > 0 {
 		fmt.Fprintf(out,
-			"\tif foundRequired != %d { return hopp.ErrTablePairMissing }\n",
+			"\tif foundRequired != %d { return hopp.ErrPairMissing }\n",
 			requiredTotal)
 	}
 	fmt.Fprintf(out, "\treturn nil\n")

message.go

@@ -50,3 +50,15 @@ func (this *MessageData) UnmarshalBinary(buffer []byte) error {
 	}
 	return nil
 }
+
+// Protocol maps methods to functions that create messages. The messages must be
+// passed by reference, and the functions must return a new object every time.
+type Protocol map[uint16] func() Message
+
+// Add adds messages to the protocol. Messages with conflicting methods will
+// be replaced.
+func (this Protocol) Add(messages ...func() Message) {
+	for _, message := range messages {
+		this[message().Method()] = message
+	}
+}