summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--dhcpv4/option_tftp_server_name.go2
-rw-r--r--dhcpv4/server.go1
-rw-r--r--dhcpv4/types.go2
-rw-r--r--dhcpv6/iputils_test.go2
-rw-r--r--dhcpv6/option_vendor_opts.go2
-rw-r--r--dhcpv6/server.go1
6 files changed, 4 insertions, 6 deletions
diff --git a/dhcpv4/option_tftp_server_name.go b/dhcpv4/option_tftp_server_name.go
index 19dde21..3a310f9 100644
--- a/dhcpv4/option_tftp_server_name.go
+++ b/dhcpv4/option_tftp_server_name.go
@@ -31,7 +31,7 @@ func (op *OptTFTPServerName) String() string {
return fmt.Sprintf("TFTP Server Name -> %s", op.TFTPServerName)
}
-// ParseOptTFTPServerName returns a new OptTFTPServerName fomr a byte stream or error if any
+// ParseOptTFTPServerName returns a new OptTFTPServerName from a byte stream or error if any
func ParseOptTFTPServerName(data []byte) (*OptTFTPServerName, error) {
if len(data) < 3 {
return nil, ErrShortByteStream
diff --git a/dhcpv4/server.go b/dhcpv4/server.go
index 8008769..eed82cf 100644
--- a/dhcpv4/server.go
+++ b/dhcpv4/server.go
@@ -136,7 +136,6 @@ func (s *Server) ActivateAndServe() error {
}
go s.Handler(pc, peer, m)
}
- return nil
}
// Close sends a termination request to the server, and closes the UDP listener
diff --git a/dhcpv4/types.go b/dhcpv4/types.go
index 1c0f388..5919275 100644
--- a/dhcpv4/types.go
+++ b/dhcpv4/types.go
@@ -9,7 +9,7 @@ type MessageType byte
// DHCP message types
const (
// MessageTypeNone is not a real message type, it is used by certain
- // functions to signal that no explict message type is requested
+ // functions to signal that no explicit message type is requested
MessageTypeNone MessageType = 0
MessageTypeDiscover MessageType = 1
MessageTypeOffer MessageType = 2
diff --git a/dhcpv6/iputils_test.go b/dhcpv6/iputils_test.go
index faa13a8..02ee2d6 100644
--- a/dhcpv6/iputils_test.go
+++ b/dhcpv6/iputils_test.go
@@ -52,7 +52,7 @@ func (s *MatchingAddressTestSuite) SetupTest() {
}
func (s *MatchingAddressTestSuite) TestGetMatchingAddr() {
- // Check if error from InterfaceAddresses immidately returns error
+ // Check if error from InterfaceAddresses immediately returns error
s.m.On("InterfaceAddresses", "eth0").Return(nil, ErrDummy).Once()
_, err := getMatchingAddr("eth0", s.Match)
s.Assert().Equal(ErrDummy, err)
diff --git a/dhcpv6/option_vendor_opts.go b/dhcpv6/option_vendor_opts.go
index a2281e3..de35141 100644
--- a/dhcpv6/option_vendor_opts.go
+++ b/dhcpv6/option_vendor_opts.go
@@ -90,7 +90,7 @@ func ParseOptVendorOpts(data []byte) (*OptVendorOpts, error) {
}
// vendParseOption builds a GenericOption from a slice of bytes
-// We cannot use the exisitng ParseOption function in options.go because the
+// We cannot use the existing ParseOption function in options.go because the
// sub-options include codes specific to each vendor. There are overlaps in these
// codes with RFC standard codes.
func vendParseOption(dataStart []byte) (Option, error) {
diff --git a/dhcpv6/server.go b/dhcpv6/server.go
index 8996bfb..daefdd0 100644
--- a/dhcpv6/server.go
+++ b/dhcpv6/server.go
@@ -136,7 +136,6 @@ func (s *Server) ActivateAndServe() error {
}
go s.Handler(pc, peer, m)
}
- return nil
}
// Close sends a termination request to the server, and closes the UDP listener