From 75ac37ea883d4c41722db95c4b8e99bbd47a2439 Mon Sep 17 00:00:00 2001 From: Louis Royer Date: Wed, 25 Sep 2024 15:08:24 +0200 Subject: [PATCH] Uniformisation --- .github/workflows/main.yml | 6 ++--- encoding/m-gtp4-ipv6-dst.go | 48 ++++++++++++++++++------------------- encoding/m-gtp4-ipv6-src.go | 28 +++++++++++----------- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 297e435..192bdaa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 ./... diff --git a/encoding/m-gtp4-ipv6-dst.go b/encoding/m-gtp4-ipv6-dst.go index c87fbef..6b273c5 100644 --- a/encoding/m-gtp4-ipv6-dst.go +++ b/encoding/m-gtp4-ipv6-dst.go @@ -64,49 +64,49 @@ 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 @@ -114,16 +114,16 @@ func (a *MGTP4IPv6Dst) Marshal() ([]byte, error) { // 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 } @@ -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 } diff --git a/encoding/m-gtp4-ipv6-src.go b/encoding/m-gtp4-ipv6-src.go index 5b17c90..8461f9c 100644 --- a/encoding/m-gtp4-ipv6-src.go +++ b/encoding/m-gtp4-ipv6-src.go @@ -133,24 +133,24 @@ 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 @@ -158,18 +158,18 @@ func (a *MGTP4IPv6Src) Marshal() ([]byte, error) { // 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 }