Skip to content

Commit 75ac37e

Browse files
committed
Uniformisation
1 parent 8b4395f commit 75ac37e

File tree

3 files changed

+40
-42
lines changed

3 files changed

+40
-42
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ jobs:
2020
uses: actions/checkout@v4
2121
- name: Setup Go
2222
uses: actions/setup-go@v5
23-
- name: Install depends
24-
run: go get .
25-
- name: Build
26-
run: go build -v ./...
23+
- name: Test
24+
run: go test ./...
2725
- name: Vet
2826
run: go vet ./...

encoding/m-gtp4-ipv6-dst.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -64,66 +64,66 @@ func ParseMGTP4IPv6Dst(ipv6Addr [16]byte, prefixLength uint) (*MGTP4IPv6Dst, err
6464
}
6565

6666
// IPv4 returns the IPv4 Address encoded in the MGTP4IPv6Dst.
67-
func (e *MGTP4IPv6Dst) IPv4() netip.Addr {
68-
return netip.AddrFrom4(e.ipv4)
67+
func (m *MGTP4IPv6Dst) IPv4() netip.Addr {
68+
return netip.AddrFrom4(m.ipv4)
6969
}
7070

7171
// ArgsMobSession returns the ArgsMobSession encoded in the MGTP4IPv6Dst.
72-
func (e *MGTP4IPv6Dst) ArgsMobSession() *ArgsMobSession {
73-
return e.argsMobSession
72+
func (m *MGTP4IPv6Dst) ArgsMobSession() *ArgsMobSession {
73+
return m.argsMobSession
7474
}
7575

7676
// QFI returns the QFI encoded in the MGTP4IPv6Dst's ArgsMobSession.
77-
func (e *MGTP4IPv6Dst) QFI() uint8 {
78-
return e.argsMobSession.QFI()
77+
func (m *MGTP4IPv6Dst) QFI() uint8 {
78+
return m.argsMobSession.QFI()
7979
}
8080

8181
// R returns the R bit encoded in the MGTP4IPv6Dst's ArgsMobSession.
82-
func (e *MGTP4IPv6Dst) R() bool {
83-
return e.argsMobSession.R()
82+
func (m *MGTP4IPv6Dst) R() bool {
83+
return m.argsMobSession.R()
8484
}
8585

8686
// U returns the U bit encoded in the MGTP4IPv6Dst's ArgsMobSession.
87-
func (e *MGTP4IPv6Dst) U() bool {
88-
return e.argsMobSession.U()
87+
func (m *MGTP4IPv6Dst) U() bool {
88+
return m.argsMobSession.U()
8989
}
9090

9191
// PDUSessionID returns the PDUSessionID for this MGTP4IPv6Dst's ArgsMobSession.
92-
func (a *MGTP4IPv6Dst) PDUSessionID() uint32 {
93-
return a.argsMobSession.PDUSessionID()
92+
func (m *MGTP4IPv6Dst) PDUSessionID() uint32 {
93+
return m.argsMobSession.PDUSessionID()
9494
}
9595

9696
// Prefix returns the IPv6 Prefix for this MGTP4IPv6Dst.
97-
func (e *MGTP4IPv6Dst) Prefix() netip.Prefix {
98-
return e.prefix
97+
func (m *MGTP4IPv6Dst) Prefix() netip.Prefix {
98+
return m.prefix
9999
}
100100

101101
// MarshalLen returns the serial length of MGTP4IPv6Dst.
102-
func (a *MGTP4IPv6Dst) MarshalLen() int {
102+
func (m *MGTP4IPv6Dst) MarshalLen() int {
103103
return 16
104104
}
105105

106106
// Marshal returns the byte sequence generated from MGTP4IPv6Dst.
107-
func (a *MGTP4IPv6Dst) Marshal() ([]byte, error) {
108-
b := make([]byte, a.MarshalLen())
109-
if err := a.MarshalTo(b); err != nil {
107+
func (m *MGTP4IPv6Dst) Marshal() ([]byte, error) {
108+
b := make([]byte, m.MarshalLen())
109+
if err := m.MarshalTo(b); err != nil {
110110
return nil, err
111111
}
112112
return b, nil
113113
}
114114

115115
// MarshalTo puts the byte sequence in the byte array given as b.
116116
// warning: no caching is done, this result will be recomputed at each call
117-
func (a *MGTP4IPv6Dst) MarshalTo(b []byte) error {
118-
if len(b) < a.MarshalLen() {
117+
func (m *MGTP4IPv6Dst) MarshalTo(b []byte) error {
118+
if len(b) < m.MarshalLen() {
119119
return errors.ErrTooShortToMarshal
120120
}
121121
// init ipv6 with the prefix
122-
prefix := a.prefix.Addr().As16()
122+
prefix := m.prefix.Addr().As16()
123123
copy(b, prefix[:])
124124

125-
ipv4 := netip.AddrFrom4(a.ipv4).AsSlice()
126-
bits := a.prefix.Bits()
125+
ipv4 := netip.AddrFrom4(m.ipv4).AsSlice()
126+
bits := m.prefix.Bits()
127127
if bits == -1 {
128128
return errors.ErrPrefixLength
129129
}
@@ -132,7 +132,7 @@ func (a *MGTP4IPv6Dst) MarshalTo(b []byte) error {
132132
if err := utils.AppendToSlice(b, uint(bits), ipv4); err != nil {
133133
return err
134134
}
135-
argsMobSessionB, err := a.argsMobSession.Marshal()
135+
argsMobSessionB, err := m.argsMobSession.Marshal()
136136
if err != nil {
137137
return err
138138
}

encoding/m-gtp4-ipv6-src.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,43 +133,43 @@ func ParseMGTP4IPv6Src(addr [16]byte, prefixLen uint) (*MGTP4IPv6Src, error) {
133133
}
134134

135135
// IPv4 returns the IPv4 Address encoded in the MGTP4IPv6Src.
136-
func (e *MGTP4IPv6Src) IPv4() netip.Addr {
137-
return netip.AddrFrom4(e.ipv4)
136+
func (m *MGTP4IPv6Src) IPv4() netip.Addr {
137+
return netip.AddrFrom4(m.ipv4)
138138
}
139139

140140
// UDPPortNumber returns the UDP Port Number encoded in the MGTP4IPv6Src (0 if not set).
141-
func (e *MGTP4IPv6Src) UDPPortNumber() uint16 {
142-
return e.udp
141+
func (m *MGTP4IPv6Src) UDPPortNumber() uint16 {
142+
return m.udp
143143
}
144144

145145
// MarshalLen returns the serial length of MGTP4IPv6Src.
146-
func (a *MGTP4IPv6Src) MarshalLen() int {
146+
func (m *MGTP4IPv6Src) MarshalLen() int {
147147
return 16
148148
}
149149

150150
// Marshal returns the byte sequence generated from MGTP4IPv6Src.
151-
func (a *MGTP4IPv6Src) Marshal() ([]byte, error) {
152-
b := make([]byte, a.MarshalLen())
153-
if err := a.MarshalTo(b); err != nil {
151+
func (m *MGTP4IPv6Src) Marshal() ([]byte, error) {
152+
b := make([]byte, m.MarshalLen())
153+
if err := m.MarshalTo(b); err != nil {
154154
return nil, err
155155
}
156156
return b, nil
157157
}
158158

159159
// MarshalTo puts the byte sequence in the byte array given as b.
160160
// warning: no caching is done, this result will be recomputed at each call
161-
func (a *MGTP4IPv6Src) MarshalTo(b []byte) error {
162-
if len(b) < a.MarshalLen() {
161+
func (m *MGTP4IPv6Src) MarshalTo(b []byte) error {
162+
if len(b) < m.MarshalLen() {
163163
return errors.ErrTooShortToMarshal
164164
}
165165
// init b with prefix
166-
prefix := a.prefix.Addr().As16()
166+
prefix := m.prefix.Addr().As16()
167167
copy(b, prefix[:])
168168

169-
ipv4 := netip.AddrFrom4(a.ipv4).AsSlice()
169+
ipv4 := netip.AddrFrom4(m.ipv4).AsSlice()
170170
udp := make([]byte, 2)
171-
binary.BigEndian.PutUint16(udp, a.udp)
172-
bits := a.prefix.Bits()
171+
binary.BigEndian.PutUint16(udp, m.udp)
172+
bits := m.prefix.Bits()
173173
if bits == -1 {
174174
return errors.ErrPrefixLength
175175
}

0 commit comments

Comments
 (0)