dave/smpp-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export all fields in pdu

Browse Source 
Oopsie!
This commit is contained in:
PhatPhuckDave
2024-07-31 15:10:46 +02:00
parent 4771ffa154
commit f1eb6b065d
8 changed files with 290 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
pdu/submit.go
View File

@@ -10,25 +10,25 @@ import (
type (
SUBMIT_SM struct {
header *PDU_HEADER
service_type string
source_addr_ton byte
source_addr_npi byte
source_addr string
dest_addr_ton byte
dest_addr_npi byte
destination_addr string
esm_class byte
protocol_id byte
priority_flag byte
schedule_delivery_time string
validity_period string
registered_delivery byte
replace_if_present byte
data_coding byte
sm_default_msg_id byte
sm_length byte
short_message string
Header *PDU_HEADER
Service_type string
Source_addr_ton byte
Source_addr_npi byte
Source_addr string
Dest_addr_ton byte
Dest_addr_npi byte
Destination_addr string
Esm_class byte
Protocol_id byte
Priority_flag byte
Schedule_delivery_time string
Validity_period string
Registered_delivery byte
Replace_if_present byte
Data_coding byte
Sm_default_msg_id byte
Sm_length byte
Short_message string
// user_message_reference uint16
// source_port uint16
// source_addr_subunit byte
@@ -59,12 +59,13 @@ type (
// ussd_service_op byte
}
SUBMIT_SM_RESP struct {
header *PDU_HEADER
message_id string
Header *PDU_HEADER
Message_id string
}
SUBMIT_MULTI struct{}
SUBMIT_MULTI_RESP struct{}
)
// See https://www.codeproject.com/Tips/470755/Encoding-Decoding-7-bit-User-Data-for-SMS-PDU-PDU
// Another great site: https://doubleblak.com/blogPost.php?k=7bitpdu
@@ -74,31 +75,31 @@ func (p *SUBMIT_SM) Encode(buf *bytes.Buffer) error {
}
messageEncoder := p.GetEncoder()
p.header.Encode(buf)
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.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)
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)
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)
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.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)
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
}
@@ -112,33 +113,33 @@ func (p *SUBMIT_SM) Decode(buf *bytes.Buffer) error {
}
func (p *SUBMIT_SM) Size() int {
var size int
size += p.header.Size()
size += 1 + len(p.service_type)
size += p.Header.Size()
size += 1 + len(p.Service_type)
size += 1 // source_addr_ton
size += 1 // source_addr_npi
size += 1 + len(p.source_addr)
size += 1 + len(p.Source_addr)
size += 1 // dest_addr_ton
size += 1 // dest_addr_npi
size += 1 + len(p.destination_addr)
size += 1 + len(p.Destination_addr)
size += 1 // esm_class
size += 1 // protocol_id
size += 1 // priority_flag
size += 1 + len(p.schedule_delivery_time)
size += 1 + len(p.validity_period)
size += 1 + len(p.Schedule_delivery_time)
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 += p.GetEncoder().EncodesInto(&p.short_message)
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))
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 {
switch p.Data_coding {
case 0b00000000: // GSM7
return &encoding.GSM7Coder{}
case 0b00000001: // ASCII