Skip to content

Commit f79551f

Browse files
ftlftl
committed
make the protocol public
1 parent 426213d commit f79551f

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎sds/sds.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ func ParseSDSReport(bytes []byte) (SDSReport, error) {
224224
// NewSDSReport creates a new SDS-REPORT PDU based on the given SDS-TRANSFER PDU without store/forward control information.
225225
func NewSDSReport(sdsTransfer SDSTransfer, ackRequired bool, deliveryStatus DeliveryStatus) SDSReport {
226226
return SDSReport{
227-
protocol: sdsTransfer.protocol,
227+
protocol: sdsTransfer.Protocol,
228228
AckRequired: ackRequired,
229229
DeliveryStatus: deliveryStatus,
230230
MessageReference: sdsTransfer.MessageReference,
@@ -307,7 +307,7 @@ func ParseSDSTransfer(bytes []byte) (SDSTransfer, error) {
307307

308308
var result SDSTransfer
309309

310-
result.protocol = ProtocolIdentifier(bytes[0])
310+
result.Protocol = ProtocolIdentifier(bytes[0])
311311
result.DeliveryReportRequest = DeliveryReportRequest((bytes[1] & 0x0C) >> 2)
312312
result.ServiceSelectionShortFormReport = (bytes[1] & 0x02) == 0
313313
storeForwardControl := (bytes[1] & 0x01) != 0
@@ -327,7 +327,7 @@ func ParseSDSTransfer(bytes []byte) (SDSTransfer, error) {
327327
var sdu any
328328
var err error
329329

330-
switch result.protocol {
330+
switch result.Protocol {
331331
case TextMessaging, ImmediateTextMessaging:
332332
sdu, err = ParseTextSDU(bytes[userdataStart:])
333333
case UserDataHeaderMessaging:
@@ -354,7 +354,7 @@ func NewTextMessageTransfer(messageReference MessageReference, immediate bool, d
354354
}
355355

356356
return SDSTransfer{
357-
protocol: protocol,
357+
Protocol: protocol,
358358
MessageReference: messageReference,
359359
DeliveryReportRequest: deliveryReport,
360360
UserData: TextSDU{
@@ -369,7 +369,7 @@ func NewTextMessageTransfer(messageReference MessageReference, immediate bool, d
369369
// NewConcatenatedMessageTransfer returns a set of SDS_TRANSFER PDUs for that make up the given text using concatenated text messages with a UDH.
370370
func NewConcatenatedMessageTransfer(messageReference MessageReference, deliveryReport DeliveryReportRequest, encoding TextEncoding, maxPDUBits int, text string) []SDSTransfer {
371371
blueprint := SDSTransfer{
372-
protocol: UserDataHeaderMessaging,
372+
Protocol: UserDataHeaderMessaging,
373373
MessageReference: messageReference,
374374
DeliveryReportRequest: deliveryReport,
375375
UserData: ConcatenatedTextSDU{
@@ -393,7 +393,7 @@ func NewConcatenatedMessageTransfer(messageReference MessageReference, deliveryR
393393

394394
if len(textParts) == 1 {
395395
return []SDSTransfer{{
396-
protocol: TextMessaging,
396+
Protocol: TextMessaging,
397397
MessageReference: messageReference,
398398
DeliveryReportRequest: deliveryReport,
399399
UserData: TextSDU{
@@ -408,7 +408,7 @@ func NewConcatenatedMessageTransfer(messageReference MessageReference, deliveryR
408408
result := make([]SDSTransfer, len(textParts))
409409
for i, textPart := range textParts {
410410
result[i] = SDSTransfer{
411-
protocol: UserDataHeaderMessaging,
411+
Protocol: UserDataHeaderMessaging,
412412
ServiceSelectionShortFormReport: true,
413413
MessageReference: messageReference + MessageReference(i),
414414
DeliveryReportRequest: deliveryReport,
@@ -434,17 +434,17 @@ func NewConcatenatedMessageTransfer(messageReference MessageReference, deliveryR
434434

435435
// SDSTransfer represents the SDS-TRANSFER PDU contents as defined in [AI] 29.4.2.4
436436
type SDSTransfer struct {
437-
protocol ProtocolIdentifier
437+
Protocol ProtocolIdentifier
438438
DeliveryReportRequest DeliveryReportRequest
439439
ServiceSelectionShortFormReport bool
440440
MessageReference MessageReference
441441
StoreForwardControl StoreForwardControl
442-
UserData interface{}
442+
UserData any
443443
}
444444

445445
// Encode this SDS-TRANSFER PDU
446446
func (m SDSTransfer) Encode(bytes []byte, bits int) ([]byte, int) {
447-
bytes, bits = m.protocol.Encode(bytes, bits)
447+
bytes, bits = m.Protocol.Encode(bytes, bits)
448448

449449
var byte1 byte
450450
byte1 = byte(SDSTransferMessage) << 4
@@ -470,7 +470,7 @@ func (m SDSTransfer) Encode(bytes []byte, bits int) ([]byte, int) {
470470
// Length of this SDS-TRANSFER in bytes.
471471
func (m SDSTransfer) Length() int {
472472
var result int
473-
result += m.protocol.Length()
473+
result += m.Protocol.Length()
474474
result++ // byte1
475475
result++ // message reference
476476
switch sdu := m.UserData.(type) {
@@ -496,7 +496,7 @@ func (m SDSTransfer) ConsumedReportRequested() bool {
496496

497497
// Immediate indiciates if this message should be displayed/handled immediately by the TE.
498498
func (m SDSTransfer) Immediate() bool {
499-
return m.protocol == ImmediateTextMessaging
499+
return m.Protocol == ImmediateTextMessaging
500500
}
501501

502502
// MessageReference according to [AI] 29.4.3.7

‎sds/sds_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func TestParseMessage(t *testing.T) {
7878
expected: IncomingMessage{
7979
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 120},
8080
Payload: SDSTransfer{
81-
protocol: TextMessaging,
81+
Protocol: TextMessaging,
8282
MessageReference: 0x9C,
8383
UserData: TextSDU{
8484
TextHeader: TextHeader{
@@ -96,7 +96,7 @@ func TestParseMessage(t *testing.T) {
9696
expected: IncomingMessage{
9797
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 120},
9898
Payload: SDSTransfer{
99-
protocol: ImmediateTextMessaging,
99+
Protocol: ImmediateTextMessaging,
100100
MessageReference: 0x9C,
101101
UserData: TextSDU{
102102
TextHeader: TextHeader{
@@ -115,7 +115,7 @@ func TestParseMessage(t *testing.T) {
115115
expected: IncomingMessage{
116116
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 152},
117117
Payload: SDSTransfer{
118-
protocol: TextMessaging,
118+
Protocol: TextMessaging,
119119
MessageReference: 0x9C,
120120
StoreForwardControl: StoreForwardControl{
121121
Valid: true,
@@ -139,7 +139,7 @@ func TestParseMessage(t *testing.T) {
139139
expected: IncomingMessage{
140140
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 144},
141141
Payload: SDSTransfer{
142-
protocol: TextMessaging,
142+
Protocol: TextMessaging,
143143
MessageReference: 0x9C,
144144
UserData: TextSDU{
145145
TextHeader: TextHeader{
@@ -158,7 +158,7 @@ func TestParseMessage(t *testing.T) {
158158
expected: IncomingMessage{
159159
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 192},
160160
Payload: SDSTransfer{
161-
protocol: UserDataHeaderMessaging,
161+
Protocol: UserDataHeaderMessaging,
162162
MessageReference: 0xC9,
163163
UserData: ConcatenatedTextSDU{
164164
TextSDU: TextSDU{
@@ -187,7 +187,7 @@ func TestParseMessage(t *testing.T) {
187187
expected: IncomingMessage{
188188
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 192},
189189
Payload: SDSTransfer{
190-
protocol: UserDataHeaderMessaging,
190+
Protocol: UserDataHeaderMessaging,
191191
MessageReference: 0xCA,
192192
UserData: ConcatenatedTextSDU{
193193
TextSDU: TextSDU{
@@ -482,7 +482,7 @@ func TestEncode(t *testing.T) {
482482
desc: "SDS-TRANSFER text message, delivery report requested",
483483
values: []Encoder{
484484
SDSTransfer{
485-
protocol: TextMessaging,
485+
Protocol: TextMessaging,
486486
DeliveryReportRequest: MessageReceivedReportRequested,
487487
MessageReference: 0xC9,
488488
UserData: TextSDU{
@@ -513,7 +513,7 @@ func TestEncode(t *testing.T) {
513513
desc: "SDS-TRANSFER concatenated text message with UDH",
514514
values: []Encoder{
515515
SDSTransfer{
516-
protocol: UserDataHeaderMessaging,
516+
Protocol: UserDataHeaderMessaging,
517517
MessageReference: 0xC9,
518518
UserData: ConcatenatedTextSDU{
519519
TextSDU: TextSDU{

‎sds/stack_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestStack_Put_TextMessage(t *testing.T) {
6868
value := IncomingMessage{
6969
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 120},
7070
Payload: SDSTransfer{
71-
protocol: TextMessaging,
71+
Protocol: TextMessaging,
7272
MessageReference: 0xC9,
7373
UserData: TextSDU{
7474
TextHeader: TextHeader{
@@ -107,7 +107,7 @@ func TestStack_Put_SinglePartConcatenatedMessage(t *testing.T) {
107107
value := IncomingMessage{
108108
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 192},
109109
Payload: SDSTransfer{
110-
protocol: UserDataHeaderMessaging,
110+
Protocol: UserDataHeaderMessaging,
111111
MessageReference: 0xC9,
112112
UserData: ConcatenatedTextSDU{
113113
TextSDU: TextSDU{
@@ -157,7 +157,7 @@ func TestStack_Put_MultiPartConcatenatedMessage(t *testing.T) {
157157
{
158158
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 200},
159159
Payload: SDSTransfer{
160-
protocol: UserDataHeaderMessaging,
160+
Protocol: UserDataHeaderMessaging,
161161
MessageReference: 0xC9,
162162
UserData: ConcatenatedTextSDU{
163163
TextSDU: TextSDU{
@@ -181,7 +181,7 @@ func TestStack_Put_MultiPartConcatenatedMessage(t *testing.T) {
181181
{
182182
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 208},
183183
Payload: SDSTransfer{
184-
protocol: UserDataHeaderMessaging,
184+
Protocol: UserDataHeaderMessaging,
185185
MessageReference: 0xCA,
186186
UserData: ConcatenatedTextSDU{
187187
TextSDU: TextSDU{
@@ -234,7 +234,7 @@ func TestStack_Put_TextMessage_ReceiptReportRequested(t *testing.T) {
234234
value := IncomingMessage{
235235
Header: Header{AIService: SDSTLService, Source: "1234567", Destination: "2345678", PDUBits: 120},
236236
Payload: SDSTransfer{
237-
protocol: TextMessaging,
237+
Protocol: TextMessaging,
238238
MessageReference: 0xC9,
239239
DeliveryReportRequest: MessageReceivedReportRequested,
240240
UserData: TextSDU{

0 commit comments

Comments
 (0)