Merge branch 'master' into dhcpv4-moar-tests

1 files changed, 3 insertions, 3 deletions

diff --git a/dhcpv6/dhcpv6relay.go b/dhcpv6/dhcpv6relay.go
index 1bde354..d9555cb 100644
--- a/dhcpv6/dhcpv6relay.go
+++ b/dhcpv6/dhcpv6relay.go
@@ -173,7 +173,7 @@ func NewRelayReplFromRelayForw(relayForw, msg DHCPv6) (DHCPv6, error) {
 	if !ok {
 		return nil, errors.New("Not a DHCPv6Relay")
 	}
-	if relay.Type() != RELAY_FORW {
+	if relay.Type() != MessageTypeRelayForward {
 		return nil, errors.New("The passed packet is not of type RELAY_FORW")
 	}
 	if msg == nil {
@@ -185,7 +185,7 @@ func NewRelayReplFromRelayForw(relayForw, msg DHCPv6) (DHCPv6, error) {
 	for {
 		linkAddr = append(linkAddr, relay.LinkAddr())
 		peerAddr = append(peerAddr, relay.PeerAddr())
-		optiids = append(optiids, relay.GetOneOption(OPTION_INTERFACE_ID))
+		optiids = append(optiids, relay.GetOneOption(OptionInterfaceID))
 		decap, err := DecapsulateRelay(relay)
 		if err != nil {
 			return nil, err
@@ -197,7 +197,7 @@ func NewRelayReplFromRelayForw(relayForw, msg DHCPv6) (DHCPv6, error) {
 		}
 	}
 	for i := len(linkAddr) - 1; i >= 0; i-- {
-		msg, err = EncapsulateRelay(msg, RELAY_REPL, linkAddr[i], peerAddr[i])
+		msg, err = EncapsulateRelay(msg, MessageTypeRelayReply, linkAddr[i], peerAddr[i])
 		if opt := optiids[i]; opt != nil {
 			msg.AddOption(opt)
 		}