From 782ff7524ce2fce9b098ad72c020a489735557a1 Mon Sep 17 00:00:00 2001 From: Pablo Mazzini Date: Fri, 3 Aug 2018 11:21:52 +0200 Subject: NewRequestFromOffer: update client --- dhcpv4/client.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'dhcpv4/client.go') diff --git a/dhcpv4/client.go b/dhcpv4/client.go index db7e71a..36ff60b 100644 --- a/dhcpv4/client.go +++ b/dhcpv4/client.go @@ -124,8 +124,8 @@ func MakeListeningSocket(ifname string) (int, error) { // ordered as Discovery, Offer, Request and Acknowledge. In case of errors, an // error is returned, and the list of DHCPv4 objects will be shorted than 4, // containing all the sent and received DHCPv4 messages. -func (c *Client) Exchange(ifname string, discover *DHCPv4, modifiers ...Modifier) ([]DHCPv4, error) { - conversation := make([]DHCPv4, 1) +func (c *Client) Exchange(ifname string, discover *DHCPv4, modifiers ...Modifier) ([]*DHCPv4, error) { + conversation := make([]*DHCPv4, 1) var err error // Get our file descriptor for the broadcast socket. @@ -155,21 +155,21 @@ func (c *Client) Exchange(ifname string, discover *DHCPv4, modifiers ...Modifier if err != nil { return conversation, err } - conversation = append(conversation, *offer) + conversation = append(conversation, offer) // Request - request, err := RequestFromOffer(*offer, modifiers...) + request, err := NewRequestFromOffer(offer, modifiers...) if err != nil { return conversation, err } - conversation = append(conversation, *request) + conversation = append(conversation, request) // Ack ack, err := BroadcastSendReceive(sfd, rfd, request, c.ReadTimeout, c.WriteTimeout, MessageTypeAck) if err != nil { return conversation, err } - conversation = append(conversation, *ack) + conversation = append(conversation, ack) return conversation, nil } -- cgit v1.2.3 From ba823f457ef09139f01168013de529ede7caf76b Mon Sep 17 00:00:00 2001 From: Pablo Mazzini Date: Fri, 3 Aug 2018 11:30:07 +0200 Subject: NewRequestFromOffer: update client --- dhcpv4/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dhcpv4/client.go') diff --git a/dhcpv4/client.go b/dhcpv4/client.go index 36ff60b..9fd8501 100644 --- a/dhcpv4/client.go +++ b/dhcpv4/client.go @@ -148,7 +148,7 @@ func (c *Client) Exchange(ifname string, discover *DHCPv4, modifiers ...Modifier for _, mod := range modifiers { discover = mod(discover) } - conversation[0] = *discover + conversation[0] = discover // Offer offer, err := BroadcastSendReceive(sfd, rfd, discover, c.ReadTimeout, c.WriteTimeout, MessageTypeOffer) -- cgit v1.2.3