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

Module: use free5gc/sctp instead of calee/sctp #28

Merged
merged 2 commits into from
Dec 1, 2023
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/free5gc/n3iwf
go 1.17

require (
git.cs.nctu.edu.tw/calee/sctp v1.1.0
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/free5gc/aper v1.0.4
github.com/free5gc/ngap v1.0.6
github.com/free5gc/sctp v0.0.0-20231121085449-400a702ea7f9
github.com/free5gc/util v1.0.5-0.20231001095115-433858e5be94
github.com/sirupsen/logrus v1.8.1
github.com/urfave/cli v1.22.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
git.cs.nctu.edu.tw/calee/sctp v1.1.0 h1:caiPJ0g2sH1QmDkC7x2yklKrc01Fuo1rqYW68Tq4mU0=
git.cs.nctu.edu.tw/calee/sctp v1.1.0/go.mod h1:NeOuBXO1iJBtldmNhkfSH8yFbnxlhI8eEJdUd7DZvws=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand Down Expand Up @@ -77,6 +75,8 @@ github.com/free5gc/ngap v1.0.6 h1:f9sKqHMNrFZVo9Kp8hAyrCXSoI8l746N5O+DFn7vKHA=
github.com/free5gc/ngap v1.0.6/go.mod h1:TG1kwwU/EyIlJ3bxY591rdxpD5ZeYnLZTzoWjcfvrBM=
github.com/free5gc/openapi v1.0.4 h1:bC6oqXy8Z+3e532xLMFmrTHvdyv4sNGDPezQSslw5gQ=
github.com/free5gc/openapi v1.0.4/go.mod h1:KRCnnp0GeK0Bl4gnrX79cQAidKXNENf8VRdG0y9R0Fc=
github.com/free5gc/sctp v0.0.0-20231121085449-400a702ea7f9 h1:L02UI8oODfXgH1fGzWWuWF4zyze4IScEFm20q3PKZdE=
github.com/free5gc/sctp v0.0.0-20231121085449-400a702ea7f9/go.mod h1:Nr81VlvMkBHZsCbWPXjosBh+SWLdeEyz8o0OrS110Ic=
github.com/free5gc/util v1.0.5-0.20231001095115-433858e5be94 h1:tNylIqH/m5Kq+3KuC+jjXGl06Y6EmM8yq61ZUgNrPBY=
github.com/free5gc/util v1.0.5-0.20231001095115-433858e5be94/go.mod h1:aMszJZbCkcg5xaGgzya+55jz+OPMsJqPLq5Z3fWDFPE=
github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
Expand Down
3 changes: 1 addition & 2 deletions internal/ngap/dispatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ package ngap
import (
"runtime/debug"

"git.cs.nctu.edu.tw/calee/sctp"

"github.com/free5gc/n3iwf/internal/logger"
"github.com/free5gc/n3iwf/internal/ngap/handler"
"github.com/free5gc/n3iwf/pkg/context"
"github.com/free5gc/ngap"
"github.com/free5gc/ngap/ngapType"
"github.com/free5gc/sctp"
)

func NGAPDispatch(conn *sctp.SCTPConn, msg []byte) {
Expand Down
3 changes: 1 addition & 2 deletions internal/ngap/handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ import (
"net"
"time"

"git.cs.nctu.edu.tw/calee/sctp"

"github.com/free5gc/aper"
gtp_service "github.com/free5gc/n3iwf/internal/gtp/service"
"github.com/free5gc/n3iwf/internal/logger"
ngap_message "github.com/free5gc/n3iwf/internal/ngap/message"
"github.com/free5gc/n3iwf/pkg/context"
"github.com/free5gc/ngap/ngapConvert"
"github.com/free5gc/ngap/ngapType"
"github.com/free5gc/sctp"
)

func HandleNGSetupResponse(sctpAddr string, conn *sctp.SCTPConn, message *ngapType.NGAPPDU) {
Expand Down
3 changes: 1 addition & 2 deletions internal/ngap/message/send.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ package message
import (
"runtime/debug"

"git.cs.nctu.edu.tw/calee/sctp"

"github.com/free5gc/n3iwf/internal/logger"
"github.com/free5gc/n3iwf/pkg/context"
"github.com/free5gc/ngap/ngapType"
"github.com/free5gc/sctp"
)

func SendToAmf(amf *context.N3IWFAMF, pkt []byte) {
Expand Down
3 changes: 1 addition & 2 deletions internal/ngap/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ import (
"sync"
"time"

"git.cs.nctu.edu.tw/calee/sctp"

"github.com/free5gc/n3iwf/internal/logger"
"github.com/free5gc/n3iwf/internal/ngap"
"github.com/free5gc/n3iwf/internal/ngap/handler"
"github.com/free5gc/n3iwf/internal/ngap/message"
"github.com/free5gc/n3iwf/pkg/context"
lib_ngap "github.com/free5gc/ngap"
"github.com/free5gc/sctp"
)

var (
Expand Down
3 changes: 1 addition & 2 deletions pkg/context/amf.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ import (
"bytes"
"fmt"

"git.cs.nctu.edu.tw/calee/sctp"

"github.com/free5gc/aper"
"github.com/free5gc/ngap/ngapConvert"
"github.com/free5gc/ngap/ngapType"
"github.com/free5gc/sctp"
)

type N3IWFAMF struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/context/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
"strings"
"sync"

"git.cs.nctu.edu.tw/calee/sctp"
gtpv1 "github.com/wmnsk/go-gtp/gtpv1"
"golang.org/x/net/ipv4"

"github.com/free5gc/n3iwf/internal/logger"
"github.com/free5gc/n3iwf/pkg/factory"
"github.com/free5gc/ngap/ngapType"
"github.com/free5gc/sctp"
"github.com/free5gc/util/idgenerator"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/context/ngap.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package context

import (
"git.cs.nctu.edu.tw/calee/sctp"
"github.com/free5gc/sctp"
)

type NGAPServer struct {
Expand Down