Add support for IPv6 packet

Signed-off-by: wenyingd <[email protected]>
joyent · Jul 2, 2020 · f1a5f0e · f1a5f0e
1 parent 3a6722c
commit f1a5f0e
Show file tree

Hide file tree

Showing 4 changed files with 692 additions and 5 deletions.
diff --git a/protocol/icmp.go b/protocol/icmp.go
@@ -33,14 +33,13 @@ func (i *ICMP) MarshalBinary() (data []byte, err error) {
 
 func (i *ICMP) UnmarshalBinary(data []byte) error {
 	if len(data) < 4 {
-		return errors.New("The []byte is too short to unmarshal a full ARP message.")
+		return errors.New("The []byte is too short to unmarshal a full ICMP message.")
 	}
 	i.Type = data[0]
 	i.Code = data[1]
 	i.Checksum = binary.BigEndian.Uint16(data[2:4])
 
-	for n := range data[4:] {
-		i.Data = append(i.Data, data[n])
-	}
+	i.Data = make([]byte, len(data)-4)
+	copy(i.Data, data[4:])
 	return nil
 }
diff --git a/protocol/ip.go b/protocol/ip.go
@@ -135,7 +135,10 @@ func (i *IPv4) UnmarshalBinary(data []byte) error {
 	i.NWDst = data[n : n+4]
 	n += 4
 
-	i.Options.UnmarshalBinary(data[n:int(i.IHL*4)])
+	err := i.Options.UnmarshalBinary(data[n:int(i.IHL*4)])
+	if err != nil {
+		return err
+	}
 	n += int(i.IHL*4) - n
 
 	switch i.Protocol {