diff options
| author | Pablo Mazzini <pmazzini@gmail.com> | 2019-01-28 11:34:41 +0000 |
|---|---|---|
| committer | insomniac <insomniacslk@users.noreply.github.com> | 2019-01-28 13:41:06 +0000 |
| commit | 793c0f67c0a9a2b178bfe98223fd2bfc92a115f3 (patch) | |
| tree | 8b33c00f78359c6ed64e390657962f719ee59ea9 | |
| parent | 89df4777a1687cf4d796afc91b30fa0beee7506d (diff) | |
[dhcpv4] move default to main directory
| -rw-r--r-- | dhcpv4/client4/client.go | 10 | ||||
| -rw-r--r-- | dhcpv4/defaults.go (renamed from dhcpv4/client4/defaults.go) | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dhcpv4/client4/client.go b/dhcpv4/client4/client.go index fca9c09..85d6152 100644 --- a/dhcpv4/client4/client.go +++ b/dhcpv4/client4/client.go @@ -113,7 +113,7 @@ func MakeBroadcastSocket(ifname string) (int, error) { // MakeListeningSocket creates a listening socket on 0.0.0.0 for the DHCP client // port and returns it. func MakeListeningSocket(ifname string) (int, error) { - return makeListeningSocketWithCustomPort(ifname, ClientPort) + return makeListeningSocketWithCustomPort(ifname, dhcpv4.ClientPort) } func htons(v uint16) uint16 { @@ -157,7 +157,7 @@ func toUDPAddr(addr net.Addr, defaultAddr *net.UDPAddr) (*net.UDPAddr, error) { } func (c *Client) getLocalUDPAddr() (*net.UDPAddr, error) { - defaultLocalAddr := &net.UDPAddr{IP: net.IPv4zero, Port: ClientPort} + defaultLocalAddr := &net.UDPAddr{IP: net.IPv4zero, Port: dhcpv4.ClientPort} laddr, err := toUDPAddr(c.LocalAddr, defaultLocalAddr) if err != nil { return nil, fmt.Errorf("Invalid local address: %s", err) @@ -166,7 +166,7 @@ func (c *Client) getLocalUDPAddr() (*net.UDPAddr, error) { } func (c *Client) getRemoteUDPAddr() (*net.UDPAddr, error) { - defaultRemoteAddr := &net.UDPAddr{IP: net.IPv4bcast, Port: ServerPort} + defaultRemoteAddr := &net.UDPAddr{IP: net.IPv4bcast, Port: dhcpv4.ServerPort} raddr, err := toUDPAddr(c.RemoteAddr, defaultRemoteAddr) if err != nil { return nil, fmt.Errorf("Invalid remote address: %s", err) @@ -304,7 +304,7 @@ func (c *Client) SendReceive(sendFd, recvFd int, packet *dhcpv4.DHCPv4, messageT udph := buf[iph.Len:n] // check source and destination ports srcPort := int(binary.BigEndian.Uint16(udph[0:2])) - expectedSrcPort := ServerPort + expectedSrcPort := dhcpv4.ServerPort if c.RemoteAddr != nil { expectedSrcPort = c.RemoteAddr.(*net.UDPAddr).Port } @@ -312,7 +312,7 @@ func (c *Client) SendReceive(sendFd, recvFd int, packet *dhcpv4.DHCPv4, messageT continue } dstPort := int(binary.BigEndian.Uint16(udph[2:4])) - expectedDstPort := ClientPort + expectedDstPort := dhcpv4.ClientPort if c.RemoteAddr != nil { expectedDstPort = c.LocalAddr.(*net.UDPAddr).Port } diff --git a/dhcpv4/client4/defaults.go b/dhcpv4/defaults.go index f2e31f3..4faec2c 100644 --- a/dhcpv4/client4/defaults.go +++ b/dhcpv4/defaults.go @@ -1,4 +1,4 @@ -package client4 +package dhcpv4 const ( ServerPort = 67 |