diff options
author | Christopher Koch <chrisko@google.com> | 2019-02-28 14:48:54 -0800 |
---|---|---|
committer | insomniac <insomniacslk@users.noreply.github.com> | 2019-03-11 21:54:10 -0700 |
commit | afbaa1460f929a04c6e198b387174e70f0f9c903 (patch) | |
tree | 6f631e1afc4bd4be5db90cd7d34cb48a82ec6786 /dhcpv6/client6 | |
parent | 38f805ad06e71972953004e9472e43c175ba299c (diff) |
dhcpv6: remove setters and getters.
- Make members directly accessible.
Diffstat (limited to 'dhcpv6/client6')
-rw-r--r-- | dhcpv6/client6/client.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dhcpv6/client6/client.go b/dhcpv6/client6/client.go index c5b522d..3ede17e 100644 --- a/dhcpv6/client6/client.go +++ b/dhcpv6/client6/client.go @@ -65,7 +65,7 @@ func (c *Client) Exchange(ifname string, modifiers ...dhcpv6.Modifier) ([]dhcpv6 return conversation, err } } - request, reply, err := c.Request(ifname, advertise, modifiers...) + request, reply, err := c.Request(ifname, advertise.(*dhcpv6.Message), modifiers...) if request != nil { conversation = append(conversation, request) } @@ -172,7 +172,7 @@ func (c *Client) sendReceive(ifname string, packet dhcpv6.DHCPv6, expectedType d // if a regular message, check the transaction ID first // XXX should this unpack relay messages and check the XID of the // inner packet too? - if msg.TransactionID() != recvMsg.TransactionID() { + if msg.TransactionID != recvMsg.TransactionID { // different XID, we don't want this packet for sure continue } @@ -196,7 +196,7 @@ func (c *Client) Solicit(ifname string, modifiers ...dhcpv6.Modifier) (dhcpv6.DH return nil, nil, err } for _, mod := range modifiers { - solicit = mod(solicit) + mod(solicit) } advertise, err := c.sendReceive(ifname, solicit, dhcpv6.MessageTypeNone) return solicit, advertise, err @@ -205,13 +205,13 @@ func (c *Client) Solicit(ifname string, modifiers ...dhcpv6.Modifier) (dhcpv6.DH // Request sends a Request built from an Advertise. It returns the Request, a // Reply (if not nil), and an error if any. The modifiers will be applied to // the Request before sending it, see modifiers.go -func (c *Client) Request(ifname string, advertise dhcpv6.DHCPv6, modifiers ...dhcpv6.Modifier) (dhcpv6.DHCPv6, dhcpv6.DHCPv6, error) { +func (c *Client) Request(ifname string, advertise *dhcpv6.Message, modifiers ...dhcpv6.Modifier) (dhcpv6.DHCPv6, dhcpv6.DHCPv6, error) { request, err := dhcpv6.NewRequestFromAdvertise(advertise) if err != nil { return nil, nil, err } for _, mod := range modifiers { - request = mod(request) + mod(request) } reply, err := c.sendReceive(ifname, request, dhcpv6.MessageTypeNone) return request, reply, err |