mirrors/netboot
1
0
Fork 0
mirror of https://github.com/danderson/netboot.git synced 2025-10-16 18:11:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged MakeMsgReplyWithNoAddrsAvailable and MakeMsgReply methods

Browse Source
This commit is contained in:
Dmitri Dolguikh 2017-10-30 12:14:45 -07:00 committed by Dave Anderson
parent c0ce892172
commit 794097f861
2 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dhcp6/packet_builder.go
View File

@ -38,12 +38,8 @@ func (b *PacketBuilder) BuildResponse(in *Packet) (*Packet, error) {
return nil, err return nil, err
} }
associations, err := b.Addresses.ReserveAddresses(in.Options.ClientId(), in.Options.IaNaIds()) associations, err := b.Addresses.ReserveAddresses(in.Options.ClientId(), in.Options.IaNaIds())
if err != nil {
return b.MakeMsgReplyWithNoAddrsAvailable(in.TransactionID, in.Options.ClientId(),
in.Options.ClientArchType(), associations, iasWithoutAddesses(associations, in.Options.IaNaIds()), bootFileUrl, err), err
}
return b.MakeMsgReply(in.TransactionID, in.Options.ClientId(), return b.MakeMsgReply(in.TransactionID, in.Options.ClientId(),
in.Options.ClientArchType(), associations, bootFileUrl), nil in.Options.ClientArchType(), associations, iasWithoutAddesses(associations, in.Options.IaNaIds()), bootFileUrl, err), err
case MsgInformationRequest: case MsgInformationRequest:
bootFileUrl, err := b.Configuration.GetBootUrl(b.ExtractLLAddressOrId(in.Options.ClientId()), in.Options.ClientArchType()) bootFileUrl, err := b.Configuration.GetBootUrl(b.ExtractLLAddressOrId(in.Options.ClientId()), in.Options.ClientArchType())
if err != nil { if err != nil {
@ -81,13 +77,17 @@ func (b *PacketBuilder) MakeMsgAdvertise(transactionId [3]byte, clientId []byte,
} }
func (b *PacketBuilder) MakeMsgReply(transactionId [3]byte, clientId []byte, clientArchType uint16, func (b *PacketBuilder) MakeMsgReply(transactionId [3]byte, clientId []byte, clientArchType uint16,
associations []*IdentityAssociation, bootFileUrl []byte) *Packet { associations []*IdentityAssociation, iasWithoutAddresses [][]byte, bootFileUrl []byte, err error) *Packet {
ret_options := make(Options) ret_options := make(Options)
ret_options.AddOption(MakeOption(OptClientId, clientId)) ret_options.AddOption(MakeOption(OptClientId, clientId))
for _, association := range(associations) { for _, association := range(associations) {
ret_options.AddOption(MakeIaNaOption(association.InterfaceId, b.calculateT1(), b.calculateT2(), ret_options.AddOption(MakeIaNaOption(association.InterfaceId, b.calculateT1(), b.calculateT2(),
MakeIaAddrOption(association.IpAddress, b.PreferredLifetime, b.ValidLifetime))) MakeIaAddrOption(association.IpAddress, b.PreferredLifetime, b.ValidLifetime)))
} }
for _, ia := range(iasWithoutAddresses) {
ret_options.AddOption(MakeIaNaOption(ia, b.calculateT1(), b.calculateT2(),
MakeStatusOption(2, err.Error())))
}
ret_options.AddOption(MakeOption(OptServerId, b.ServerDuid)) ret_options.AddOption(MakeOption(OptServerId, b.ServerDuid))
if 0x10 == clientArchType { // HTTPClient if 0x10 == clientArchType { // HTTPClient
ret_options.AddOption(MakeOption(OptVendorClass, []byte {0, 0, 0, 0, 0, 10, 72, 84, 84, 80, 67, 108, 105, 101, 110, 116})) // HTTPClient ret_options.AddOption(MakeOption(OptVendorClass, []byte {0, 0, 0, 0, 0, 10, 72, 84, 84, 80, 67, 108, 105, 101, 110, 116})) // HTTPClient
@ -130,27 +130,6 @@ func (b *PacketBuilder) MakeMsgAdvertiseWithNoAddrsAvailable(transactionId [3]by
return &Packet{Type: MsgAdvertise, TransactionID: transactionId, Options: ret_options} return &Packet{Type: MsgAdvertise, TransactionID: transactionId, Options: ret_options}
} }
func (b *PacketBuilder) MakeMsgReplyWithNoAddrsAvailable(transactionId [3]byte, clientId []byte, clientArchType uint16,
associations []*IdentityAssociation, iasWithoutAddresses [][]byte, bootFileUrl []byte, err error) *Packet {
ret_options := make(Options)
ret_options.AddOption(MakeOption(OptClientId, clientId))
for _, association := range(associations) {
ret_options.AddOption(MakeIaNaOption(association.InterfaceId, b.calculateT1(), b.calculateT2(),
MakeIaAddrOption(association.IpAddress, b.PreferredLifetime, b.ValidLifetime)))
}
for _, ia := range(iasWithoutAddresses) {
ret_options.AddOption(MakeIaNaOption(ia, b.calculateT1(), b.calculateT2(),
MakeStatusOption(2, err.Error())))
}
ret_options.AddOption(MakeOption(OptServerId, b.ServerDuid))
if 0x10 == clientArchType { // HTTPClient
ret_options.AddOption(MakeOption(OptVendorClass, []byte {0, 0, 0, 0, 0, 10, 72, 84, 84, 80, 67, 108, 105, 101, 110, 116})) // HTTPClient
}
ret_options.AddOption(MakeOption(OptBootfileUrl, bootFileUrl))
return &Packet{Type: MsgReply, TransactionID: transactionId, Options: ret_options}
}
func (b *PacketBuilder) calculateT1() uint32 { func (b *PacketBuilder) calculateT1() uint32 {
return b.PreferredLifetime / 2 return b.PreferredLifetime / 2
} }

9
dhcp6/packet_builder_test.go
View File

@ -168,7 +168,7 @@ func TestMakeMsgReply(t *testing.T) {
NewRandomAddressPool(net.ParseIP("2001:db8:f00f:cafe::1"), 1, 100)) NewRandomAddressPool(net.ParseIP("2001:db8:f00f:cafe::1"), 1, 100))
msg := builder.MakeMsgReply(transactionId, expectedClientId, 0x11, []*IdentityAssociation{identityAssociation}, msg := builder.MakeMsgReply(transactionId, expectedClientId, 0x11, []*IdentityAssociation{identityAssociation},
expectedBootFileUrl) make([][]byte, 0), expectedBootFileUrl, nil)
if msg.Type != MsgReply { if msg.Type != MsgReply {
t.Fatalf("Expected message type %d, got %d", MsgAdvertise, msg.Type) t.Fatalf("Expected message type %d, got %d", MsgAdvertise, msg.Type)
@ -224,8 +224,9 @@ func TestMakeMsgReplyWithHttpClientArch(t *testing.T) {
builder := MakePacketBuilder(expectedServerId, 90, 100, nil, builder := MakePacketBuilder(expectedServerId, 90, 100, nil,
NewRandomAddressPool(net.ParseIP("2001:db8:f00f:cafe::1"), 1, 100)) NewRandomAddressPool(net.ParseIP("2001:db8:f00f:cafe::1"), 1, 100))
msg := builder.MakeMsgReply(transactionId, expectedClientId, 0x10, []*IdentityAssociation{identityAssociation}, msg := builder.MakeMsgReply(transactionId, expectedClientId, 0x10,
expectedBootFileUrl) []*IdentityAssociation{identityAssociation}, make([][]byte, 0),
expectedBootFileUrl, nil)
vendorClassOption := msg.Options[OptVendorClass] vendorClassOption := msg.Options[OptVendorClass]
if vendorClassOption == nil { if vendorClassOption == nil {
@ -253,7 +254,7 @@ func TestMakeMsgReplyWithNoAddrsAvailable(t *testing.T) {
builder := MakePacketBuilder(expectedServerId, 90, 100, nil, builder := MakePacketBuilder(expectedServerId, 90, 100, nil,
NewRandomAddressPool(net.ParseIP("2001:db8:f00f:cafe::1"), 1, 100)) NewRandomAddressPool(net.ParseIP("2001:db8:f00f:cafe::1"), 1, 100))
msg := builder.MakeMsgReplyWithNoAddrsAvailable(transactionId, expectedClientId, 0x10, msg := builder.MakeMsgReply(transactionId, expectedClientId, 0x10,
[]*IdentityAssociation{identityAssociation}, [][]byte{[]byte("id-2")}, expectedBootFileUrl, []*IdentityAssociation{identityAssociation}, [][]byte{[]byte("id-2")}, expectedBootFileUrl,
fmt.Errorf(expectedErrorMessage)) fmt.Errorf(expectedErrorMessage))