From 1449b057912a5671ea3b73574565b4ed45f69329 Mon Sep 17 00:00:00 2001
From: Pablo Mazzini <pmazzini@fb.com>
Date: Tue, 12 Jun 2018 01:34:53 -0700
Subject: [PATCH] use functions from the dhcp library

Summary: use IsNetboot function from the dhcp library

Reviewed By: insomniacslk

Differential Revision: D8355501

fbshipit-source-id: cf96455a18c083bc1f7a4124a59913a9ab06dbf3
---
 lib/handler.go | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/handler.go b/lib/handler.go
index d35a5b7..8cf1e4f 100644
--- a/lib/handler.go
+++ b/lib/handler.go
@@ -279,11 +279,11 @@ func (s *serverImpl) handleRawPacketV6(buffer []byte, peer *net.UDPAddr) {
 	}
 
 	if s.server {
-		err = s.logger.LogSuccess(start, nil, packet.ToBytes(), peer)
-		if err != nil {
-			glog.Errorf("Failed to log incoming packet: %s", err)
-		}
 		reply, err := s.config.Handler.ServeDHCPv6(packet)
+		logErr := s.logger.LogSuccess(start, nil, packet.ToBytes(), peer)
+		if logErr != nil {
+			glog.Errorf("Failed to log incoming packet: %s", logErr)
+		}
 		if err != nil {
 			glog.Errorf("Error creating reply %s", err)
 			s.logger.LogErr(start, nil, packet.ToBytes(), peer, ErrServe, err)
@@ -347,16 +347,7 @@ func (s *serverImpl) handleRawPacketV6(buffer []byte, peer *net.UDPAddr) {
 		}
 	}
 	message.Mac = mac
-
-	optoro := msg.GetOneOption(dhcpv6.OPTION_ORO)
-	if optoro != nil {
-		for _, o := range optoro.(*dhcpv6.OptRequestedOption).RequestedOptions() {
-			if o == dhcpv6.OPT_BOOTFILE_URL {
-				message.NetBoot = true
-				break
-			}
-		}
-	}
+	message.NetBoot = dhcpv6.IsNetboot(msg)
 
 	server, err := selectDestinationServer(s.config, &message)
 	if err != nil {