Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uniformisation #3

Merged
merged 1 commit into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ jobs:
uses: actions/checkout@v4
- name: Setup Go
uses: actions/setup-go@v5
- name: Install depends
run: go get .
- name: Build
run: go build -v ./...
- name: Test
run: go test ./...
- name: Vet
run: go vet ./...
48 changes: 24 additions & 24 deletions encoding/m-gtp4-ipv6-dst.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,66 +64,66 @@ func ParseMGTP4IPv6Dst(ipv6Addr [16]byte, prefixLength uint) (*MGTP4IPv6Dst, err
}

// IPv4 returns the IPv4 Address encoded in the MGTP4IPv6Dst.
func (e *MGTP4IPv6Dst) IPv4() netip.Addr {
return netip.AddrFrom4(e.ipv4)
func (m *MGTP4IPv6Dst) IPv4() netip.Addr {
return netip.AddrFrom4(m.ipv4)
}

// ArgsMobSession returns the ArgsMobSession encoded in the MGTP4IPv6Dst.
func (e *MGTP4IPv6Dst) ArgsMobSession() *ArgsMobSession {
return e.argsMobSession
func (m *MGTP4IPv6Dst) ArgsMobSession() *ArgsMobSession {
return m.argsMobSession
}

// QFI returns the QFI encoded in the MGTP4IPv6Dst's ArgsMobSession.
func (e *MGTP4IPv6Dst) QFI() uint8 {
return e.argsMobSession.QFI()
func (m *MGTP4IPv6Dst) QFI() uint8 {
return m.argsMobSession.QFI()
}

// R returns the R bit encoded in the MGTP4IPv6Dst's ArgsMobSession.
func (e *MGTP4IPv6Dst) R() bool {
return e.argsMobSession.R()
func (m *MGTP4IPv6Dst) R() bool {
return m.argsMobSession.R()
}

// U returns the U bit encoded in the MGTP4IPv6Dst's ArgsMobSession.
func (e *MGTP4IPv6Dst) U() bool {
return e.argsMobSession.U()
func (m *MGTP4IPv6Dst) U() bool {
return m.argsMobSession.U()
}

// PDUSessionID returns the PDUSessionID for this MGTP4IPv6Dst's ArgsMobSession.
func (a *MGTP4IPv6Dst) PDUSessionID() uint32 {
return a.argsMobSession.PDUSessionID()
func (m *MGTP4IPv6Dst) PDUSessionID() uint32 {
return m.argsMobSession.PDUSessionID()
}

// Prefix returns the IPv6 Prefix for this MGTP4IPv6Dst.
func (e *MGTP4IPv6Dst) Prefix() netip.Prefix {
return e.prefix
func (m *MGTP4IPv6Dst) Prefix() netip.Prefix {
return m.prefix
}

// MarshalLen returns the serial length of MGTP4IPv6Dst.
func (a *MGTP4IPv6Dst) MarshalLen() int {
func (m *MGTP4IPv6Dst) MarshalLen() int {
return 16
}

// Marshal returns the byte sequence generated from MGTP4IPv6Dst.
func (a *MGTP4IPv6Dst) Marshal() ([]byte, error) {
b := make([]byte, a.MarshalLen())
if err := a.MarshalTo(b); err != nil {
func (m *MGTP4IPv6Dst) Marshal() ([]byte, error) {
b := make([]byte, m.MarshalLen())
if err := m.MarshalTo(b); err != nil {
return nil, err
}
return b, nil
}

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

ipv4 := netip.AddrFrom4(a.ipv4).AsSlice()
bits := a.prefix.Bits()
ipv4 := netip.AddrFrom4(m.ipv4).AsSlice()
bits := m.prefix.Bits()
if bits == -1 {
return errors.ErrPrefixLength
}
Expand All @@ -132,7 +132,7 @@ func (a *MGTP4IPv6Dst) MarshalTo(b []byte) error {
if err := utils.AppendToSlice(b, uint(bits), ipv4); err != nil {
return err
}
argsMobSessionB, err := a.argsMobSession.Marshal()
argsMobSessionB, err := m.argsMobSession.Marshal()
if err != nil {
return err
}
Expand Down
28 changes: 14 additions & 14 deletions encoding/m-gtp4-ipv6-src.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,43 +133,43 @@ func ParseMGTP4IPv6Src(addr [16]byte, prefixLen uint) (*MGTP4IPv6Src, error) {
}

// IPv4 returns the IPv4 Address encoded in the MGTP4IPv6Src.
func (e *MGTP4IPv6Src) IPv4() netip.Addr {
return netip.AddrFrom4(e.ipv4)
func (m *MGTP4IPv6Src) IPv4() netip.Addr {
return netip.AddrFrom4(m.ipv4)
}

// UDPPortNumber returns the UDP Port Number encoded in the MGTP4IPv6Src (0 if not set).
func (e *MGTP4IPv6Src) UDPPortNumber() uint16 {
return e.udp
func (m *MGTP4IPv6Src) UDPPortNumber() uint16 {
return m.udp
}

// MarshalLen returns the serial length of MGTP4IPv6Src.
func (a *MGTP4IPv6Src) MarshalLen() int {
func (m *MGTP4IPv6Src) MarshalLen() int {
return 16
}

// Marshal returns the byte sequence generated from MGTP4IPv6Src.
func (a *MGTP4IPv6Src) Marshal() ([]byte, error) {
b := make([]byte, a.MarshalLen())
if err := a.MarshalTo(b); err != nil {
func (m *MGTP4IPv6Src) Marshal() ([]byte, error) {
b := make([]byte, m.MarshalLen())
if err := m.MarshalTo(b); err != nil {
return nil, err
}
return b, nil
}

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

ipv4 := netip.AddrFrom4(a.ipv4).AsSlice()
ipv4 := netip.AddrFrom4(m.ipv4).AsSlice()
udp := make([]byte, 2)
binary.BigEndian.PutUint16(udp, a.udp)
bits := a.prefix.Bits()
binary.BigEndian.PutUint16(udp, m.udp)
bits := m.prefix.Bits()
if bits == -1 {
return errors.ErrPrefixLength
}
Expand Down
Loading