Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dhcpv4: Add opt function for NetBIOS Name Servers #553

Merged
merged 2 commits into from
Dec 24, 2024
Merged

dhcpv4: Add opt function for NetBIOS Name Servers #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d1ecea
dhcpv4: Add Opt function for NetBIOS Name Servers
nikitakosatka Dec 23, 2024
a2d2050
Remove backward incompatible change
nikitakosatka Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dhcpv4/dhcpv4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,13 @@ func (d *DHCPv4) NTPServers() []net.IP {
return GetIPs(OptionNTPServers, d.Options)
}

// NetBIOSNameServers parses the DHCPv4 NetBIOS Name Servers option if present.
//
// The NetBIOS over TCP/IP Name Server option is described by RFC 2132, Section 8.5.
func (d *DHCPv4) NetBIOSNameServers() []net.IP {
return GetIPs(OptionNetBIOSOverTCPIPNameServer, d.Options)
}

// DNS parses the DHCPv4 Domain Name Server option if present.
//
// The DNS server option is described by RFC 2132, Section 3.8.
Expand Down
10 changes: 10 additions & 0 deletions dhcpv4/option_ips.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@ func OptNTPServers(ntpServers ...net.IP) Option {
}
}

// OptNetBIOSNameServers returns a new DHCPv4 NetBIOS Name Server option.
//
// The NetBIOS over TCP/IP Name Server option is described by RFC 2132, Section 8.5.
func OptNetBIOSNameServers(netBIOSNameServers ...net.IP) Option {
return Option{
Code: OptionNetBIOSOverTCPIPNameServer,
Value: IPs(netBIOSNameServers),
}
}

// OptDNS returns a new DHCPv4 Domain Name Server option.
//
// The DNS server option is described by RFC 2132, Section 3.8.
Expand Down
19 changes: 19 additions & 0 deletions dhcpv4/option_ips_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,25 @@ func TestGetNTPServers(t *testing.T) {
require.Nil(t, m.NTPServers())
}

func TestOptNetBIOSNameServers(t *testing.T) {
o := OptNetBIOSNameServers(net.IPv4(192, 168, 0, 1), net.IPv4(192, 168, 0, 10))
require.Equal(t, OptionNetBIOSOverTCPIPNameServer, o.Code)
require.Equal(t, []byte{192, 168, 0, 1, 192, 168, 0, 10}, o.Value.ToBytes())
require.Equal(t, "NetBIOS over TCP/IP Name Server: 192.168.0.1, 192.168.0.10", o.String())
}

func TestGetNetBIOSNameServers(t *testing.T) {
ips := []net.IP{
net.IP{192, 168, 0, 1},
net.IP{192, 168, 0, 10},
}
m, _ := New(WithOption(OptNetBIOSNameServers(ips...)))
require.Equal(t, ips, m.NetBIOSNameServers())

m, _ = New()
require.Nil(t, m.NetBIOSNameServers())
}

func TestOptRouter(t *testing.T) {
o := OptRouter(net.IPv4(192, 168, 0, 1), net.IPv4(192, 168, 0, 10))
require.Equal(t, OptionRouter, o.Code)
Expand Down
Loading