diff --git a/go.mod b/go.mod index 9551b942..f2889257 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index f0bf5cf9..9a3b81d8 100644 --- a/go.sum +++ b/go.sum @@ -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= @@ -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= diff --git a/internal/ngap/dispatcher.go b/internal/ngap/dispatcher.go index b953b475..2ed68d2e 100644 --- a/internal/ngap/dispatcher.go +++ b/internal/ngap/dispatcher.go @@ -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) { diff --git a/internal/ngap/handler/handler.go b/internal/ngap/handler/handler.go index e136849d..c3852d09 100644 --- a/internal/ngap/handler/handler.go +++ b/internal/ngap/handler/handler.go @@ -5,8 +5,6 @@ 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" @@ -14,6 +12,7 @@ import ( "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) { diff --git a/internal/ngap/message/send.go b/internal/ngap/message/send.go index fafaf268..91ebbd88 100644 --- a/internal/ngap/message/send.go +++ b/internal/ngap/message/send.go @@ -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) { diff --git a/internal/ngap/service/service.go b/internal/ngap/service/service.go index 58e909ed..b6b53a24 100644 --- a/internal/ngap/service/service.go +++ b/internal/ngap/service/service.go @@ -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 ( diff --git a/pkg/context/amf.go b/pkg/context/amf.go index 948cfba0..1479b2df 100644 --- a/pkg/context/amf.go +++ b/pkg/context/amf.go @@ -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 { diff --git a/pkg/context/context.go b/pkg/context/context.go index 7d5a6056..2f73b902 100644 --- a/pkg/context/context.go +++ b/pkg/context/context.go @@ -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" ) diff --git a/pkg/context/ngap.go b/pkg/context/ngap.go index 1b02e4fe..a606fb93 100644 --- a/pkg/context/ngap.go +++ b/pkg/context/ngap.go @@ -1,7 +1,7 @@ package context import ( - "git.cs.nctu.edu.tw/calee/sctp" + "github.com/free5gc/sctp" ) type NGAPServer struct {