commit 756a927b61e23677c7d6e3d9d13fbf59930aba8f · seiso.moe/magna

+7 -11

domain_name.go

···

       66
       66
        
       }

     

       67
       67
        
       

     

       68
       68
        
       // encode_domain returns the bytes of the input bytes appened with the encoded domain name.

     

       69
       69
       -
       func encode_domain(bytes []byte, domain_name string, offsets *map[string]uint8) []byte {

     

       70
       70
       -
       	pos := uint8(len(bytes))

     

       69
       69
       +
       func encode_domain(bytes []byte, domain_name string, offsets *map[string]uint16) []byte {

     

       70
       70
       +
       	pos := uint16(len(bytes))

     

       71
       71
        
       

     

       72
       72
        
       	labels := strings.Split(domain_name, ".")

     

       73
       73
        
       	for i, label := range labels {

     

       74
       74
        
       		remaining_labels := strings.Join(labels[i:], ".")

     

       75
       75
        
       

     

       76
       76
        
       		if offset, found := (*offsets)[remaining_labels]; found {

     

       77
       77
       -
       			pointer := 0xC000 | uint16(offset)

     

       78
       78
       -
       			bytes = binary.BigEndian.AppendUint16(bytes, pointer)

     

       79
       79
       -
       

     

       80
       80
       -
       			return bytes

     

       77
       77
       +
       			pointer := 0xC000 | offset

     

       78
       78
       +
       			return binary.BigEndian.AppendUint16(bytes, pointer)

     

       81
       79
        
       		}

     

       82
       80
        
       

     

       81
       81
       +
       		(*offsets)[remaining_labels] = pos

     

       83
       82
        
       		bytes = append(bytes, uint8(len(label)))

     

       84
       83
        
       		bytes = append(bytes, []byte(label)...)

     

       85
       85
       -
       

     

       86
       86
       -
       		(*offsets)[remaining_labels] = pos

     

       87
       87
       -
       		pos += 1 + uint8(len(label))

     

       84
       84
       +
       		pos += 1 + uint16(len(label))

     

       88
       85
        
       	}

     

       89
       86
        
       

     

       90
       90
       -
       	bytes = append(bytes, 0)

     

       91
       91
       -
       	return bytes

     

       87
       87
       +
       	return append(bytes, 0)

     

       92
       88
        
       }

+11 -9

domain_test.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"testing"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/stretchr/testify/assert"

     

       5
       7
        
       )

     

       6
       8
        
       

     

       7
       9
        
       func TestDecodeDomain(t *testing.T) {

     
···

       10
       12
        
       	}

     

       11
       13
        
       

     

       12
       14
        
       	domain, offset, err := decode_domain(buf, 0)

     

       13
       13
       -
       	assert_eq(t, "com", domain)

     

       14
       14
       -
       	assert_eq(t, 5, offset)

     

       15
       15
       -
       	assert_no_error(t, err)

     

       15
       15
       +
       	assert.Equal(t, "com", domain)

     

       16
       16
       +
       	assert.Equal(t, 5, offset)

     

       17
       17
       +
       	assert.NoError(t, err)

     

       16
       18
        
       }

     

       17
       19
        
       

     

       18
       20
        
       func TestDecodeDomainWithCompression(t *testing.T) {

     
···

       21
       23
        
       	}

     

       22
       24
        
       

     

       23
       25
        
       	domain, offset, err := decode_domain(buf, 5)

     

       24
       24
       -
       	assert_eq(t, "c.com", domain)

     

       25
       25
       -
       	assert_eq(t, 9, offset)

     

       26
       26
       -
       	assert_no_error(t, err)

     

       26
       26
       +
       	assert.Equal(t, "c.com", domain)

     

       27
       27
       +
       	assert.Equal(t, 9, offset)

     

       28
       28
       +
       	assert.NoError(t, err)

     

       27
       29
        
       }

     

       28
       30
        
       

     

       29
       31
        
       func TestDecodeDomainWithCompressionLoop(t *testing.T) {

     
···

       32
       34
        
       	}

     

       33
       35
        
       

     

       34
       36
        
       	domain, offset, err := decode_domain(buf, 0)

     

       35
       35
       -
       	assert_eq(t, "", domain)

     

       36
       36
       -
       	assert_eq(t, 6, offset)

     

       37
       37
       -
       	assert_error(t, err)

     

       37
       37
       +
       	assert.Equal(t, "", domain)

     

       38
       38
       +
       	assert.Equal(t, 6, offset)

     

       39
       39
       +
       	assert.Error(t, err)

     

       38
       40
        
       }

     

       39
       41
        
       

     

       40
       42
        
       func FuzzDecodeDomain(f *testing.F) {

go.mod

···

       1
       1
        
       module code.kiri.systems/kiri/magna

     

       2
       2
        
       

     

       3
       3
        
       go 1.22.3

     

       4
       4
       +
       

     

       5
       5
       +
       require github.com/stretchr/testify v1.9.0

     

       6
       6
       +
       

     

       7
       7
       +
       require (

     

       8
       8
       +
       	github.com/davecgh/go-spew v1.1.1 // indirect

     

       9
       9
       +
       	github.com/pmezard/go-difflib v1.0.0 // indirect

     

       10
       10
       +
       	gopkg.in/yaml.v3 v3.0.1 // indirect

     

       11
       11
       +
       )

+17 -42

header_test.go

···

       1
       1
        
       package magna

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"reflect"

     

       5
       4
        
       	"testing"

     

       6
       6
       -
       )

     

       7
       5
        
       

     

       8
       8
       -
       func assert_eq(t *testing.T, expected any, actual any) {

     

       9
       9
       -
       	if reflect.TypeOf(expected) != reflect.TypeOf(actual) {

     

       10
       10
       -
       		t.Errorf("expected type: %T\t actual type: %T\n", expected, actual)

     

       11
       11
       -
       	}

     

       12
       12
       -
       

     

       13
       13
       -
       	if expected != actual {

     

       14
       14
       -
       		t.Fatalf("expected: %#v\t actual: %#v\n", expected, actual)

     

       15
       15
       -
       	}

     

       16
       16
       -
       }

     

       17
       17
       -
       

     

       18
       18
       -
       func assert_no_error(t *testing.T, err error) {

     

       19
       19
       -
       	if err != nil {

     

       20
       20
       -
       		t.Fatalf("err is not nil: %v\n", err)

     

       21
       21
       -
       	}

     

       22
       22
       -
       }

     

       23
       23
       -
       

     

       24
       24
       -
       func assert_error(t *testing.T, err error) {

     

       25
       25
       -
       	if err == nil {

     

       26
       26
       -
       		t.Fatalf("err is not nil: %v\n", err)

     

       27
       27
       -
       	}

     

       28
       28
       -
       }

     

       6
       6
       +
       	"github.com/stretchr/testify/assert"

     

       7
       7
       +
       )

     

       29
       8
        
       

     

       30
       9
        
       func TestHeaderDecode(t *testing.T) {

     

       31
       10
        
       	bytes := []byte{

     
···

       47
       26
        
       		t.Errorf("offset should be 12 not %v\n", offset)

     

       48
       27
        
       	}

     

       49
       28
        
       

     

       50
       50
       -
       	assert_eq(t, header.ID, uint16(258))

     

       51
       51
       -
       	assert_eq(t, header.QR, true)

     

       52
       52
       -
       	assert_eq(t, header.OPCode, OPCode(5))

     

       53
       53
       -
       	assert_eq(t, header.AA, false)

     

       54
       54
       -
       	assert_eq(t, header.TC, true)

     

       55
       55
       -
       	assert_eq(t, header.RD, false)

     

       56
       56
       -
       	assert_eq(t, header.RA, true)

     

       57
       57
       -
       	assert_eq(t, header.Z, uint8(0b010))

     

       58
       58
       -
       	assert_eq(t, header.RCode, RCode(0b1010))

     

       59
       59
       -
       	assert_eq(t, header.QDCount, uint16(1))

     

       60
       60
       -
       	assert_eq(t, header.ANCount, uint16(2))

     

       61
       61
       -
       	assert_eq(t, header.NSCount, uint16(3))

     

       62
       62
       -
       	assert_eq(t, header.ARCount, uint16(4))

     

       29
       29
       +
       	assert.Equal(t, header.ID, uint16(258))

     

       30
       30
       +
       	assert.Equal(t, header.QR, true)

     

       31
       31
       +
       	assert.Equal(t, header.OPCode, OPCode(5))

     

       32
       32
       +
       	assert.Equal(t, header.AA, false)

     

       33
       33
       +
       	assert.Equal(t, header.TC, true)

     

       34
       34
       +
       	assert.Equal(t, header.RD, false)

     

       35
       35
       +
       	assert.Equal(t, header.RA, true)

     

       36
       36
       +
       	assert.Equal(t, header.Z, uint8(0b010))

     

       37
       37
       +
       	assert.Equal(t, header.RCode, RCode(0b1010))

     

       38
       38
       +
       	assert.Equal(t, header.QDCount, uint16(1))

     

       39
       39
       +
       	assert.Equal(t, header.ANCount, uint16(2))

     

       40
       40
       +
       	assert.Equal(t, header.NSCount, uint16(3))

     

       41
       41
       +
       	assert.Equal(t, header.ARCount, uint16(4))

     

       63
       42
        
       }

     

       64
       43
        
       

     

       65
       44
        
       func TestHeaderEncode(t *testing.T) {

     
···

       74
       53
        
       

     

       75
       54
        
       	var header Header

     

       76
       55
        
       	_, err := header.Decode(bytes, 0)

     

       77
       77
       -
       	assert_no_error(t, err)

     

       56
       56
       +
       	assert.NoError(t, err)

     

       78
       57
        
       

     

       79
       58
        
       	actual := header.Encode()

     

       80
       80
       -
       	for i := 0; i < len(bytes); i++ {

     

       81
       81
       -
       		if bytes[i] != actual[i] {

     

       82
       82
       -
       			t.Fatal(bytes, actual)

     

       83
       83
       -
       		}

     

       84
       84
       -
       	}

     

       59
       59
       +
       	assert.Equal(t, bytes, actual)

     

       85
       60
        
       }

     

       86
       61
        
       

     

       87
       62
        
       func FuzzDecodeHeader(f *testing.F) {

+1 -1

message.go

···

       53
       53
        
       // Encode encodes a message to a DNS packet.

     

       54
       54
        
       // TODO: set truncation bit if over 512 and udp is protocol

     

       55
       55
        
       func (m *Message) Encode() []byte {

     

       56
       56
       -
       	m.offsets = make(map[string]uint8)

     

       56
       56
       +
       	m.offsets = make(map[string]uint16)

     

       57
       57
        
       	bytes := m.Header.Encode()

     

       58
       58
        
       

     

       59
       59
        
       	for _, question := range m.Question {

+74 -47

message_test.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"testing"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/stretchr/testify/assert"

     

       5
       7
        
       )

     

       6
       8
        
       

     

       7
       9
        
       func TestMessageDecode(t *testing.T) {

     
···

       14
       16
        
       

     

       15
       17
        
       	var msg Message

     

       16
       18
        
       	msg.Decode(bytes)

     

       17
       17
       -
       	assert_eq(t, uint16(0x8e19), msg.Header.ID)

     

       18
       18
       -
       	assert_eq(t, true, msg.Header.QR)

     

       19
       19
       -
       	assert_eq(t, OPCode(0), msg.Header.OPCode)

     

       20
       20
       -
       	assert_eq(t, false, msg.Header.AA)

     

       21
       21
       -
       	assert_eq(t, false, msg.Header.TC)

     

       22
       22
       -
       	assert_eq(t, true, msg.Header.RD)

     

       23
       23
       -
       	assert_eq(t, true, msg.Header.RA)

     

       24
       24
       -
       	assert_eq(t, uint8(0), msg.Header.Z)

     

       25
       25
       -
       	assert_eq(t, RCode(0), msg.Header.RCode)

     

       26
       26
       -
       	assert_eq(t, uint16(1), msg.Header.QDCount)

     

       27
       27
       -
       	assert_eq(t, uint16(1), msg.Header.ANCount)

     

       28
       28
       -
       	assert_eq(t, uint16(0), msg.Header.NSCount)

     

       29
       29
       -
       	assert_eq(t, uint16(0), msg.Header.ARCount)

     

       19
       19
       +
       	assert.Equal(t, uint16(0x8e19), msg.Header.ID)

     

       20
       20
       +
       	assert.Equal(t, true, msg.Header.QR)

     

       21
       21
       +
       	assert.Equal(t, OPCode(0), msg.Header.OPCode)

     

       22
       22
       +
       	assert.Equal(t, false, msg.Header.AA)

     

       23
       23
       +
       	assert.Equal(t, false, msg.Header.TC)

     

       24
       24
       +
       	assert.Equal(t, true, msg.Header.RD)

     

       25
       25
       +
       	assert.Equal(t, true, msg.Header.RA)

     

       26
       26
       +
       	assert.Equal(t, uint8(0), msg.Header.Z)

     

       27
       27
       +
       	assert.Equal(t, RCode(0), msg.Header.RCode)

     

       28
       28
       +
       	assert.Equal(t, uint16(1), msg.Header.QDCount)

     

       29
       29
       +
       	assert.Equal(t, uint16(1), msg.Header.ANCount)

     

       30
       30
       +
       	assert.Equal(t, uint16(0), msg.Header.NSCount)

     

       31
       31
       +
       	assert.Equal(t, uint16(0), msg.Header.ARCount)

     

       30
       32
        
       

     

       31
       31
       -
       	assert_eq(t, 1, len(msg.Question))

     

       33
       33
       +
       	assert.Equal(t, 1, len(msg.Question))

     

       32
       34
        
       

     

       33
       35
        
       	question := msg.Question[0]

     

       34
       34
       -
       	assert_eq(t, "news.ycombinator.com", question.QName)

     

       35
       35
       -
       	assert_eq(t, DNSType(1), question.QType)

     

       36
       36
       -
       	assert_eq(t, DNSClass(1), question.QClass)

     

       36
       36
       +
       	assert.Equal(t, "news.ycombinator.com", question.QName)

     

       37
       37
       +
       	assert.Equal(t, DNSType(1), question.QType)

     

       38
       38
       +
       	assert.Equal(t, DNSClass(1), question.QClass)

     

       37
       39
        
       

     

       38
       38
       -
       	assert_eq(t, 1, len(msg.Answer))

     

       40
       40
       +
       	assert.Equal(t, 1, len(msg.Answer))

     

       39
       41
        
       	answer := msg.Answer[0]

     

       40
       40
       -
       	assert_eq(t, answer.Name, "news.ycombinator.com")

     

       41
       41
       -
       	assert_eq(t, DNSType(1), answer.RType)

     

       42
       42
       -
       	assert_eq(t, DNSClass(1), answer.RClass)

     

       43
       43
       -
       	assert_eq(t, uint32(1), answer.TTL)

     

       44
       44
       -
       	assert_eq(t, uint16(4), answer.RDLength)

     

       42
       42
       +
       	assert.Equal(t, answer.Name, "news.ycombinator.com")

     

       43
       43
       +
       	assert.Equal(t, DNSType(1), answer.RType)

     

       44
       44
       +
       	assert.Equal(t, DNSClass(1), answer.RClass)

     

       45
       45
       +
       	assert.Equal(t, uint32(1), answer.TTL)

     

       46
       46
       +
       	assert.Equal(t, uint16(4), answer.RDLength)

     

       45
       47
        
       }

     

       46
       48
        
       

     

       47
       49
        
       func TestMessageDecodeWithU14Offset(t *testing.T) {

     
···

       116
       118
        
       	// assert_no_error(t, err)

     

       117
       119
        
       

     

       118
       120
        
       	// Header Section

     

       119
       119
       -
       	assert_eq(t, uint16(0x0ec3), msg.Header.ID)

     

       120
       120
       -
       	assert_eq(t, true, msg.Header.QR)

     

       121
       121
       -
       	assert_eq(t, QUERY, msg.Header.OPCode)

     

       122
       122
       -
       	assert_eq(t, false, msg.Header.AA)

     

       123
       123
       -
       	assert_eq(t, false, msg.Header.TC)

     

       124
       124
       -
       	assert_eq(t, false, msg.Header.RD)

     

       125
       125
       -
       	assert_eq(t, false, msg.Header.RA)

     

       126
       126
       -
       	assert_eq(t, uint8(0), msg.Header.Z)

     

       127
       127
       -
       	assert_eq(t, NOERROR, msg.Header.RCode)

     

       128
       128
       -
       	assert_eq(t, uint16(1), msg.Header.QDCount)

     

       129
       129
       -
       	assert_eq(t, uint16(0), msg.Header.ANCount)

     

       130
       130
       -
       	assert_eq(t, uint16(13), msg.Header.NSCount)

     

       131
       131
       -
       	assert_eq(t, uint16(14), msg.Header.ARCount)

     

       121
       121
       +
       	assert.Equal(t, uint16(0x0ec3), msg.Header.ID)

     

       122
       122
       +
       	assert.Equal(t, true, msg.Header.QR)

     

       123
       123
       +
       	assert.Equal(t, QUERY, msg.Header.OPCode)

     

       124
       124
       +
       	assert.Equal(t, false, msg.Header.AA)

     

       125
       125
       +
       	assert.Equal(t, false, msg.Header.TC)

     

       126
       126
       +
       	assert.Equal(t, false, msg.Header.RD)

     

       127
       127
       +
       	assert.Equal(t, false, msg.Header.RA)

     

       128
       128
       +
       	assert.Equal(t, uint8(0), msg.Header.Z)

     

       129
       129
       +
       	assert.Equal(t, NOERROR, msg.Header.RCode)

     

       130
       130
       +
       	assert.Equal(t, uint16(1), msg.Header.QDCount)

     

       131
       131
       +
       	assert.Equal(t, uint16(0), msg.Header.ANCount)

     

       132
       132
       +
       	assert.Equal(t, uint16(13), msg.Header.NSCount)

     

       133
       133
       +
       	assert.Equal(t, uint16(14), msg.Header.ARCount)

     

       132
       134
        
       

     

       133
       135
        
       	// Query Section

     

       134
       134
       -
       	assert_eq(t, 1, len(msg.Question))

     

       136
       136
       +
       	assert.Equal(t, 1, len(msg.Question))

     

       135
       137
        
       	question := msg.Question[0]

     

       136
       136
       -
       	assert_eq(t, "ns-372.awsdns-46.com", question.QName)

     

       137
       137
       -
       	assert_eq(t, AType, question.QType)

     

       138
       138
       -
       	assert_eq(t, IN, question.QClass)

     

       138
       138
       +
       	assert.Equal(t, "ns-372.awsdns-46.com", question.QName)

     

       139
       139
       +
       	assert.Equal(t, AType, question.QType)

     

       140
       140
       +
       	assert.Equal(t, IN, question.QClass)

     

       139
       141
        
       

     

       140
       140
       -
       	assert_eq(t, 13, len(msg.Authority))

     

       141
       141
       -
       	assert_eq(t, 14, len(msg.Additional))

     

       142
       142
       +
       	assert.Equal(t, 13, len(msg.Authority))

     

       143
       143
       +
       	assert.Equal(t, 14, len(msg.Additional))

     

       142
       144
        
       }

     

       143
       145
        
       

     

       144
       146
        
       func TestMessageEncode(t *testing.T) {

     
···

       151
       153
        
       

     

       152
       154
        
       	var msg Message

     

       153
       155
        
       	err := msg.Decode(bytes)

     

       154
       154
       -
       	assert_no_error(t, err)

     

       156
       156
       +
       	assert.NoError(t, err)

     

       155
       157
        
       

     

       156
       158
        
       	actual := msg.Encode()

     

       157
       157
       -
       	for i := 0; i < len(bytes); i++ {

     

       158
       158
       -
       		if bytes[i] != actual[i] {

     

       159
       159
       -
       			t.Fatal(bytes, actual)

     

       160
       160
       -
       		}

     

       159
       159
       +
       	assert.Equal(t, bytes, actual)

     

       160
       160
       +
       }

     

       161
       161
       +
       

     

       162
       162
       +
       func TestMessageEncode2(t *testing.T) {

     

       163
       163
       +
       	bytes := []byte{

     

       164
       164
       +
       		0xfc, 0xa9, 0x81, 0x80, 0x00, 0x01, 0x00, 0x05,

     

       165
       165
       +
       		0x00, 0x00, 0x00, 0x00, 0x03, 0x6f, 0x6c, 0x64,

     

       166
       166
       +
       		0x06, 0x72, 0x65, 0x64, 0x64, 0x69, 0x74, 0x03,

     

       167
       167
       +
       		0x63, 0x6f, 0x6d, 0x00, 0x00, 0x01, 0x00, 0x01,

     

       168
       168
       +
       		0xc0, 0x0c, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00,

     

       169
       169
       +
       		0x2a, 0x17, 0x00, 0x17, 0x06, 0x72, 0x65, 0x64,

     

       170
       170
       +
       		0x64, 0x69, 0x74, 0x03, 0x6d, 0x61, 0x70, 0x06,

     

       171
       171
       +
       		0x66, 0x61, 0x73, 0x74, 0x6c, 0x79, 0x03, 0x6e,

     

       172
       172
       +
       		0x65, 0x74, 0x00, 0xc0, 0x2c, 0x00, 0x01, 0x00,

     

       173
       173
       +
       		0x01, 0x00, 0x00, 0x00, 0x23, 0x00, 0x04, 0x97,

     

       174
       174
       +
       		0x65, 0x01, 0x8c, 0xc0, 0x2c, 0x00, 0x01, 0x00,

     

       175
       175
       +
       		0x01, 0x00, 0x00, 0x00, 0x23, 0x00, 0x04, 0x97,

     

       176
       176
       +
       		0x65, 0xc1, 0x8c, 0xc0, 0x2c, 0x00, 0x01, 0x00,

     

       177
       177
       +
       		0x01, 0x00, 0x00, 0x00, 0x23, 0x00, 0x04, 0x97,

     

       178
       178
       +
       		0x65, 0x41, 0x8c, 0xc0, 0x2c, 0x00, 0x01, 0x00,

     

       179
       179
       +
       		0x01, 0x00, 0x00, 0x00, 0x23, 0x00, 0x04, 0x97,

     

       180
       180
       +
       		0x65, 0x81, 0x8c,

     

       161
       181
        
       	}

     

       182
       182
       +
       

     

       183
       183
       +
       	var msg Message

     

       184
       184
       +
       	err := msg.Decode(bytes)

     

       185
       185
       +
       	assert.NoError(t, err)

     

       186
       186
       +
       

     

       187
       187
       +
       	actual := msg.Encode()

     

       188
       188
       +
       	assert.Equal(t, bytes, actual)

     

       162
       189
        
       }

     

       163
       190
        
       

     

       164
       191
        
       func FuzzDecodeMessage(f *testing.F) {

+1 -1

question.go

···

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28
        
       // Encode serializes a Question into bytes, using a map to handle domain name compression offsets.

     

       29
       29
       -
       func (q *Question) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       29
       29
       +
       func (q *Question) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       30
       30
        
       	bytes = encode_domain(bytes, q.QName, offsets)

     

       31
       31
        
       	bytes = binary.BigEndian.AppendUint16(bytes, uint16(q.QType))

     

       32
       32
        
       	bytes = binary.BigEndian.AppendUint16(bytes, uint16(q.QClass))

+23 -27

resource_record.go

···

       17
       17
        
       	return offset, err

     

       18
       18
        
       }

     

       19
       19
        
       

     

       20
       20
       -
       func (a *A) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       20
       20
       +
       func (a *A) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       21
       21
        
       	return append(bytes, a.Address.To4()...)

     

       22
       22
        
       }

     

       23
       23
        
       

     
···

       35
       35
        
       	return offset, err

     

       36
       36
        
       }

     

       37
       37
        
       

     

       38
       38
       -
       func (ns *NS) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       38
       38
       +
       func (ns *NS) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       39
       39
        
       	return encode_domain(bytes, ns.NSDName, offsets)

     

       40
       40
        
       }

     

       41
       41
        
       

     
···

       53
       53
        
       	return offset, err

     

       54
       54
        
       }

     

       55
       55
        
       

     

       56
       56
       -
       func (md *MD) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       56
       56
       +
       func (md *MD) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       57
       57
        
       	return encode_domain(bytes, md.MADName, offsets)

     

       58
       58
        
       }

     

       59
       59
        
       

     
···

       71
       71
        
       	return offset, err

     

       72
       72
        
       }

     

       73
       73
        
       

     

       74
       74
       -
       func (mf *MF) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       74
       74
       +
       func (mf *MF) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       75
       75
        
       	return encode_domain(bytes, mf.MADName, offsets)

     

       76
       76
        
       }

     

       77
       77
        
       

     
···

       89
       89
        
       	return offset, err

     

       90
       90
        
       }

     

       91
       91
        
       

     

       92
       92
       -
       func (c *CNAME) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       92
       92
       +
       func (c *CNAME) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       93
       93
        
       	return encode_domain(bytes, c.CName, offsets)

     

       94
       94
        
       }

     

       95
       95
        
       

     
···

       137
       137
        
       	return offset, err

     

       138
       138
        
       }

     

       139
       139
        
       

     

       140
       140
       -
       func (soa *SOA) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       140
       140
       +
       func (soa *SOA) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       141
       141
        
       	bytes = append(bytes, encode_domain(bytes, soa.MName, offsets)...)

     

       142
       142
        
       	bytes = append(bytes, encode_domain(bytes, soa.RName, offsets)...)

     

       143
       143
        
       	bytes = binary.BigEndian.AppendUint32(bytes, soa.Serial)

     
···

       163
       163
        
       	return offset, err

     

       164
       164
        
       }

     

       165
       165
        
       

     

       166
       166
       -
       func (mb *MB) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       166
       166
       +
       func (mb *MB) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       167
       167
        
       	return encode_domain(bytes, mb.MADName, offsets)

     

       168
       168
        
       }

     

       169
       169
        
       

     
···

       181
       181
        
       	return offset, err

     

       182
       182
        
       }

     

       183
       183
        
       

     

       184
       184
       -
       func (mg *MG) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       184
       184
       +
       func (mg *MG) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       185
       185
        
       	return encode_domain(bytes, mg.MGMName, offsets)

     

       186
       186
        
       }

     

       187
       187
        
       

     
···

       199
       199
        
       	return offset, err

     

       200
       200
        
       }

     

       201
       201
        
       

     

       202
       202
       -
       func (mr *MR) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       202
       202
       +
       func (mr *MR) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       203
       203
        
       	return encode_domain(bytes, mr.NEWName, offsets)

     

       204
       204
        
       }

     

       205
       205
        
       

     
···

       217
       217
        
       	return offset, err

     

       218
       218
        
       }

     

       219
       219
        
       

     

       220
       220
       -
       func (null *NULL) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       220
       220
       +
       func (null *NULL) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       221
       221
        
       	return append(bytes, null.Anything...)

     

       222
       222
        
       }

     

       223
       223
        
       

     
···

       246
       246
        
       	return offset, err

     

       247
       247
        
       }

     

       248
       248
        
       

     

       249
       249
       -
       func (wks *WKS) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       249
       249
       +
       func (wks *WKS) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       250
       250
        
       	bytes = append(bytes, wks.Address.To4()...)

     

       251
       251
        
       	bytes = append(bytes, wks.Protocol)

     

       252
       252
        
       	bytes = append(bytes, wks.BitMap...)

     
···

       268
       268
        
       	return offset, err

     

       269
       269
        
       }

     

       270
       270
        
       

     

       271
       271
       -
       func (ptr *PTR) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       271
       271
       +
       func (ptr *PTR) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       272
       272
        
       	return encode_domain(bytes, ptr.PTRDName, offsets)

     

       273
       273
        
       }

     

       274
       274
        
       

     
···

       292
       292
        
       	return offset, err

     

       293
       293
        
       }

     

       294
       294
        
       

     

       295
       295
       -
       func (hinfo *HINFO) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       295
       295
       +
       func (hinfo *HINFO) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       296
       296
        
       	bytes = append(bytes, []byte(hinfo.CPU)...)

     

       297
       297
        
       	bytes = append(bytes, ' ')

     

       298
       298
        
       	bytes = append(bytes, []byte(hinfo.OS)...)

     
···

       319
       319
        
       	return offset, err

     

       320
       320
        
       }

     

       321
       321
        
       

     

       322
       322
       -
       func (minfo *MINFO) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       322
       322
       +
       func (minfo *MINFO) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       323
       323
        
       	bytes = encode_domain(bytes, minfo.RMailBx, offsets)

     

       324
       324
        
       	bytes = encode_domain(bytes, minfo.EMailBx, offsets)

     

       325
       325
        
       

     
···

       345
       345
        
       	return offset, err

     

       346
       346
        
       }

     

       347
       347
        
       

     

       348
       348
       -
       func (mx *MX) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       348
       348
       +
       func (mx *MX) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       349
       349
        
       	bytes = binary.BigEndian.AppendUint16(bytes, mx.Preference)

     

       350
       350
        
       	bytes = encode_domain(bytes, mx.Exchange, offsets)

     

       351
       351
        
       

     
···

       366
       366
        
       	return offset, err

     

       367
       367
        
       }

     

       368
       368
        
       

     

       369
       369
       -
       func (txt *TXT) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       369
       369
       +
       func (txt *TXT) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       370
       370
        
       	return append(bytes, []byte(txt.TxtData)...)

     

       371
       371
        
       }

     

       372
       372
        
       

     
···

       384
       384
        
       	return offset, err

     

       385
       385
        
       }

     

       386
       386
        
       

     

       387
       387
       -
       func (r *Reserved) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       387
       387
       +
       func (r *Reserved) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       388
       388
        
       	return append(bytes, r.Bytes...)

     

       389
       389
        
       }

     

       390
       390
        
       

     
···

       470
       470
        
       }

     

       471
       471
        
       

     

       472
       472
        
       // Encode encdoes a resource record and returns the input bytes appened.

     

       473
       473
       -
       func (r *ResourceRecord) Encode(bytes []byte, offsets *map[string]uint8) []byte {

     

       473
       473
       +
       func (r *ResourceRecord) Encode(bytes []byte, offsets *map[string]uint16) []byte {

     

       474
       474
        
       	bytes = encode_domain(bytes, r.Name, offsets)

     

       475
       475
        
       	bytes = binary.BigEndian.AppendUint16(bytes, uint16(r.RType))

     

       476
       476
        
       	bytes = binary.BigEndian.AppendUint16(bytes, uint16(r.RClass))

     

       477
       477
        
       	bytes = binary.BigEndian.AppendUint32(bytes, r.TTL)

     

       478
       478
        
       

     

       479
       479
       -
       	second_dinner := make([]byte, len(bytes))

     

       480
       480
       -
       	copy(second_dinner, bytes)

     

       481
       481
       -
       	start := len(second_dinner)

     

       482
       482
       -
       	second_dinner = r.RData.Encode(second_dinner, offsets)

     

       483
       483
       -
       	end := len(second_dinner)

     

       484
       484
       -
       	data := second_dinner[start:end]

     

       485
       485
       -
       

     

       486
       486
       -
       	bytes = binary.BigEndian.AppendUint16(bytes, uint16(end-start))

     

       487
       487
       -
       	bytes = append(bytes, data...)

     

       479
       479
       +
       	rdata_start := len(bytes)

     

       480
       480
       +
       	bytes = binary.BigEndian.AppendUint16(bytes, 0)

     

       481
       481
       +
       	bytes = r.RData.Encode(bytes, offsets)

     

       482
       482
       +
       	rdata_length := uint16(len(bytes) - rdata_start - 2)

     

       483
       483
       +
       	binary.BigEndian.PutUint16(bytes[rdata_start:rdata_start+2], rdata_length)

     

       488
       484
        
       

     

       489
       485
        
       	return bytes

     

       490
       486
        
       }

+2 -2

types.go

···

       173
       173
        
       

     

       174
       174
        
       	// offsets is a map of domains pointing to the seen offset used

     

       175
       175
        
       	// in domain compression.

     

       176
       176
       -
       	offsets map[string]uint8

     

       176
       176
       +
       	offsets map[string]uint16

     

       177
       177
        
       }

     

       178
       178
        
       

     

       179
       179
        
       // A Header represents the metadata information of a DNS packet.

     
···

       213
       213
        
       //	*map[string]uint8 - map containing labels and offsets for domain name compression

     

       214
       214
        
       type ResourceRecordData interface {

     

       215
       215
        
       	Decode([]byte, int, int) (int, error)

     

       216
       216
       -
       	Encode([]byte, *map[string]uint8) []byte

     

       216
       216
       +
       	Encode([]byte, *map[string]uint16) []byte

     

       217
       217
        
       	String() string

     

       218
       218
        
       }

     

       219
       219

+26 -24

utils_test.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"testing"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/stretchr/testify/assert"

     

       5
       7
        
       )

     

       6
       8
        
       

     

       7
       9
        
       func TestU8(t *testing.T) {

     
···

       10
       12
        
       	}

     

       11
       13
        
       

     

       12
       14
        
       	actual, offset, err := getU8(buf, 0)

     

       13
       13
       -
       	assert_eq(t, uint8(1), actual)

     

       14
       14
       -
       	assert_eq(t, 1, offset)

     

       15
       15
       -
       	assert_no_error(t, err)

     

       15
       15
       +
       	assert.Equal(t, uint8(1), actual)

     

       16
       16
       +
       	assert.Equal(t, 1, offset)

     

       17
       17
       +
       	assert.NoError(t, err)

     

       16
       18
        
       

     

       17
       19
        
       	actual, offset, err = getU8(buf, 1)

     

       18
       18
       -
       	assert_eq(t, uint8(0), actual)

     

       19
       19
       -
       	assert_eq(t, 1, offset)

     

       20
       20
       -
       	assert_error(t, err)

     

       20
       20
       +
       	assert.Equal(t, uint8(0), actual)

     

       21
       21
       +
       	assert.Equal(t, 1, offset)

     

       22
       22
       +
       	assert.Error(t, err)

     

       21
       23
        
       }

     

       22
       24
        
       

     

       23
       25
        
       func TestU16(t *testing.T) {

     
···

       26
       28
        
       	}

     

       27
       29
        
       

     

       28
       30
        
       	actual, offset, err := getU16(buf, 0)

     

       29
       29
       -
       	assert_eq(t, uint16(1), actual)

     

       30
       30
       -
       	assert_eq(t, 2, offset)

     

       31
       31
       -
       	assert_no_error(t, err)

     

       31
       31
       +
       	assert.Equal(t, uint16(1), actual)

     

       32
       32
       +
       	assert.Equal(t, 2, offset)

     

       33
       33
       +
       	assert.NoError(t, err)

     

       32
       34
        
       

     

       33
       35
        
       	actual, offset, err = getU16(buf, 1)

     

       34
       34
       -
       	assert_eq(t, uint16(0), actual)

     

       35
       35
       -
       	assert_eq(t, 2, offset)

     

       36
       36
       -
       	assert_error(t, err)

     

       36
       36
       +
       	assert.Equal(t, uint16(0), actual)

     

       37
       37
       +
       	assert.Equal(t, 2, offset)

     

       38
       38
       +
       	assert.Error(t, err)

     

       37
       39
        
       }

     

       38
       40
        
       

     

       39
       41
        
       func TestU32(t *testing.T) {

     
···

       42
       44
        
       	}

     

       43
       45
        
       

     

       44
       46
        
       	actual, offset, err := getU32(buf, 0)

     

       45
       45
       -
       	assert_eq(t, uint32(1), actual)

     

       46
       46
       -
       	assert_eq(t, 4, offset)

     

       47
       47
       -
       	assert_no_error(t, err)

     

       47
       47
       +
       	assert.Equal(t, uint32(1), actual)

     

       48
       48
       +
       	assert.Equal(t, 4, offset)

     

       49
       49
       +
       	assert.NoError(t, err)

     

       48
       50
        
       

     

       49
       51
        
       	actual, offset, err = getU32(buf, 1)

     

       50
       50
       -
       	assert_eq(t, uint32(0), actual)

     

       51
       51
       -
       	assert_eq(t, 4, offset)

     

       52
       52
       -
       	assert_error(t, err)

     

       52
       52
       +
       	assert.Equal(t, uint32(0), actual)

     

       53
       53
       +
       	assert.Equal(t, 4, offset)

     

       54
       54
       +
       	assert.Error(t, err)

     

       53
       55
        
       }

     

       54
       56
        
       

     

       55
       57
        
       func TestSlice(t *testing.T) {

     
···

       58
       60
        
       	}

     

       59
       61
        
       

     

       60
       62
        
       	actual, offset, err := getSlice(buf, 0, 3)

     

       61
       61
       -
       	assert_eq(t, "blu", string(actual))

     

       62
       62
       -
       	assert_eq(t, 3, offset)

     

       63
       63
       -
       	assert_no_error(t, err)

     

       63
       63
       +
       	assert.Equal(t, "blu", string(actual))

     

       64
       64
       +
       	assert.Equal(t, 3, offset)

     

       65
       65
       +
       	assert.NoError(t, err)

     

       64
       66
        
       

     

       65
       67
        
       	actual, offset, err = getSlice(buf, 0, 4)

     

       66
       66
       -
       	assert_eq(t, "", string(actual))

     

       67
       67
       -
       	assert_eq(t, 3, offset)

     

       68
       68
       -
       	assert_error(t, err)

     

       68
       68
       +
       	assert.Equal(t, "", string(actual))

     

       69
       69
       +
       	assert.Equal(t, 3, offset)

     

       70
       70
       +
       	assert.Error(t, err)

     

       69
       71
        
       }