Test with the smpp center

Oopsie!

.gitea/workflows/benchmark.yaml

@@ -2,8 +2,7 @@ name: Benchmark BufferPool
 on:
   push:
     branches:
-      - '*'
+      - 'master'
-      - '!benchmark'
 
 jobs:
   RunBenchmarks:

.gitignore

@@ -1 +1,3 @@
 jstester/node_modules
+encoding/tmp
+pdu/tmp

benchmark/benchmark.go

@@ -38,7 +38,7 @@ func main() {
 		log.Fatalf("Error creating result file %s with %v", resultFile, err)
 	}
 
-	cmd := exec.Command("go", "test", "-bench", ".", "./pdu")
+	cmd := exec.Command("go", "test", "-bench", ".", "./...")
 	cmd.Dir = "../"
 	cmd.Stdout = outFile
 

encoding/.air.toml

@@ -0,0 +1,51 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  args_bin = []
+  bin = "tmp\\main.exe"
+  cmd = "go test ."
+  delay = 1000
+  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  exclude_file = []
+  exclude_regex = []
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = ""
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  include_file = []
+  kill_delay = "0s"
+  log = "build-errors.log"
+  poll = false
+  poll_interval = 0
+  post_cmd = []
+  pre_cmd = []
+  rerun = false
+  rerun_delay = 100
+  send_interrupt = false
+  stop_on_error = false
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  main_only = false
+  time = false
+
+[misc]
+  clean_on_exit = true
+
+[proxy]
+  app_port = 0
+  enabled = false
+  proxy_port = 0
+
+[screen]
+  clear_on_rebuild = true
+  keep_scroll = true

encoding/ascii.go

@@ -0,0 +1,22 @@
+package encoding
+
+import "bytes"
+
+type ASCIICoder struct{}
+
+func (c *ASCIICoder) Encode(s *string, buf *bytes.Buffer) error {
+	// These should be ASCII but UTF8 is a superset of ASCII so hopefully this'll be fine
+	buf.WriteString(*s)
+	return nil
+}
+
+func (c *ASCIICoder) Decode(buf *bytes.Buffer) (string, error) {
+	return buf.String(), nil
+}
+
+func (c ASCIICoder) EncodesInto(s *string) int {
+	return len(*s)
+}
+func (c ASCIICoder) DecodesInto(buf *bytes.Buffer) int {
+	return buf.Len()
+}

encoding/ascii_test.go

@@ -0,0 +1,74 @@
+package encoding
+
+import (
+	"bytes"
+	"testing"
+)
+
+func TestASCIIEncodeSimpleASCIIString(t *testing.T) {
+	coder := &ASCIICoder{}
+	var buf bytes.Buffer
+	input := "Hello, World!"
+
+	expected := []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
+	err := coder.Encode(&input, &buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if !bytes.Equal(buf.Bytes(), expected) {
+		t.Errorf("Expected %v, but got %v", expected, buf.Bytes())
+	}
+}
+
+func TestASCIIDecodeSimpleASCIIString(t *testing.T) {
+	coder := &ASCIICoder{}
+	var buf bytes.Buffer
+	input := []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
+
+	expected := "Hello, World!"
+	buf.Write(input)
+	output, err := coder.Decode(&buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if output != expected {
+		t.Errorf("Expected %v, but got %v", expected, output)
+	}
+}
+
+func TestASCIIEncodeEmptyString(t *testing.T) {
+	coder := &ASCIICoder{}
+	var buf bytes.Buffer
+	input := ""
+
+	expected := []byte{}
+	err := coder.Encode(&input, &buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if !bytes.Equal(buf.Bytes(), expected) {
+		t.Errorf("Expected %v, but got %v", expected, buf.Bytes())
+	}
+}
+
+func TestASCIIDecodeEmptyString(t *testing.T) {
+	coder := &ASCIICoder{}
+	buf := bytes.NewBuffer([]byte{})
+
+	expected := ""
+	output, err := coder.Decode(buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if output != expected {
+		t.Errorf("Expected %v, but got %v", expected, output)
+	}
+}

encoding/charset.json

@@ -0,0 +1,5 @@
+{
+	"ucs2": {
+		"link": "http://www.columbia.edu/kermit/ucs2.html"
+	}
+}

encoding/coder.go

@@ -0,0 +1,10 @@
+package encoding
+
+import "bytes"
+
+type Coder interface {
+	Encode(s *string, buf *bytes.Buffer) error
+	Decode(buf *bytes.Buffer) (string, error)
+	EncodesInto(s *string) int
+	DecodesInto(buf *bytes.Buffer) int
+}

encoding/gsm7.go

@@ -0,0 +1,136 @@
+package encoding
+
+import (
+	"bytes"
+	"fmt"
+)
+
+type GSM7Coder struct{}
+
+// Make sure buffer can fit EncodesInto bytes
+// Otherwise Encode will allocate memory as it sees fit
+// Which is fine but not optimal
+// Preallocate the buffer with the size of EncodesInto bytes
+func (c *GSM7Coder) Encode(s *string, buf *bytes.Buffer) error {
+	// utf8 := *(*[]byte)(unsafe.Pointer(&s))
+	utf8 := []byte(*s)
+	var (
+		offset      int  = 1
+		bitshift    byte = 0
+		leap, shift bool
+	)
+	encodedSize := c.EncodesInto(s)
+	cap := buf.Cap()
+	if cap < encodedSize {
+		buf.Grow(encodedSize - cap)
+	}
+
+	for index, septet := range utf8 {
+		if septet > 0b01111111 {
+			return fmt.Errorf("invalid character at index %d", index)
+		}
+		if index == 0 {
+			continue
+		}
+		bitshift++
+		// log.Printf("Index:%-3d Offset:%-3d Bitshift:%-3d CurrentByte:%08b (%-3d) OffsetByte:%08b (%-3d) Leap:%5v", index, offset, bitshift, utf8[index], utf8[index], utf8[index-offset], utf8[index-offset], leap)
+		mask := byte(255 >> (8 - bitshift))
+		masked := (mask & septet) << (8 - bitshift)
+		// log.Printf("Index:%-3d Offset:%-3d Bitshift:%-3d Mask:%08b Masked:%08b", index, offset, bitshift, mask, masked)
+		if leap {
+			masked >>= 1
+		}
+		utf8[index-offset] |= masked
+		utf8[index] >>= bitshift
+
+		if !leap {
+			buf.WriteByte(utf8[index-offset])
+		}
+		if index == len(utf8)-1 && utf8[index] > 0 {
+			buf.WriteByte(utf8[index])
+		}
+		// log.Printf("Index:%-3d Offset:%-3d Bitshift:%-3d CurrentByte:%08b (%-3d) OffsetByte:%08b (%-3d) Leap:%5v", index, offset, bitshift, utf8[index], utf8[index], utf8[index-offset], utf8[index-offset], leap)
+		if bitshift >= 7 {
+			if leap {
+				// log.Printf("Shift at Index:%-3d Offset:%-3d Bitshift:%-3d", index, offset, bitshift)
+				leap = false
+				bitshift = 0
+				offset++
+				shift = true
+				continue
+			}
+			// log.Printf("Leap at Index:%-3d Offset:%-3d Bitshift:%-3d", index, offset, bitshift)
+			leap = true
+			bitshift = 6
+		}
+		if shift {
+			offset = 1
+		}
+	}
+	return nil
+}
+
+func (c *GSM7Coder) Decode(buf *bytes.Buffer) (string, error) {
+	gsm7 := buf.Bytes()
+	var (
+		offset   int
+		bitshift byte = 0
+		leap     bool
+	)
+	outLength := c.DecodesInto(buf)
+	lengthDiff := outLength - len(gsm7)
+	gsm7 = append(gsm7, make([]byte, lengthDiff)...)
+	start := len(gsm7) - 2
+
+	// We don't care about the last byte
+	// Unless it's the %8.......
+	// We'll deal with that later
+	for index := start; index >= 0; index-- {
+		octet := gsm7[index]
+		bitshift = byte((index % 7) + 1)
+		if bitshift == 7 {
+			leap = true
+		}
+		offset = 1
+		// log.Println(offset, index, index+offset)
+		// log.Printf("Index:%-3d Offset:%-3d Bitshift:%-3d CurrentByte:%08b (%-3d) OffsetByte(%-3d):%08b (%-3d) Leap:%5v", index, offset, bitshift, gsm7[index], gsm7[index], index+offset, gsm7[index+offset], gsm7[index+offset], leap)
+
+		mask := byte(255 << (8 - bitshift))
+		masked := (mask & octet) >> (8 - bitshift)
+		// log.Printf("Index:%-3d Offset:%-3d Bitshift:%-3d Mask:%08b Masked:%08b", index, offset, bitshift, mask, masked)
+		if leap {
+			InsertAt(&gsm7, index+offset, masked)
+		} else {
+			gsm7[index+offset] |= masked
+		}
+		// Remove last bitshift bits
+		gsm7[index] <<= bitshift
+		// Move the remaining bit once to the right to form septet instead of octet
+		gsm7[index] >>= 1
+
+		// log.Printf("Index:%-3d Offset:%-3d Bitshift:%-3d CurrentByte:%08b (%-3d) OffsetByte(%-3d):%08b (%-3d) Leap:%5v", index, offset, bitshift, gsm7[index], gsm7[index], index+offset, gsm7[index+offset], gsm7[index+offset], leap)
+		leap = false
+	}
+	return string(gsm7), nil
+}
+
+// Allocation free
+// Which means data MUST have space for value
+func InsertAt(data *[]byte, index int, value byte) {
+	copy((*data)[index+1:], (*data)[index:])
+	(*data)[index] = value
+}
+
+func (c GSM7Coder) EncodesInto(s *string) int {
+	slen := len(*s)
+	enclen := slen * 7 / 8
+	if slen%8 != 0 {
+		enclen++
+	}
+	return enclen
+}
+func (c GSM7Coder) DecodesInto(buf *bytes.Buffer) int {
+	blen := buf.Len()
+	declen := blen * 8 / 7
+	return declen
+}

encoding/gsm7_test.go

@@ -0,0 +1,369 @@
+package encoding
+
+import (
+	"bytes"
+	"testing"
+)
+
+var (
+	short8nString   = "Sunshine"
+	longNot8nString = "Golden rays play, Chasing night away."
+	long8nString    = "Ducks are fucking great, they quacks, O quackers, what the fuck."
+
+	short8nStringEncodedBytes   = []byte{0b11010011, 0b10111010, 0b01111011, 0b10001110, 0b01001110, 0b10111011, 0b11001011}
+	longNot8nStringEncodedBytes = []byte{0b11000111, 0b00110111, 0b10011011, 0b01011100, 0b01110110, 0b10000011, 0b11100100, 0b11100001, 0b11111100, 0b00011100, 0b00000100, 0b01100111, 0b10000111, 0b11110011, 0b00101100, 0b11010000, 0b00010000, 0b00011101, 0b10011110, 0b10100111, 0b11011101, 0b01100111, 0b10010000, 0b00111011, 0b01111101, 0b01000110, 0b11010011, 0b01000001, 0b11100001, 0b01111011, 0b00111000, 0b11101111, 0b00000010}
+	long8nStringEncodedBytes    = []byte{0b11000100, 0b11111010, 0b01111000, 0b00111101, 0b00000111, 0b10000101, 0b11100101, 0b01100101, 0b10010000, 0b10111001, 0b00111110, 0b01011110, 0b10100111, 0b11011101, 0b01100111, 0b11010000, 0b01011001, 0b01011110, 0b00001110, 0b11010011, 0b01011001, 0b00100000, 0b00111010, 0b10111010, 0b10011100, 0b00000111, 0b11000101, 0b11101011, 0b11100001, 0b11110001, 0b01111010, 0b11001110, 0b00000010, 0b00111101, 0b01000001, 0b11110001, 0b01111010, 0b01111000, 0b10111100, 0b00101110, 0b11001011, 0b11100111, 0b00101100, 0b11010000, 0b00011101, 0b00011101, 0b10100110, 0b10000011, 0b11101000, 0b11101000, 0b00110010, 0b11001000, 0b01011100, 0b00011111, 0b10101111, 0b01011101}
+)
+
+// region encode
+func TestGSM7EncodeSimpleASCIIString(t *testing.T) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := short8nString
+
+	expected := short8nStringEncodedBytes
+	err := coder.Encode(&input, &buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if !bytes.Equal(buf.Bytes(), expected) {
+		t.Errorf("Expected '%v', but got '%v'", expected, buf.Bytes())
+	}
+}
+
+func TestGSM7EncodeComplexASCIIString(t *testing.T) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := longNot8nString
+
+	expected := longNot8nStringEncodedBytes
+	err := coder.Encode(&input, &buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if !bytes.Equal(buf.Bytes(), expected) {
+		t.Errorf("Expected '%v', but got '%v'", expected, buf.Bytes())
+	}
+}
+
+func TestGSM7EncodeComplex8nASCIIString(t *testing.T) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := "Ducks are fucking great, they quacks, O quackers, what the fuck."
+
+	expected := long8nStringEncodedBytes
+	err := coder.Encode(&input, &buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if !bytes.Equal(buf.Bytes(), expected) {
+		t.Errorf("Expected '%v', but got '%v'", expected, buf.Bytes())
+	}
+}
+
+func TestGSM7EncodeDoesNotAllocateMoreThanNecessary(t *testing.T) {
+	coder := &GSM7Coder{}
+	input := "Ducks are fucking great, they quacks, O quackers, what the fuck."
+	buf := bytes.NewBuffer(make([]byte, coder.EncodesInto(&input)))
+	buf.Reset()
+
+	expected := buf.Cap()
+	err := coder.Encode(&input, buf)
+	actual := buf.Cap()
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if actual != expected {
+		t.Errorf("Expected buffer of size %v, but got %v", expected, actual)
+	}
+}
+
+func TestGSM7EncodeDoesAllocateWhenNecessary(t *testing.T) {
+	coder := &GSM7Coder{}
+	input := "Ducks are fucking great, they quacks, O quackers, what the fuck."
+	var buf bytes.Buffer
+	buf.Reset()
+
+	original := buf.Cap()
+	err := coder.Encode(&input, &buf)
+	modified := buf.Cap()
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if !(modified > original) {
+		t.Errorf("Expected buffer to grow but buffer changed from %v to %v", original, modified)
+	}
+}
+
+func TestGSM7EncodeEmptyString(t *testing.T) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := ""
+
+	expected := []byte{}
+	err := coder.Encode(&input, &buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if !bytes.Equal(buf.Bytes(), expected) {
+		t.Errorf("Expected '%v', but got '%v'", expected, buf.Bytes())
+	}
+}
+
+// region decode
+func TestGSM7DecodeSimpleASCIIString(t *testing.T) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := short8nStringEncodedBytes
+
+	expected := short8nString
+	buf.Write(input)
+	actual, err := coder.Decode(&buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if actual != expected {
+		t.Errorf("Expected '%v', but got '%v'", expected, actual)
+	}
+}
+
+func TestGSM7DecodeComplexASCIIString(t *testing.T) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := longNot8nStringEncodedBytes
+
+	expected := longNot8nString
+	buf.Write(input)
+	actual, err := coder.Decode(&buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if actual != expected {
+		t.Errorf("Expected '%v', but got '%v'", expected, actual)
+	}
+}
+
+func TestGSM7DecodeComplex8nASCIIString(t *testing.T) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := long8nStringEncodedBytes
+
+	expected := long8nString
+	buf.Write(input)
+	actual, err := coder.Decode(&buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if actual != expected {
+		t.Errorf("Expected '%v', but got '%v'", expected, actual)
+	}
+}
+
+func TestGSM7DecodeEmptyString(t *testing.T) {
+	coder := &GSM7Coder{}
+	buf := bytes.NewBuffer([]byte{})
+
+	expected := ""
+	actual, err := coder.Decode(buf)
+
+	if err != nil {
+		t.Errorf("Expected no error, but got %v", err)
+	}
+
+	if actual != expected {
+		t.Errorf("Expected '%v', but got '%v'", expected, actual)
+	}
+}
+
+// region insertat
+func TestInsertAtBeginning(t *testing.T) {
+	data := []byte{2, 3, 4, 0}
+	InsertAt(&data, 0, 1)
+	expected := []byte{1, 2, 3, 4}
+	if !bytes.Equal(data, expected) {
+		t.Errorf("expected %v, got %v", expected, data)
+	}
+}
+
+func TestInsertInMiddle(t *testing.T) {
+	data := []byte{2, 3, 4, 0}
+	InsertAt(&data, 1, 5)
+	expected := []byte{2, 5, 3, 4}
+	if !bytes.Equal(data, expected) {
+		t.Errorf("expected %v, got %v", expected, data)
+	}
+}
+
+func TestInsertAtEnd(t *testing.T) {
+	data := []byte{1, 2, 3, 0}
+	InsertAt(&data, 3, 4)
+	expected := []byte{1, 2, 3, 4}
+	if !bytes.Equal(data, expected) {
+		t.Errorf("expected %v, got %v", expected, data)
+	}
+}
+
+func TestIndexOutOfBounds(t *testing.T) {
+	data := []byte{2, 3, 4}
+	defer func() {
+		if r := recover(); r == nil {
+			t.Errorf("The code did not panic")
+		}
+	}()
+	InsertAt(&data, 4, 5)
+}
+
+func TestNegativeIndex(t *testing.T) {
+	data := []byte{2, 3, 4}
+	defer func() {
+		if r := recover(); r == nil {
+			t.Errorf("The code did not panic")
+		}
+	}()
+	InsertAt(&data, -1, 1)
+}
+
+func TestMaintainsOrderAfterInsertion(t *testing.T) {
+	data := []byte{2, 3, 4, 0}
+	InsertAt(&data, 1, 1)
+	expected := []byte{2, 1, 3, 4}
+	if !bytes.Equal(data, expected) {
+		t.Errorf("expected %v, got %v", expected, data)
+	}
+}
+
+func TestMaintainsLength(t *testing.T) {
+	data := []byte{2, 3, 4, 0}
+	InsertAt(&data, 1, 1)
+	if len(data) != 4 {
+		t.Errorf("expected length 4, got %d", len(data))
+	}
+}
+
+func TestDeletesLastValue(t *testing.T) {
+	data := []byte{2, 3, 4, 5}
+	InsertAt(&data, 0, 1)
+	expected := []byte{1, 2, 3, 4}
+	if !bytes.Equal(data, expected) {
+		t.Errorf("expected %v, got %v", expected, data)
+	}
+}
+
+// region misc tests
+func TestGSM7EncodesIntoSmallString(t *testing.T) {
+	input := short8nString
+	expected := 7
+	actual := GSM7Coder{}.EncodesInto(&input)
+	if actual != expected {
+		t.Errorf("Expected %d, but got %d", expected, actual)
+	}
+}
+
+func TestGSM7EncodesIntoLargerNot8nString(t *testing.T) {
+	input := longNot8nString
+	expected := 33
+	actual := GSM7Coder{}.EncodesInto(&input)
+	if actual != expected {
+		t.Errorf("Expected %d, but got %d", expected, actual)
+	}
+}
+
+func TestGSM7EncodesIntoLarger8nString(t *testing.T) {
+	input := long8nString
+	expected := 56
+	actual := GSM7Coder{}.EncodesInto(&input)
+	if actual != expected {
+		t.Errorf("Expected %d, but got %d", expected, actual)
+	}
+}
+
+func TestGSM7DecodesIntoSmallString(t *testing.T) {
+	input := short8nStringEncodedBytes
+	expected := 8
+	actual := GSM7Coder{}.DecodesInto(bytes.NewBuffer(input))
+	if actual != expected {
+		t.Errorf("Expected %d, but got %d", expected, actual)
+	}
+}
+
+func TestGSM7DecodesIntoLargerNot8nString(t *testing.T) {
+	input := longNot8nStringEncodedBytes
+	expected := 37
+	actual := GSM7Coder{}.DecodesInto(bytes.NewBuffer(input))
+	if actual != expected {
+		t.Errorf("Expected %d, but got %d", expected, actual)
+	}
+}
+
+func TestGSM7DecodesIntoLarger8nString(t *testing.T) {
+	input := long8nStringEncodedBytes
+	expected := 64
+	actual := GSM7Coder{}.DecodesInto(bytes.NewBuffer(input))
+	if actual != expected {
+		t.Errorf("Expected %d, but got %d", expected, actual)
+	}
+}
+
+// region benchmark
+func BenchmarkGSM7EncodeSimpleASCIIString(b *testing.B) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := short8nString
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		coder.Encode(&input, &buf)
+	}
+}
+
+func BenchmarkGSM7EncodeComplexASCIIString(b *testing.B) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := longNot8nString
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		coder.Encode(&input, &buf)
+	}
+}
+
+func BenchmarkGSM7EncodeComplex8nASCIIString(b *testing.B) {
+	coder := &GSM7Coder{}
+	var buf bytes.Buffer
+	input := long8nString
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		coder.Encode(&input, &buf)
+	}
+}
+
+func BenchmarkGSM7EncodeComplex8nASCIIStringPrealloc(b *testing.B) {
+	coder := &GSM7Coder{}
+	input := long8nString
+	b.ResetTimer()
+
+	for i := 0; i < b.N; i++ {
+		buf := bytes.NewBuffer(make([]byte, coder.EncodesInto(&input)))
+		buf.Reset()
+		coder.Encode(&input, buf)
+	}
+}

encoding/ucs2.go

@@ -0,0 +1,19 @@
+package encoding
+
+import "bytes"
+
+type UCS2Coder struct{}
+
+func (c *UCS2Coder) Encode(s *string, buf *bytes.Buffer) error {
+	panic("UCS2 not implemented yet")
+}
+func (c *UCS2Coder) Decode(buf *bytes.Buffer) (string, error) {
+	panic("UCS2 not implemented yet")
+}
+
+func (c UCS2Coder) EncodesInto(s *string) int {
+	return len(*s) * 2
+}
+func (c UCS2Coder) DecodesInto(buf *bytes.Buffer) int {
+	return buf.Len() / 2
+}

main.go

@@ -6,10 +6,12 @@ import (
 	"log"
 	"net"
 	"sync"
+
+	"smpptester/pdu"
 )
 
 func init() {
-	log.SetFlags(log.Lmicroseconds)
+	log.SetFlags(log.Lmicroseconds | log.Lshortfile)
 }
 
 // Function to create a submit_sm PDU
@@ -29,7 +31,7 @@ func createSubmitSMPDU() []byte {
 	validityPeriod := ""
 	registeredDelivery := byte(0x01)
 	replaceIfPresentFlag := byte(0x00)
-	dataCoding := byte(0x00)
+	dataCoding := byte(0x01)
 	smDefaultMsgID := byte(0x00)
 	shortMessage := "Hello, SMPP!"
 
@@ -37,7 +39,6 @@ func createSubmitSMPDU() []byte {
 	headerLength := 16
 	bodyLength := 1 + len(serviceType) + 1 + 1 + len(sourceAddr) + 1 + 1 + len(destinationAddr) + 1 + 1 + len(scheduleDeliveryTime) + 1 + len(validityPeriod) + 1 + 1 + 1 + 1 + 1 + len(shortMessage)
 	totalLength := headerLength + bodyLength
-	log.Printf("Total length: %d", totalLength)
 
 	// Create a buffer to hold the PDU
 	var buffer bytes.Buffer
@@ -136,6 +137,55 @@ func main() {
 	// 		go handleConnection(conn)
 	// 	}
 	// }()
+	submit := &pdu.SUBMIT_SM{
+		Header: &pdu.PDU_HEADER{
+			Command_length:  0,
+			Command_id:      4,
+			Command_status:  0,
+			Sequence_number: 1,
+		},
+		Service_type:           "hehe",
+		Source_addr_ton:        0x01,
+		Source_addr_npi:        0x01,
+		Source_addr:            "12345",
+		Dest_addr_ton:          0x01,
+		Dest_addr_npi:          0x01,
+		Destination_addr:       "67890",
+		Esm_class:              0x00,
+		Protocol_id:            0x00,
+		Priority_flag:          0x00,
+		Schedule_delivery_time: "",
+		Validity_period:        "",
+		Registered_delivery:    0x01,
+		Replace_if_present:     0x00,
+		Data_coding:            0x01,
+		Sm_default_msg_id:      0x00,
+		Short_message:          "Hello, SMPP!",
+	}
+	submit.UpdateSize()
+	buf := pdu.ByteBufferPool.Get(submit.Size())
+	defer pdu.ByteBufferPool.Put(buf)
+	submit.Encode(buf)
+	log.Println(buf.Bytes())
+	log.Println(createSubmitSMPDU())
+	// log.Println(pdu.Encode())
+	// serviceType := "CMT"
+	// sourceAddrTON := byte(0x01)
+	// sourceAddrNPI := byte(0x01)
+	// sourceAddr := "12345"
+	// destAddrTON := byte(0x01)
+	// destAddrNPI := byte(0x01)
+	// destinationAddr := "67890"
+	// esmClass := byte(0x00)
+	// protocolID := byte(0x00)
+	// priorityFlag := byte(0x00)
+	// scheduleDeliveryTime := ""
+	// validityPeriod := ""
+	// registeredDelivery := byte(0x01)
+	// replaceIfPresentFlag := byte(0x00)
+	// dataCoding := byte(0x01)
+	// smDefaultMsgID := byte(0x00)
+	// shortMessage := "Hello, SMPP!"
 
 	wg := &sync.WaitGroup{}
 	wg.Add(1)
@@ -149,7 +199,7 @@ func main() {
 	defer conn.Close()
 
 	go func() {
-		conn.Write(createSubmitSMPDU())
+		conn.Write(buf.Bytes())
 		data, err := conn.Read(make([]byte, 1024))
 		if err != nil {
 			log.Printf("Failed to read from connection: %+v", err)

pdu/.air.toml

@@ -0,0 +1,51 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  args_bin = []
+  bin = "tmp\\main.exe"
+  cmd = "go test ."
+  delay = 1000
+  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  exclude_file = []
+  exclude_regex = []
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = ""
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  include_file = []
+  kill_delay = "0s"
+  log = "build-errors.log"
+  poll = false
+  poll_interval = 0
+  post_cmd = []
+  pre_cmd = []
+  rerun = false
+  rerun_delay = 500
+  send_interrupt = false
+  stop_on_error = false
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  main_only = false
+  time = false
+
+[misc]
+  clean_on_exit = false
+
+[proxy]
+  app_port = 0
+  enabled = false
+  proxy_port = 0
+
+[screen]
+  clear_on_rebuild = false
+  keep_scroll = true

pdu/bind.go

@@ -2,19 +2,19 @@ package pdu
 
 type (
 	BIND struct {
-		header            PDU_HEADER
+		Header            *PDU_HEADER
-		system_id         string
+		System_id         string
-		password          string
+		Password          string
-		system_type       string
+		System_type       string
-		interface_version uint8
+		Interface_version byte
-		addr_ton          uint8
+		Addr_ton          byte
-		addr_npi          uint8
+		Addr_npi          byte
-		address_range     string
+		Address_range     string
 	}
 	BIND_RESP struct {
-		header               PDU_HEADER
+		Header               *PDU_HEADER
-		system_id            string
+		System_id            string
-		sc_interface_version uint8
+		Sc_interface_version byte
 	}
 	BIND_RECVEIVER struct {
 		BIND
@@ -36,9 +36,9 @@ type (
 	}
 
 	UNBIND struct {
-		PDU_HEADER
+		Header *PDU_HEADER
 	}
 	UNBIND_RESP struct {
-		PDU_HEADER
+		Header *PDU_HEADER
 	}
 )

pdu/bufpool.go

@@ -1,21 +1,30 @@
 package pdu
 
 import (
+	"bytes"
+	"log"
 	"sync"
 )
 
 type BufferPoolManager struct {
-	pools map[uint]*sync.Pool
+	pools map[int]*sync.Pool
 	mu    sync.RWMutex
+	debug bool
+}
+
+func (bpm *BufferPoolManager) logf(format string, args ...interface{}) {
+	if bpm.debug {
+		log.Printf(format, args...)
+	}
 }
 
 func NewBufferPoolManager() *BufferPoolManager {
 	return &BufferPoolManager{
-		pools: make(map[uint]*sync.Pool),
+		pools: make(map[int]*sync.Pool),
 	}
 }
 
-func (bpm *BufferPoolManager) Get(size uint) *[]uint8 {
+func (bpm *BufferPoolManager) Get(size int) *bytes.Buffer {
 	bpm.mu.RLock()
 	pool, exists := bpm.pools[size]
 	bpm.mu.RUnlock()
@@ -25,10 +34,13 @@ func (bpm *BufferPoolManager) Get(size uint) *[]uint8 {
 		// Double-check if another goroutine added the pool while we were waiting
 		pool, exists = bpm.pools[size]
 		if !exists {
+			bpm.logf("Creating new pool for size %d\n", size)
 			pool = &sync.Pool{
 				New: func() interface{} {
-					buf := make([]uint8, size)
+					bpm.logf("Creating new buffer of size %d\n", size)
-					return &buf
+					buf := bytes.NewBuffer(make([]byte, size))
+					buf.Reset()
+					return buf
 				},
 			}
 			bpm.pools[size] = pool
@@ -36,23 +48,23 @@ func (bpm *BufferPoolManager) Get(size uint) *[]uint8 {
 		bpm.mu.Unlock()
 	}
 
-	return pool.Get().(*[]uint8)
+	buf := pool.Get().(*bytes.Buffer)
+	bpm.logf("Returning buffer of size %d: %p\n", buf.Cap(), buf)
+	return buf
 }
 
-func (bpm *BufferPoolManager) Put(buf *[]uint8) {
+func (bpm *BufferPoolManager) Put(buf *bytes.Buffer) {
-	size := uint(len(*buf))
+	size := buf.Cap()
 	bpm.mu.RLock()
 	pool, exists := bpm.pools[size]
 	bpm.mu.RUnlock()
 
 	if !exists {
+		bpm.logf("Cannot return %p, No pool for size %d\n", buf, size)
 		return
 	}
 
-	// Clear buffer
+	buf.Reset()
-	for i := range *buf {
-		(*buf)[i] = 0
-	}
-
 	pool.Put(buf)
+	bpm.logf("Returned buffer of size %d: %p\n", size, buf)
 }

pdu/bufpool_test.go

@@ -10,14 +10,14 @@ func TestRetrieveBufferOfRequestedSize(t *testing.T) {
 	bpm := NewBufferPoolManager()
 
 	size := 1024
-	buffer := bpm.Get(uint(size))
+	buffer := bpm.Get(size)
 
 	if buffer == nil {
 		t.Fatalf("Expected buffer, got nil")
 	}
 
-	if len(*buffer) != size {
+	if buffer.Cap() != size {
-		t.Errorf("Expected buffer size %d, got %d", size, len(*buffer))
+		t.Errorf("Expected buffer size %d, got %d", size, buffer.Cap())
 	}
 }
 
@@ -25,14 +25,14 @@ func TestRequestBufferSizeZero(t *testing.T) {
 	bpm := NewBufferPoolManager()
 
 	size := 0
-	buffer := bpm.Get(uint(size))
+	buffer := bpm.Get(size)
 
 	if buffer == nil {
 		t.Fatalf("Expected buffer, got nil")
 	}
 
-	if len(*buffer) != size {
+	if buffer.Cap() != size {
-		t.Errorf("Expected buffer size %d, got %d", size, len(*buffer))
+		t.Errorf("Expected buffer size %d, got %d", size, buffer.Cap())
 	}
 }
 
@@ -47,12 +47,12 @@ func TestConcurrentAccessToBufferPool(t *testing.T) {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			buffer := bpm.Get(uint(size))
+			buffer := bpm.Get(size)
 			if buffer == nil {
 				t.Errorf("Expected buffer, got nil")
 			}
-			if len(*buffer) != size {
+			if buffer.Cap() != size {
-				t.Errorf("Expected buffer size %d, got %d", size, len(*buffer))
+				t.Errorf("Expected buffer size %d, got %d", size, buffer.Cap())
 			}
 		}()
 	}
@@ -64,14 +64,14 @@ func TestGetBufferLockUnlock(t *testing.T) {
 	bpm := NewBufferPoolManager()
 
 	size := 1024
-	buffer := bpm.Get(uint(size))
+	buffer := bpm.Get(size)
 
 	if buffer == nil {
 		t.Fatalf("Expected buffer, got nil")
 	}
 
-	if len(*buffer) != size {
+	if buffer.Cap() != size {
-		t.Errorf("Expected buffer size %d, got %d", size, len(*buffer))
+		t.Errorf("Expected buffer size %d, got %d", size, buffer.Cap())
 	}
 }
 
@@ -79,14 +79,14 @@ func TestVerifyPoolCreationForNewSizes(t *testing.T) {
 	bpm := NewBufferPoolManager()
 
 	size := 512
-	buffer := bpm.Get(uint(size))
+	buffer := bpm.Get(size)
 
 	if buffer == nil {
 		t.Fatalf("Expected buffer, got nil")
 	}
 
-	if len(*buffer) != size {
+	if buffer.Cap() != size {
-		t.Errorf("Expected buffer size %d, got %d", size, len(*buffer))
+		t.Errorf("Expected buffer size %d, got %d", size, buffer.Cap())
 	}
 }
 
@@ -94,14 +94,14 @@ func TestBufferPoolManagerGetBuffer(t *testing.T) {
 	bpm := NewBufferPoolManager()
 
 	size := 1024
-	buffer := bpm.Get(uint(size))
+	buffer := bpm.Get(size)
 
 	if buffer == nil {
 		t.Fatalf("Expected buffer, got nil")
 	}
 
-	if len(*buffer) != size {
+	if buffer.Cap() != size {
-		t.Errorf("Expected buffer size %d, got %d", size, len(*buffer))
+		t.Errorf("Expected buffer size %d, got %d", size, buffer.Cap())
 	}
 }
 
@@ -110,14 +110,14 @@ func TestGetBufferWithMultipleSizes(t *testing.T) {
 
 	sizes := []int{512, 1024, 2048}
 	for _, size := range sizes {
-		buffer := bpm.Get(uint(size))
+		buffer := bpm.Get(size)
 
 		if buffer == nil {
 			t.Fatalf("Expected buffer for size %d, got nil", size)
 		}
 
-		if len(*buffer) != size {
+		if buffer.Cap() != size {
-			t.Errorf("Expected buffer size %d, got %d", size, len(*buffer))
+			t.Errorf("Expected buffer size %d, got %d", size, buffer.Cap())
 		}
 	}
 }
@@ -125,7 +125,7 @@ func TestGetBufferWithMultipleSizes(t *testing.T) {
 func TestGetBufferIsAlwaysZero(t *testing.T) {
 	bpm := NewBufferPoolManager()
 
-	var size uint = 1024 * 64
+	size := 1024 * 64
 	for i := 0; i < 1000; i++ {
 		buffer := bpm.Get(size)
 
@@ -133,11 +133,11 @@ func TestGetBufferIsAlwaysZero(t *testing.T) {
 			t.Fatalf("Expected buffer for size %d, got nil", size)
 		}
 
-		if uint(len(*buffer)) != size {
+		if buffer.Cap() != size {
-			t.Errorf("Expected buffer size %d, got %d", size, len(*buffer))
+			t.Errorf("Expected buffer size %d, got %d", size, buffer.Cap())
 		}
 
-		for _, b := range *buffer {
+		for _, b := range buffer.Bytes() {
 			if b != 0 {
 				t.Errorf("Expected buffer to be zero, got %d", b)
 			}
@@ -147,9 +147,26 @@ func TestGetBufferIsAlwaysZero(t *testing.T) {
 	}
 }
 
+func TestPoolReusesBuffers(t *testing.T) {
+	bpm := NewBufferPoolManager()
+
+	size := 1024
+	buffer := bpm.Get(size)
+	initialPtr := buffer
+	bpm.Put(buffer)
+	for i := 0; i < 1000; i++ {
+		buffer = bpm.Get(size)
+		if buffer != initialPtr {
+			t.Errorf("Expected initial buffer (%p) to be reused, got %p", initialPtr, buffer)
+		}
+		bpm.Put(buffer)
+	}
+}
+
+// region benchmark
 func BenchmarkBufferPoolManager(b *testing.B) {
 	bpm := NewBufferPoolManager()
-	bufSize := uint(128 * 1024) // a PDU should not be larger than this... Even this is way too large
+	bufSize := 128 * 1024 // a PDU should not be larger than this... Even this is way too large
 
 	b.ResetTimer()
 
@@ -163,7 +180,7 @@ func BenchmarkBufferPoolManager(b *testing.B) {
 
 func BenchmarkBufferPoolManager_Concurrent(b *testing.B) {
 	bpm := NewBufferPoolManager()
-	bufSize := uint(128 * 1024) // a PDU should not be larger than this... Even this is vway too large
+	bufSize := 128 * 1024 // a PDU should not be larger than this... Even this is way too large
 
 	b.ResetTimer()
 
@@ -186,17 +203,17 @@ func BenchmarkBufferPoolManager_Concurrent(b *testing.B) {
 
 func BenchmarkBufferPoolManager_Memory(b *testing.B) {
 	bpm := NewBufferPoolManager()
-	bufSize := uint(128 * 1024) // a PDU should not be larger than this... Even this is vway too large
+	bufSize := 128 * 1024 // a PDU should not be larger than this... Even this is way too large
 	b.ResetTimer()
 
-	var i uint8
+	var i byte
 	buf := bpm.Get(bufSize)
 	b.StopTimer()
 
 	// Simulate some work
 	time.Sleep(10 * time.Millisecond)
-	for k := range *buf {
+	for range buf.Bytes() {
-		(*buf)[k] = i % 255
+		buf.WriteByte(i % 255)
 	}
 
 	b.StartTimer()

pdu/cancel.go

@@ -2,17 +2,17 @@ package pdu
 
 type (
 	CANCEL_SM struct {
-		header           PDU_HEADER
+		Header           *PDU_HEADER
-		service_type     string
+		Service_type     string
-		message_id       string
+		Message_id       string
-		source_addr_ton  uint8
+		Source_addr_ton  byte
-		source_addr_npi  uint8
+		Source_addr_npi  byte
-		source_addr      string
+		Source_addr      string
-		dest_addr_ton    uint8
+		Dest_addr_ton    byte
-		dest_addr_npi    uint8
+		Dest_addr_npi    byte
-		destination_addr string
+		Destination_addr string
 	}
 	CANCEL_SM_RESP struct {
-		header PDU_HEADER
+		Header *PDU_HEADER
 	}
 )

pdu/deliver.go

@@ -2,11 +2,11 @@ package pdu
 
 type (
 	DELIVER_SM struct {
-		header PDU_HEADER
+		Header *PDU_HEADER
 		SUBMIT_SM
 	}
 	DELIVER_SM_RESP struct {
-		header PDU_HEADER
+		Header *PDU_HEADER
 		SUBMIT_SM_RESP
 	}
 )

pdu/enquire.go

@@ -2,9 +2,9 @@ package pdu
 
 type (
 	ENQUIRE_LINK struct {
-		header PDU_HEADER
+		Header *PDU_HEADER
 	}
 	ENQUIRE_LINK_RESP struct {
-		header PDU_HEADER
+		Header *PDU_HEADER
 	}
 )

pdu/global.go

@@ -1,3 +1,5 @@
 package pdu
 
 var ByteBufferPool = NewBufferPoolManager()
+const NULL = byte(0x00)
+var NULL_ARR = []byte{NULL}

pdu/pdu.go

@@ -1,28 +1,29 @@
 package pdu
 
 import (
+	"bytes"
 	"encoding/binary"
 	"fmt"
 )
 
 type (
 	PDU interface {
-		EncodeInto(*[]uint8)
+		Encode(*bytes.Buffer) error
-		Encode() []uint8
+		Decode(*bytes.Buffer) error
-		Decode([]uint8)
 		// Size in bytes
-		Size() uint32
+		Size() int
+		UpdateSize()
 	}
 
 	PDU_HEADER struct {
-		command_length  uint32
+		Command_length  uint32
-		command_id      uint32
+		Command_id      uint32
-		command_status  uint32
+		Command_status  uint32
-		sequence_number uint32
+		Sequence_number uint32
 	}
 
 	GENERIC_NACK struct {
-		header PDU_HEADER
+		Header *PDU_HEADER
 	}
 )
 
@@ -57,41 +58,29 @@ type (
 // What are the other 0s?
 // Don't know
 
-func (p *PDU_HEADER) Encode() (*[]uint8, error) {
+func (p *PDU_HEADER) Encode(buf *bytes.Buffer) error {
-	buf := ByteBufferPool.Get(uint(p.Size()))
-	err := p.EncodeInto(buf)
-	return buf, err
-}
-func (p *PDU_HEADER) EncodeInto(buf *[]uint8) error {
 	if buf == nil {
-		return fmt.Errorf("cannot encode PDU_HEADER, buffer is nil")
+		return fmt.Errorf("cannot encode into nil buffer")
 	}
-	if len(*buf) < 16 {
+	binary.Write(buf, binary.BigEndian, p.Command_length)
-		return fmt.Errorf("cannot encode PDU_HEADER, buffer too small (%d, required 16)", len(*buf))
+	binary.Write(buf, binary.BigEndian, p.Command_id)
-	}
+	binary.Write(buf, binary.BigEndian, p.Command_status)
-	bufVal := *buf
+	binary.Write(buf, binary.BigEndian, p.Sequence_number)
-	binary.BigEndian.PutUint32(bufVal[0:4], p.command_length)
-	binary.BigEndian.PutUint32(bufVal[4:8], p.command_id)
-	binary.BigEndian.PutUint32(bufVal[8:12], p.command_status)
-	binary.BigEndian.PutUint32(bufVal[12:16], p.sequence_number)
 	return nil
 }
-func (p *PDU_HEADER) Decode(data []uint8) error {
+func (p *PDU_HEADER) Decode(buf *bytes.Buffer) error {
-	if len(data) >= 4 {
+	if buf == nil {
-		p.command_length = binary.BigEndian.Uint32(data[0:4])
+		return fmt.Errorf("cannot decode nil buffer")
-	}
-	if len(data) >= 8 {
-		p.command_id = binary.BigEndian.Uint32(data[4:8])
-	}
-	if len(data) >= 12 {
-		p.command_status = binary.BigEndian.Uint32(data[8:12])
-
-	}
-	if len(data) >= 16 {
-		p.sequence_number = binary.BigEndian.Uint32(data[12:16])
 	}
+	binary.Read(buf, binary.BigEndian, &p.Command_length)
+	binary.Read(buf, binary.BigEndian, &p.Command_id)
+	binary.Read(buf, binary.BigEndian, &p.Command_status)
+	binary.Read(buf, binary.BigEndian, &p.Sequence_number)
 	return nil
 }
-func (p *PDU_HEADER) Size() uint32 {
+func (p *PDU_HEADER) Size() int {
 	return 16
 }
+func (p *PDU_HEADER) UpdateSize() {
+	p.Command_length = uint32(p.Size())
+}

pdu/pdu_test.go

@@ -1,6 +1,7 @@
 package pdu
 
 import (
+	"bytes"
 	"encoding/binary"
 	"math"
 	"sync"
@@ -10,37 +11,41 @@ import (
 // region encode
 func TestEncodeReturnsByteSliceOfLength16(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  1,
+		Command_length:  1,
-		command_id:      1,
+		Command_id:      1,
-		command_status:  1,
+		Command_status:  1,
-		sequence_number: 1,
+		Sequence_number: 1,
 	}
-	result, err := p.Encode()
+	buf := bytes.NewBuffer(make([]byte, 16))
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
-	if len(*result) != 16 {
+	if buf.Cap() != 16 {
-		t.Errorf("Expected byte slice of length 16, got %d", len(*result))
+		t.Errorf("Expected byte slice of length 16, got %d", buf.Cap())
 	}
 }
 
 func TestEncodeHandlesZeroValues(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  0,
+		Command_length:  0,
-		command_id:      0,
+		Command_id:      0,
-		command_status:  0,
+		Command_status:  0,
-		sequence_number: 0,
+		Sequence_number: 0,
 	}
-	result, err := p.Encode()
+	buf := bytes.NewBuffer(make([]byte, 16))
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
-	expected := make([]uint8, 16)
+	expected := make([]byte, 16)
-	for i, v := range *result {
+	for i, v := range buf.Bytes() {
 		if v != expected[i] {
-			t.Errorf("Expected byte slice with zero values, got %v", *result)
+			t.Errorf("Expected byte slice with zero values, got %v", buf.Bytes())
 			break
 		}
 	}
@@ -48,21 +53,23 @@ func TestEncodeHandlesZeroValues(t *testing.T) {
 
 func TestEncodeEncodesProperly(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  1,
+		Command_length:  1,
-		command_id:      2,
+		Command_id:      2,
-		command_status:  3,
+		Command_status:  3,
-		sequence_number: 4,
+		Sequence_number: 4,
 	}
-	result, err := p.Encode()
+	buf := bytes.NewBuffer(make([]byte, 16))
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	expected := []uint8{0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4}
+	expected := []byte{0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3, 0, 0, 0, 4}
-	for i, v := range *result {
+	for i, v := range buf.Bytes() {
 		if v != expected[i] {
-			t.Errorf("Expected byte slice with values %v, got %v", expected, *result)
+			t.Errorf("Expected byte slice with values %v, got %v", expected, buf.Bytes())
 			break
 		}
 	}
@@ -70,21 +77,23 @@ func TestEncodeEncodesProperly(t *testing.T) {
 
 func TestEncodeEncodesProperlyComplex(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  13426724,
+		Command_length:  13426724,
-		command_id:      254352,
+		Command_id:      254352,
-		command_status:  35634264,
+		Command_status:  35634264,
-		sequence_number: 476543523,
+		Sequence_number: 476543523,
 	}
-	result, err := p.Encode()
+	buf := bytes.NewBuffer(make([]byte, 16))
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	expected := []uint8{0, 204, 224, 36, 0, 3, 225, 144, 2, 31, 188, 88, 28, 103, 122, 35}
+	expected := []byte{0, 204, 224, 36, 0, 3, 225, 144, 2, 31, 188, 88, 28, 103, 122, 35}
-	for i, v := range *result {
+	for i, v := range buf.Bytes() {
 		if v != expected[i] {
-			t.Errorf("Expected byte slice with values %v, got %v", expected, *result)
+			t.Errorf("Expected byte slice with values %v, got %v", expected, buf.Bytes())
 			break
 		}
 	}
@@ -92,217 +101,198 @@ func TestEncodeEncodesProperlyComplex(t *testing.T) {
 
 func TestEncodeIntoCorrectlyEncodesFields(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  16,
+		Command_length:  16,
-		command_id:      1,
+		Command_id:      1,
-		command_status:  0,
+		Command_status:  0,
-		sequence_number: 12345,
+		Sequence_number: 12345,
 	}
-	buf := make([]uint8, 16)
+	buf := bytes.NewBuffer(make([]byte, 16))
-	err := p.EncodeInto(&buf)
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if binary.BigEndian.Uint32(buf[0:4]) != p.command_length {
+	innerbuf := buf.Bytes()
-		t.Errorf("Expected command_length %d, got %d", p.command_length, binary.BigEndian.Uint32(buf[0:4]))
+	if binary.BigEndian.Uint32(innerbuf[0:4]) != p.Command_length {
+		t.Errorf("Expected command_length %d, got %d", p.Command_length, binary.BigEndian.Uint32(innerbuf[0:4]))
 	}
-	if binary.BigEndian.Uint32(buf[4:8]) != p.command_id {
+	if binary.BigEndian.Uint32(innerbuf[4:8]) != p.Command_id {
-		t.Errorf("Expected command_id %d, got %d", p.command_id, binary.BigEndian.Uint32(buf[4:8]))
+		t.Errorf("Expected command_id %d, got %d", p.Command_id, binary.BigEndian.Uint32(innerbuf[4:8]))
 	}
-	if binary.BigEndian.Uint32(buf[8:12]) != p.command_status {
+	if binary.BigEndian.Uint32(innerbuf[8:12]) != p.Command_status {
-		t.Errorf("Expected command_status %d, got %d", p.command_status, binary.BigEndian.Uint32(buf[8:12]))
+		t.Errorf("Expected command_status %d, got %d", p.Command_status, binary.BigEndian.Uint32(innerbuf[8:12]))
 	}
-	if binary.BigEndian.Uint32(buf[12:16]) != p.sequence_number {
+	if binary.BigEndian.Uint32(innerbuf[12:16]) != p.Sequence_number {
-		t.Errorf("Expected sequence_number %d, got %d", p.sequence_number, binary.BigEndian.Uint32(buf[12:16]))
+		t.Errorf("Expected sequence_number %d, got %d", p.Sequence_number, binary.BigEndian.Uint32(innerbuf[12:16]))
-	}
-}
-
-func TestEncodeIntoHandlesNilBuffer(t *testing.T) {
-	p := &PDU_HEADER{
-		command_length:  16,
-		command_id:      1,
-		command_status:  0,
-		sequence_number: 12345,
-	}
-	var buf *[]uint8 = nil
-
-	err := p.EncodeInto(buf)
-	if err == nil {
-		t.Errorf("Expected error when buffer is nil")
-	}
-}
-
-func TestEncodeIntoHandlesSmallerBuffer(t *testing.T) {
-	p := &PDU_HEADER{
-		command_length:  16,
-		command_id:      1,
-		command_status:  0,
-		sequence_number: 12345,
-	}
-	buf := make([]uint8, 12) // smaller buffer size
-
-	err := p.EncodeInto(&buf)
-	if err == nil {
-		t.Errorf("Expected error when buffer is too small")
 	}
 }
 
 func TestEncodeIntoHandlesLargerBuffer(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  16,
+		Command_length:  16,
-		command_id:      1,
+		Command_id:      1,
-		command_status:  0,
+		Command_status:  0,
-		sequence_number: 12345,
+		Sequence_number: 12345,
 	}
-	buf := make([]uint8, 20)
+	buf := bytes.NewBuffer(make([]byte, 20)) // larger buffer size
-	err := p.EncodeInto(&buf)
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if binary.BigEndian.Uint32(buf[0:4]) != p.command_length {
+	innerbuf := buf.Bytes()
-		t.Errorf("Expected command_length %d, got %d", p.command_length, binary.BigEndian.Uint32(buf[0:4]))
+	if binary.BigEndian.Uint32(innerbuf[0:4]) != p.Command_length {
+		t.Errorf("Expected command_length %d, got %d", p.Command_length, binary.BigEndian.Uint32(innerbuf[0:4]))
 	}
-	if binary.BigEndian.Uint32(buf[4:8]) != p.command_id {
+	if binary.BigEndian.Uint32(innerbuf[4:8]) != p.Command_id {
-		t.Errorf("Expected command_id %d, got %d", p.command_id, binary.BigEndian.Uint32(buf[4:8]))
+		t.Errorf("Expected command_id %d, got %d", p.Command_id, binary.BigEndian.Uint32(innerbuf[4:8]))
 	}
-	if binary.BigEndian.Uint32(buf[8:12]) != p.command_status {
+	if binary.BigEndian.Uint32(innerbuf[8:12]) != p.Command_status {
-		t.Errorf("Expected command_status %d, got %d", p.command_status, binary.BigEndian.Uint32(buf[8:12]))
+		t.Errorf("Expected command_status %d, got %d", p.Command_status, binary.BigEndian.Uint32(innerbuf[8:12]))
 	}
-	if binary.BigEndian.Uint32(buf[12:16]) != p.sequence_number {
+	if binary.BigEndian.Uint32(innerbuf[12:16]) != p.Sequence_number {
-		t.Errorf("Expected sequence_number %d, got %d", p.sequence_number, binary.BigEndian.Uint32(buf[12:16]))
+		t.Errorf("Expected sequence_number %d, got %d", p.Sequence_number, binary.BigEndian.Uint32(innerbuf[12:16]))
 	}
 }
 
 func TestEncodeIntoUsesBigEndianEncoding(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  16,
+		Command_length:  16,
-		command_id:      1,
+		Command_id:      1,
-		command_status:  0,
+		Command_status:  0,
-		sequence_number: 12345,
+		Sequence_number: 12345,
 	}
-	buf := make([]uint8, 16)
+	buf := bytes.NewBuffer(make([]byte, 16))
-	err := p.EncodeInto(&buf)
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if binary.BigEndian.Uint32(buf[0:4]) != p.command_length {
+	innerbuf := buf.Bytes()
-		t.Errorf("Expected command_length %d, got %d", p.command_length, binary.BigEndian.Uint32(buf[0:4]))
+	if binary.BigEndian.Uint32(innerbuf[0:4]) != p.Command_length {
+		t.Errorf("Expected command_length %d, got %d", p.Command_length, binary.BigEndian.Uint32(innerbuf[0:4]))
 	}
-	if binary.BigEndian.Uint32(buf[4:8]) != p.command_id {
+	if binary.BigEndian.Uint32(innerbuf[4:8]) != p.Command_id {
-		t.Errorf("Expected command_id %d, got %d", p.command_id, binary.BigEndian.Uint32(buf[4:8]))
+		t.Errorf("Expected command_id %d, got %d", p.Command_id, binary.BigEndian.Uint32(innerbuf[4:8]))
 	}
-	if binary.BigEndian.Uint32(buf[8:12]) != p.command_status {
+	if binary.BigEndian.Uint32(innerbuf[8:12]) != p.Command_status {
-		t.Errorf("Expected command_status %d, got %d", p.command_status, binary.BigEndian.Uint32(buf[8:12]))
+		t.Errorf("Expected command_status %d, got %d", p.Command_status, binary.BigEndian.Uint32(innerbuf[8:12]))
 	}
-	if binary.BigEndian.Uint32(buf[12:16]) != p.sequence_number {
+	if binary.BigEndian.Uint32(innerbuf[12:16]) != p.Sequence_number {
-		t.Errorf("Expected sequence_number %d, got %d", p.sequence_number, binary.BigEndian.Uint32(buf[12:16]))
+		t.Errorf("Expected sequence_number %d, got %d", p.Sequence_number, binary.BigEndian.Uint32(innerbuf[12:16]))
 	}
 }
 
 func TestEncodeIntoConcurrencySafety(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  16,
+		Command_length:  16,
-		command_id:      1,
+		Command_id:      1,
-		command_status:  0,
+		Command_status:  0,
-		sequence_number: 12345,
+		Sequence_number: 12345,
 	}
-	buf := make([]uint8, 16)
+	buf := bytes.NewBuffer(make([]byte, 16))
+	buf.Reset()
 	var wg sync.WaitGroup
 	for i := 0; i < 1000; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			p.EncodeInto(&buf)
+			p.Encode(buf)
 		}()
 	}
 	wg.Wait()
 
-	if binary.BigEndian.Uint32(buf[0:4]) != p.command_length {
+	innerbuf := buf.Bytes()
-		t.Errorf("Expected command_length %d, got %d", p.command_length, binary.BigEndian.Uint32(buf[0:4]))
+	if binary.BigEndian.Uint32(innerbuf[0:4]) != p.Command_length {
+		t.Errorf("Expected command_length %d, got %d", p.Command_length, binary.BigEndian.Uint32(innerbuf[0:4]))
 	}
-	if binary.BigEndian.Uint32(buf[4:8]) != p.command_id {
+	if binary.BigEndian.Uint32(innerbuf[4:8]) != p.Command_id {
-		t.Errorf("Expected command_id %d, got %d", p.command_id, binary.BigEndian.Uint32(buf[4:8]))
+		t.Errorf("Expected command_id %d, got %d", p.Command_id, binary.BigEndian.Uint32(innerbuf[4:8]))
 	}
-	if binary.BigEndian.Uint32(buf[8:12]) != p.command_status {
+	if binary.BigEndian.Uint32(innerbuf[8:12]) != p.Command_status {
-		t.Errorf("Expected command_status %d, got %d", p.command_status, binary.BigEndian.Uint32(buf[8:12]))
+		t.Errorf("Expected command_status %d, got %d", p.Command_status, binary.BigEndian.Uint32(innerbuf[8:12]))
 	}
-	if binary.BigEndian.Uint32(buf[12:16]) != p.sequence_number {
+	if binary.BigEndian.Uint32(innerbuf[12:16]) != p.Sequence_number {
-		t.Errorf("Expected sequence_number %d, got %d", p.sequence_number, binary.BigEndian.Uint32(buf[12:16]))
+		t.Errorf("Expected sequence_number %d, got %d", p.Sequence_number, binary.BigEndian.Uint32(innerbuf[12:16]))
 	}
 }
 
 func TestEncodeIntoWithMaximumValues(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  math.MaxUint32,
+		Command_length:  math.MaxUint32,
-		command_id:      math.MaxUint32,
+		Command_id:      math.MaxUint32,
-		command_status:  math.MaxUint32,
+		Command_status:  math.MaxUint32,
-		sequence_number: math.MaxUint32,
+		Sequence_number: math.MaxUint32,
 	}
-	buf := make([]uint8, 16)
+	buf := bytes.NewBuffer(make([]byte, 16))
-	err := p.EncodeInto(&buf)
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if binary.BigEndian.Uint32(buf[0:4]) != p.command_length {
+	innerbuf := buf.Bytes()
-		t.Errorf("Expected command_length %d, got %d", p.command_length, binary.BigEndian.Uint32(buf[0:4]))
+	if binary.BigEndian.Uint32(innerbuf[0:4]) != p.Command_length {
+		t.Errorf("Expected command_length %d, got %d", p.Command_length, binary.BigEndian.Uint32(innerbuf[0:4]))
 	}
-	if binary.BigEndian.Uint32(buf[4:8]) != p.command_id {
+	if binary.BigEndian.Uint32(innerbuf[4:8]) != p.Command_id {
-		t.Errorf("Expected command_id %d, got %d", p.command_id, binary.BigEndian.Uint32(buf[4:8]))
+		t.Errorf("Expected command_id %d, got %d", p.Command_id, binary.BigEndian.Uint32(innerbuf[4:8]))
 	}
-	if binary.BigEndian.Uint32(buf[8:12]) != p.command_status {
+	if binary.BigEndian.Uint32(innerbuf[8:12]) != p.Command_status {
-		t.Errorf("Expected command_status %d, got %d", p.command_status, binary.BigEndian.Uint32(buf[8:12]))
+		t.Errorf("Expected command_status %d, got %d", p.Command_status, binary.BigEndian.Uint32(innerbuf[8:12]))
 	}
-	if binary.BigEndian.Uint32(buf[12:16]) != p.sequence_number {
+	if binary.BigEndian.Uint32(innerbuf[12:16]) != p.Sequence_number {
-		t.Errorf("Expected sequence_number %d, got %d", p.sequence_number, binary.BigEndian.Uint32(buf[12:16]))
+		t.Errorf("Expected sequence_number %d, got %d", p.Sequence_number, binary.BigEndian.Uint32(innerbuf[12:16]))
 	}
 }
 
 func TestEncodeIntoWithBoundaryValues(t *testing.T) {
 	p := &PDU_HEADER{
-		command_length:  0,
+		Command_length:  0,
-		command_id:      0,
+		Command_id:      0,
-		command_status:  0,
+		Command_status:  0,
-		sequence_number: 0,
+		Sequence_number: 0,
 	}
-	buf := make([]uint8, 16)
+	buf := bytes.NewBuffer(make([]byte, 16))
-	err := p.EncodeInto(&buf)
+	buf.Reset()
+	err := p.Encode(buf)
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if binary.BigEndian.Uint32(buf[0:4]) != p.command_length {
+	innerbuf := buf.Bytes()
-		t.Errorf("Expected command_length %d, got %d", p.command_length, binary.BigEndian.Uint32(buf[0:4]))
+	if binary.BigEndian.Uint32(innerbuf[0:4]) != p.Command_length {
+		t.Errorf("Expected command_length %d, got %d", p.Command_length, binary.BigEndian.Uint32(innerbuf[0:4]))
 	}
-	if binary.BigEndian.Uint32(buf[4:8]) != p.command_id {
+	if binary.BigEndian.Uint32(innerbuf[4:8]) != p.Command_id {
-		t.Errorf("Expected command_id %d, got %d", p.command_id, binary.BigEndian.Uint32(buf[4:8]))
+		t.Errorf("Expected command_id %d, got %d", p.Command_id, binary.BigEndian.Uint32(innerbuf[4:8]))
 	}
-	if binary.BigEndian.Uint32(buf[8:12]) != p.command_status {
+	if binary.BigEndian.Uint32(innerbuf[8:12]) != p.Command_status {
-		t.Errorf("Expected command_status %d, got %d", p.command_status, binary.BigEndian.Uint32(buf[8:12]))
+		t.Errorf("Expected command_status %d, got %d", p.Command_status, binary.BigEndian.Uint32(innerbuf[8:12]))
 	}
-	if binary.BigEndian.Uint32(buf[12:16]) != p.sequence_number {
+	if binary.BigEndian.Uint32(innerbuf[12:16]) != p.Sequence_number {
-		t.Errorf("Expected sequence_number %d, got %d", p.sequence_number, binary.BigEndian.Uint32(buf[12:16]))
+		t.Errorf("Expected sequence_number %d, got %d", p.Sequence_number, binary.BigEndian.Uint32(innerbuf[12:16]))
 	}
 }
 
-
 // region decode
 func TestDecodeHandlesShortByteSlice(t *testing.T) {
 	var p PDU_HEADER
-	data := []uint8{0, 0, 0, 10}
+	data := []byte{0, 0, 0, 10}
 	defer func() {
 		if r := recover(); r != nil {
 			t.Errorf("Decode panicked with short byte slice")
 		}
 	}()
-	err := p.Decode(data)
+	err := p.Decode(bytes.NewBuffer(data))
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
@@ -310,36 +300,36 @@ func TestDecodeHandlesShortByteSlice(t *testing.T) {
 
 func TestDecodeParsesValidByteSlice(t *testing.T) {
 	var p PDU_HEADER
-	data := []uint8{0, 0, 0, 16, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3}
+	data := []byte{0, 0, 0, 16, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3}
-	err := p.Decode(data)
+	err := p.Decode(bytes.NewBuffer(data))
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if p.command_length != 16 {
+	if p.Command_length != 16 {
-		t.Errorf("Expected command_length to be 16, got %d", p.command_length)
+		t.Errorf("Expected command_length to be 16, got %d", p.Command_length)
 	}
-	if p.command_id != 1 {
+	if p.Command_id != 1 {
-		t.Errorf("Expected command_id to be 1, got %d", p.command_id)
+		t.Errorf("Expected command_id to be 1, got %d", p.Command_id)
 	}
-	if p.command_status != 2 {
+	if p.Command_status != 2 {
-		t.Errorf("Expected command_status to be 2, got %d", p.command_status)
+		t.Errorf("Expected command_status to be 2, got %d", p.Command_status)
 	}
-	if p.sequence_number != 3 {
+	if p.Sequence_number != 3 {
-		t.Errorf("Expected sequence_number to be 3, got %d", p.sequence_number)
+		t.Errorf("Expected sequence_number to be 3, got %d", p.Sequence_number)
 	}
 }
 
 func TestDecodeHandlesLongerByteSliceWithoutCrashing(t *testing.T) {
 	var p PDU_HEADER
-	data := make([]uint8, 20)
+	data := make([]byte, 20)
 	defer func() {
 		if r := recover(); r != nil {
 			t.Errorf("Decode panicked with long byte slice")
 		}
 	}()
-	err := p.Decode(data)
+	err := p.Decode(bytes.NewBuffer(data))
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
@@ -349,54 +339,54 @@ func TestDecodeHandlesNilDataInput(t *testing.T) {
 	var p PDU_HEADER
 	err := p.Decode(nil)
 
-	if err != nil {
+	if err == nil {
-		t.Errorf("Expected no error, got %v", err)
+		t.Errorf("Expected error, got none")
 	}
 
-	if p.command_length != 0 {
+	if p.Command_length != 0 {
-		t.Errorf("Expected command_length to be 0, got %d", p.command_length)
+		t.Errorf("Expected command_length to be 0, got %d", p.Command_length)
 	}
-	if p.command_id != 0 {
+	if p.Command_id != 0 {
-		t.Errorf("Expected command_id to be 0, got %d", p.command_id)
+		t.Errorf("Expected command_id to be 0, got %d", p.Command_id)
 	}
-	if p.command_status != 0 {
+	if p.Command_status != 0 {
-		t.Errorf("Expected command_status to be 0, got %d", p.command_status)
+		t.Errorf("Expected command_status to be 0, got %d", p.Command_status)
 	}
-	if p.sequence_number != 0 {
+	if p.Sequence_number != 0 {
-		t.Errorf("Expected sequence_number to be 0, got %d", p.sequence_number)
+		t.Errorf("Expected sequence_number to be 0, got %d", p.Sequence_number)
 	}
 }
 
 func TestDecodeHandlesEmptyByteSliceGracefully(t *testing.T) {
 	var p PDU_HEADER
-	data := []uint8{}
+	data := []byte{}
-	err := p.Decode(data)
+	err := p.Decode(bytes.NewBuffer(data))
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if p.command_length != 0 {
+	if p.Command_length != 0 {
-		t.Errorf("Expected command_length to be 0, got %d", p.command_length)
+		t.Errorf("Expected command_length to be 0, got %d", p.Command_length)
 	}
-	if p.command_id != 0 {
+	if p.Command_id != 0 {
-		t.Errorf("Expected command_id to be 0, got %d", p.command_id)
+		t.Errorf("Expected command_id to be 0, got %d", p.Command_id)
 	}
-	if p.command_status != 0 {
+	if p.Command_status != 0 {
-		t.Errorf("Expected command_status to be 0, got %d", p.command_status)
+		t.Errorf("Expected command_status to be 0, got %d", p.Command_status)
 	}
-	if p.sequence_number != 0 {
+	if p.Sequence_number != 0 {
-		t.Errorf("Expected sequence_number to be 0, got %d", p.sequence_number)
+		t.Errorf("Expected sequence_number to be 0, got %d", p.Sequence_number)
 	}
 }
 
 func TestDecodeDoesNotModifyInputByteSlice(t *testing.T) {
 	var p PDU_HEADER
-	data := []uint8{0, 0, 0, 16, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3}
+	data := []byte{0, 0, 0, 16, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3}
-	originalData := make([]uint8, len(data))
+	originalData := make([]byte, len(data))
 	copy(originalData, data)
 
-	err := p.Decode(data)
+	err := p.Decode(bytes.NewBuffer(data))
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
@@ -411,35 +401,35 @@ func TestDecodeDoesNotModifyInputByteSlice(t *testing.T) {
 
 func TestDecodeHandlesByteSlicesWithMaxUint32Values(t *testing.T) {
 	var p PDU_HEADER
-	data := []uint8{255, 255, 255, 255, 255, 255, 255, 255}
+	data := []byte{255, 255, 255, 255, 255, 255, 255, 255}
-	err := p.Decode(data)
+	err := p.Decode(bytes.NewBuffer(data))
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if p.command_length != math.MaxUint32 {
+	if p.Command_length != math.MaxUint32 {
-		t.Errorf("Expected command_length to be %d, got %d", math.MaxUint32, p.command_length)
+		t.Errorf("Expected command_length to be %d, got %d", math.MaxUint32, p.Command_length)
 	}
-	if p.command_id != math.MaxUint32 {
+	if p.Command_id != math.MaxUint32 {
-		t.Errorf("Expected command_id to be %d, got %d", math.MaxUint32, p.command_id)
+		t.Errorf("Expected command_id to be %d, got %d", math.MaxUint32, p.Command_id)
 	}
 }
 
 func TestDecodeHandlesByteSlicesWithMinimumUint32Values(t *testing.T) {
 	var p PDU_HEADER
-	data := []uint8{0, 0, 0, 0, 0, 0, 0, 0}
+	data := []byte{0, 0, 0, 0, 0, 0, 0, 0}
-	err := p.Decode(data)
+	err := p.Decode(bytes.NewBuffer(data))
 
 	if err != nil {
 		t.Errorf("Expected no error, got %v", err)
 	}
 
-	if p.command_length != 0 {
+	if p.Command_length != 0 {
-		t.Errorf("Expected command_length to be 0, got %d", p.command_length)
+		t.Errorf("Expected command_length to be 0, got %d", p.Command_length)
 	}
-	if p.command_id != 0 {
+	if p.Command_id != 0 {
-		t.Errorf("Expected command_id to be 0, got %d", p.command_id)
+		t.Errorf("Expected command_id to be 0, got %d", p.Command_id)
 	}
 }
 
@@ -452,41 +442,45 @@ func TestSizeReturns16(t *testing.T) {
 }
 
 // region benchmarks
-
 // With buffer pool
-func BenchmarkEncode(b *testing.B) {
+func BenchmarkEncodeWithBufferPool(b *testing.B) {
 	p := &PDU_HEADER{
-		command_length:  16,
+		Command_length:  16,
-		command_id:      1,
+		Command_id:      1,
-		command_status:  0,
+		Command_status:  0,
-		sequence_number: 12345,
+		Sequence_number: 12345,
 	}
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		p.Encode()
+		buf := ByteBufferPool.Get(p.Size())
+		p.Encode(buf)
+		ByteBufferPool.Put(buf)
 	}
 }
 
 // Without buffer pool
-func BenchmarkEncodeInto(b *testing.B) {
+func BenchmarkEncodeWithoutBufferPool(b *testing.B) {
 	p := &PDU_HEADER{
-		command_length:  16,
+		Command_length:  16,
-		command_id:      1,
+		Command_id:      1,
-		command_status:  0,
+		Command_status:  0,
-		sequence_number: 12345,
+		Sequence_number: 12345,
 	}
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		buf := make([]uint8, 16)
+		buf := bytes.Buffer{}
-		p.EncodeInto(&buf)
+		p.Encode(&buf)
 	}
 }
 
-func BenchmarkDecode(b *testing.B) {
+func BenchmarkDecodeBufferPool(b *testing.B) {
 	p := &PDU_HEADER{}
-	data := []uint8{0, 0, 0, 16, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3}
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		p.Decode(data)
+		data := []byte{0, 0, 0, 16, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3}
+		buf := ByteBufferPool.Get(len(data))
+		buf.Write(data)
+		p.Decode(buf)
+		ByteBufferPool.Put(buf)
 	}
 }

pdu/submit.go

@@ -1,104 +1,154 @@
 package pdu
 
-import "fmt"
+import (
+	"bytes"
+	"encoding/binary"
+	"fmt"
+
+	"smpptester/encoding"
+)
 
 type (
 	SUBMIT_SM struct {
-		header                 PDU_HEADER
+		Header                 *PDU_HEADER
-		service_type           string
+		Service_type           string
-		source_addr_ton        uint8
+		Source_addr_ton        byte
-		source_addr_npi        uint8
+		Source_addr_npi        byte
-		source_addr            string
+		Source_addr            string
-		dest_addr_ton          uint8
+		Dest_addr_ton          byte
-		dest_addr_npi          uint8
+		Dest_addr_npi          byte
-		destination_addr       string
+		Destination_addr       string
-		esm_class              uint8
+		Esm_class              byte
-		protocol_id            uint8
+		Protocol_id            byte
-		priority_flag          uint8
+		Priority_flag          byte
-		schedule_delivery_time string
+		Schedule_delivery_time string
-		validity_period        string
+		Validity_period        string
-		registered_delivery    uint8
+		Registered_delivery    byte
-		replace_if_present     uint8
+		Replace_if_present     byte
-		data_coding            uint8
+		Data_coding            byte
-		sm_default_msg_id      uint8
+		Sm_default_msg_id      byte
-		sm_length              uint8
+		Sm_length              byte
-		short_message          string
+		Short_message          string
 		// user_message_reference uint16
 		// source_port               uint16
-		// source_addr_subunit       uint8
+		// source_addr_subunit       byte
 		// destination_port          uint16
-		// dest_addr_subunit         uint8
+		// dest_addr_subunit         byte
 		// sar_msg_ref_num           uint16
-		// sar_total_segments        uint8
+		// sar_total_segments        byte
-		// sar_segment_seqnum        uint8
+		// sar_segment_seqnum        byte
-		// more_messages_to_send     uint8
+		// more_messages_to_send     byte
-		// payload_type              uint8
+		// payload_type              byte
 		// message_payload           string
-		// privacy_indicator         uint8
+		// privacy_indicator         byte
 		// callback_num              string
-		// callback_num_pres         uint8
+		// callback_num_pres         byte
 		// callback_num_atag         string
 		// source_subaddress         string
 		// dest_subaddress           string
-		// user_response_code        uint8
+		// user_response_code        byte
-		// display_time              uint8
+		// display_time              byte
-		// sms_signal                uint8
+		// sms_signal                byte
-		// ms_validity               uint8
+		// ms_validity               byte
-		// ms_msg_wait_facilities    uint8
+		// ms_msg_wait_facilities    byte
-		// number_of_messages        uint8
+		// number_of_messages        byte
-		// alert_on_message_delivery uint8
+		// alert_on_message_delivery byte
-		// language_indicator        uint8
+		// language_indicator        byte
-		// its_reply_type            uint8
+		// its_reply_type            byte
-		// its_session_info          uint8
+		// its_session_info          byte
-		// ussd_service_op           uint8
+		// ussd_service_op           byte
 	}
 	SUBMIT_SM_RESP struct {
-		header     PDU_HEADER
+		Header     *PDU_HEADER
-		message_id string
+		Message_id string
 	}
 	SUBMIT_MULTI      struct{}
 	SUBMIT_MULTI_RESP struct{}
 )
 
-func (p *SUBMIT_SM) Encode() (*[]byte, error) {
+// See https://www.codeproject.com/Tips/470755/Encoding-Decoding-7-bit-User-Data-for-SMS-PDU-PDU
-	buf := ByteBufferPool.Get(uint(p.Size()))
+// Another great site: https://doubleblak.com/blogPost.php?k=7bitpdu
-	err := p.EncodeInto(buf)
+
-	return buf, err
+func (p *SUBMIT_SM) Encode(buf *bytes.Buffer) error {
-}
-func (p *SUBMIT_SM) EncodeInto(buf *[]byte) error {
 	if buf == nil {
-		return fmt.Errorf("cannot encode SUBMIT_SM, buffer is nil")
+		return fmt.Errorf("cannot encode into nil buffer")
 	}
-	if len(*buf) < int(p.Size()) {
+	messageEncoder := p.GetEncoder()
-		return fmt.Errorf("cannot encode SUBMIT_SM, buffer too small (%d, required %d)", len(*buf), p.Size())
+
+	p.Header.Encode(buf)
+	// These should be ASCII but UTF8 is a superset of ASCII so hopefully this'll be fine
+	buf.WriteString(p.Service_type)
+	buf.Write(NULL_ARR)
+	binary.Write(buf, binary.BigEndian, p.Source_addr_ton)
+	binary.Write(buf, binary.BigEndian, p.Source_addr_npi)
+	buf.WriteString(p.Source_addr)
+	buf.Write(NULL_ARR)
+	binary.Write(buf, binary.BigEndian, p.Dest_addr_ton)
+	binary.Write(buf, binary.BigEndian, p.Dest_addr_npi)
+	buf.WriteString(p.Destination_addr)
+	buf.Write(NULL_ARR)
+	binary.Write(buf, binary.BigEndian, p.Esm_class)
+	binary.Write(buf, binary.BigEndian, p.Protocol_id)
+	binary.Write(buf, binary.BigEndian, p.Priority_flag)
+	buf.WriteString(p.Schedule_delivery_time)
+	buf.Write(NULL_ARR)
+	buf.WriteString(p.Validity_period)
+	buf.Write(NULL_ARR)
+	binary.Write(buf, binary.BigEndian, p.Registered_delivery)
+	binary.Write(buf, binary.BigEndian, p.Replace_if_present)
+	binary.Write(buf, binary.BigEndian, p.Data_coding)
+	binary.Write(buf, binary.BigEndian, p.Sm_default_msg_id)
+	binary.Write(buf, binary.BigEndian, p.Sm_length)
+	err := messageEncoder.Encode(&p.Short_message, buf)
+	if err != nil {
+		return err
 	}
-
-	p.header.EncodeInto(buf)
-
 	return nil
 }
-func (p *SUBMIT_SM) Decode(data []byte) {
+func (p *SUBMIT_SM) Decode(buf *bytes.Buffer) error {
+	if buf == nil {
+		return fmt.Errorf("cannot decode nil buffer")
 	}
-func (p *SUBMIT_SM) Size() uint32 {
+	return nil
-	var size uint32
+}
-	size += p.header.Size()
+func (p *SUBMIT_SM) Size() int {
-	size += uint32(len(p.service_type) * 1)
+	var size int
+	size += p.Header.Size()
+	size += 1 + len(p.Service_type)
 	size += 1 // source_addr_ton
 	size += 1 // source_addr_npi
-	size += uint32(len(p.source_addr) * 1)
+	size += 1 + len(p.Source_addr)
 	size += 1 // dest_addr_ton
 	size += 1 // dest_addr_npi
-	size += uint32(len(p.destination_addr) * 1)
+	size += 1 + len(p.Destination_addr)
 	size += 1 // esm_class
 	size += 1 // protocol_id
 	size += 1 // priority_flag
-	size += uint32(len(p.schedule_delivery_time) * 1)
+	size += 1 + len(p.Schedule_delivery_time)
-	size += uint32(len(p.validity_period) * 1)
+	size += 1 + len(p.Validity_period)
 	size += 1 // registered_delivery
 	size += 1 // replace_if_present
 	size += 1 // data_coding
 	size += 1 // sm_default_msg_id
 	size += 1 // sm_length
-	size += uint32(len(p.short_message) * 1)
+	size += p.GetEncoder().EncodesInto(&p.Short_message)
 	return size
 }
+func (p *SUBMIT_SM) UpdateSize() {
+	p.Header.Command_length = uint32(p.Size())
+	p.Sm_length = byte(p.GetEncoder().EncodesInto(&p.Short_message))
+}
+func (p *SUBMIT_SM) GetEncoder() encoding.Coder {
+	switch p.Data_coding {
+	case 0b00000000: // GSM7
+		return &encoding.GSM7Coder{}
+	case 0b00000001: // ASCII
+		return &encoding.ASCIICoder{}
+	// case 0b00000011: // LATIN1
+	// 	return &encoding.LATIN1Coder{}
+	case 0b00001000: // UCS2
+		return &encoding.UCS2Coder{}
+	default:
+		return &encoding.ASCIICoder{}
+	}
+}

pdu/submit_test.go

@@ -1,20 +1,119 @@
 package pdu
 
 import (
+	"bytes"
 	"testing"
 )
 
+// region encode
+// See examples: https://www.openmarket.com/docs/Content/apis/v4smpp/mt-examples.htm
+func TestEncodeFunctionCorrectlyEncodesAllFields(t *testing.T) {
+	p := &SUBMIT_SM{
+		Header: &PDU_HEADER{
+			Command_length:  0,
+			Command_id:      4,
+			Command_status:  0,
+			Sequence_number: 378019,
+		},
+		Service_type:           "OMV4",
+		Source_addr_ton:        3,
+		Source_addr_npi:        1,
+		Source_addr:            "80362",
+		Dest_addr_ton:          1,
+		Dest_addr_npi:          1,
+		Destination_addr:       "812345001000",
+		Esm_class:              0,
+		Protocol_id:            0,
+		Priority_flag:          0,
+		Schedule_delivery_time: "",
+		Validity_period:        "180105120000004+",
+		Registered_delivery:    1,
+		Data_coding:            1, // The example uses 0 and claims to use GSM but the message is encoded as ASCII...
+		Sm_default_msg_id:      0,
+		Short_message:          "Reply Yes to opt in or No to opt out.",
+	}
+	p.UpdateSize()
+	buf := ByteBufferPool.Get(p.Size())
+	err := p.Encode(buf)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	expected := []byte{0, 0, 0, 107, 0, 0, 0, 4, 0, 0, 0, 0, 0, 5, 196, 163, 79, 77, 86, 52, 0, 3, 1, 56, 48, 51, 54, 50, 0, 1, 1, 56, 49, 50, 51, 52, 53, 48, 48, 49, 48, 48, 48, 0, 0, 0, 0, 0, 49, 56, 48, 49, 48, 53, 49, 50, 48, 48, 48, 48, 48, 48, 52, 43, 0, 1, 0, 1, 0, 37, 82, 101, 112, 108, 121, 32, 89, 101, 115, 32, 116, 111, 32, 111, 112, 116, 32, 105, 110, 32, 111, 114, 32, 78, 111, 32, 116, 111, 32, 111, 112, 116, 32, 111, 117, 116, 46}
+	if !bytes.Equal(buf.Bytes(), expected) {
+		t.Fatalf("expected %v, got %v", expected, buf.Bytes())
+	}
+}
+
+func TestEncodeFunctionCorrectlyEncodesAllFieldsGSM7Message(t *testing.T) {
+	p := &SUBMIT_SM{
+		Header: &PDU_HEADER{
+			Command_length:  0,
+			Command_id:      4,
+			Command_status:  0,
+			Sequence_number: 378019,
+		},
+		Service_type:           "OMV4",
+		Source_addr_ton:        3,
+		Source_addr_npi:        1,
+		Source_addr:            "80362",
+		Dest_addr_ton:          1,
+		Dest_addr_npi:          1,
+		Destination_addr:       "812345001000",
+		Esm_class:              0,
+		Protocol_id:            0,
+		Priority_flag:          0,
+		Schedule_delivery_time: "",
+		Validity_period:        "180105120000004+",
+		Registered_delivery:    1,
+		Data_coding:            0, // The example uses 0 and claims to use GSM but the message is encoded as ASCII...
+		Sm_default_msg_id:      0,
+		Short_message:          "Reply Yes to opt in or No to opt out.",
+	}
+	p.UpdateSize()
+	buf := ByteBufferPool.Get(p.Size())
+	err := p.Encode(buf)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	expected := []byte{0, 0, 0, 103, 0, 0, 0, 4, 0, 0, 0, 0, 0, 5, 196, 163, 79, 77, 86, 52, 0, 3, 1, 56, 48, 51, 54, 50, 0, 1, 1, 56, 49, 50, 51, 52, 53, 48, 48, 49, 48, 48, 48, 0, 0, 0, 0, 0, 49, 56, 48, 49, 48, 53, 49, 50, 48, 48, 48, 48, 48, 48, 52, 43, 0, 1, 0, 0, 0, 33, 210, 50, 156, 157, 7, 101, 203, 115, 16, 253, 13, 122, 195, 233, 160, 180, 27, 244, 150, 131, 156, 111, 16, 253, 13, 122, 195, 233, 160, 119, 157, 238, 2}
+	if !bytes.Equal(buf.Bytes(), expected) {
+		t.Fatalf("expected %v, got %v", expected, buf.Bytes())
+	}
+}
+
+// region decode
+
 // region size
 func TestCalculateSizeTypicalInstance(t *testing.T) {
 	p := &SUBMIT_SM{
-		service_type:           "test_service",
+		Service_type:           "test_service",
-		source_addr:            "12345",
+		Source_addr:            "12345",
-		destination_addr:       "67890",
+		Destination_addr:       "67890",
-		schedule_delivery_time: "",
+		Schedule_delivery_time: "",
-		validity_period:        "",
+		Validity_period:        "",
-		short_message:          "Hello, World!",
+		Short_message:          "Hello, World!",
+		Data_coding:            1,
 	}
-	expectedSize := uint32(16 + len(p.service_type) + 1 + 1 + len(p.source_addr) + 1 + 1 + len(p.destination_addr) + 1 + 1 + 1 + len(p.schedule_delivery_time) + len(p.validity_period) + 1 + 1 + 1 + 1 + 1 + len(p.short_message))
+	expectedSize := 68
+	actualSize := p.Size()
+	if actualSize != expectedSize {
+		t.Errorf("Expected size %d, but got %d", expectedSize, actualSize)
+	}
+}
+
+func TestCalculateSizeTypicalGSM7Instance(t *testing.T) {
+	p := &SUBMIT_SM{
+		Service_type:           "test_service",
+		Source_addr:            "12345",
+		Destination_addr:       "67890",
+		Schedule_delivery_time: "",
+		Validity_period:        "",
+		Short_message:          "Hello, World!",
+		Data_coding:            0,
+	}
+	expectedSize := 67
 	actualSize := p.Size()
 	if actualSize != expectedSize {
 		t.Errorf("Expected size %d, but got %d", expectedSize, actualSize)
@@ -24,14 +123,15 @@ func TestCalculateSizeTypicalInstance(t *testing.T) {
 func TestCalculateSizeMaxLengths(t *testing.T) {
 	maxLen := 255
 	p := &SUBMIT_SM{
-		service_type:           string(make([]byte, maxLen)),
+		Service_type:           string(make([]byte, maxLen)),
-		source_addr:            string(make([]byte, maxLen)),
+		Source_addr:            string(make([]byte, maxLen)),
-		destination_addr:       string(make([]byte, maxLen)),
+		Destination_addr:       string(make([]byte, maxLen)),
-		schedule_delivery_time: string(make([]byte, maxLen)),
+		Schedule_delivery_time: string(make([]byte, maxLen)),
-		validity_period:        string(make([]byte, maxLen)),
+		Validity_period:        string(make([]byte, maxLen)),
-		short_message:          string(make([]byte, maxLen)),
+		Short_message:          string(make([]byte, maxLen)),
+		Data_coding:            1,
 	}
-	expectedSize := uint32(16 + maxLen + 1 + 1 + maxLen + 1 + 1 + maxLen + 1 + 1 + 1 + maxLen + maxLen + 1 + 1 + 1 + 1 + 1 + maxLen)
+	expectedSize := 1563
 	actualSize := p.Size()
 	if actualSize != expectedSize {
 		t.Errorf("Expected size %d, but got %d", expectedSize, actualSize)
@@ -40,16 +140,18 @@ func TestCalculateSizeMaxLengths(t *testing.T) {
 
 func TestHandlesEmptyStringsForAllStringFields(t *testing.T) {
 	p := &SUBMIT_SM{
-		service_type:           "",
+		Service_type:           "",
-		source_addr:            "",
+		Source_addr:            "",
-		destination_addr:       "",
+		Destination_addr:       "",
-		schedule_delivery_time: "",
+		Schedule_delivery_time: "",
-		validity_period:        "",
+		Validity_period:        "",
-		short_message:          "",
+		Short_message:          "",
 	}
-	expectedSize := uint32(16 + len(p.service_type) + 1 + 1 + len(p.source_addr) + 1 + 1 + len(p.destination_addr) + 1 + 1 + 1 + len(p.schedule_delivery_time) + len(p.validity_period) + 1 + 1 + 1 + 1 + 1 + len(p.short_message))
+	expectedSize := 33
 	actualSize := p.Size()
 	if actualSize != expectedSize {
 		t.Errorf("Expected size %d, but got %d", expectedSize, actualSize)
 	}
 }
+
+// region benchmark