2 files changed, 67 insertions, 0 deletions
diff --git a/dhcpv6/option_remoteid.go b/dhcpv6/option_remoteid.go
new file mode 100644
index 0000000..5d1b6db
--- /dev/null
+++ b/dhcpv6/option_remoteid.go
@@ -0,0 +1,65 @@
+package dhcpv6
+
+// This module defines the OptRemoteId structure.
+// https://www.ietf.org/rfc/rfc4649.txt
+
+import (
+	"encoding/binary"
+	"fmt"
+)
+
+type OptRemoteId struct {
+	enterpriseNumber uint32
+	remoteId         []byte
+}
+
+func (op *OptRemoteId) Code() OptionCode {
+	return OPTION_REMOTE_ID
+}
+
+func (op *OptRemoteId) ToBytes() []byte {
+	buf := make([]byte, 8)
+	binary.BigEndian.PutUint16(buf[0:2], uint16(OPTION_REMOTE_ID))
+	binary.BigEndian.PutUint16(buf[2:4], 2)
+	binary.BigEndian.PutUint32(buf[4:8], uint32(op.enterpriseNumber))
+	buf = append(buf, op.remoteId...)
+	return buf
+}
+
+func (op *OptRemoteId) EnterpriseNumber() uint32 {
+	return op.enterpriseNumber
+}
+
+func (op *OptRemoteId) SetEnterpriseNumber(enterpriseNumber uint32) {
+	op.enterpriseNumber = enterpriseNumber
+}
+
+func (op *OptRemoteId) RemoteID() []byte {
+	return op.remoteId
+}
+
+func (op *OptRemoteId) SetRemoteID(remoteId []byte) {
+	op.remoteId = append([]byte(nil), remoteId...)
+}
+
+func (op *OptRemoteId) Length() int {
+	return 4 + len(op.remoteId)
+}
+
+func (op *OptRemoteId) String() string {
+	return fmt.Sprintf("OptRemoteId{enterprisenum=%v, remoteid=%v}",
+		op.enterpriseNumber, op.remoteId,
+	)
+}
+
+// build an OptRemoteId structure from a sequence of bytes.
+// The input data does not include option code and length bytes.
+func ParseOptRemoteId(data []byte) (*OptRemoteId, error) {
+	opt := OptRemoteId{}
+	if len(data) < 4 {
+		return nil, fmt.Errorf("Invalid remote id data length. Expected at least 4 bytes, got %v", len(data))
+	}
+	opt.enterpriseNumber = binary.BigEndian.Uint32(data[:4])
+	opt.remoteId = append([]byte(nil), data[4:]...)
+	return &opt, nil
+}
diff --git a/dhcpv6/options.go b/dhcpv6/options.go
index bb80791..d5d299f 100644
--- a/dhcpv6/options.go
+++ b/dhcpv6/options.go
@@ -90,6 +90,8 @@ func ParseOption(dataStart []byte) (Option, error) {
 		opt, err = ParseOptStatusCode(optData)
 	case OPTION_RELAY_MSG:
 		opt, err = ParseOptRelayMsg(optData)
+	case OPTION_REMOTE_ID:
+		opt, err = ParseOptRemoteId(optData)
 	default:
 		opt = &OptionGeneric{OptionCode: code, OptionData: optData}
 	}