From a21563fb2f1525ddfa3756eea8ba2040afccfb4e Mon Sep 17 00:00:00 2001 From: ubuntu Date: Wed, 17 Apr 2024 16:28:33 +0000 Subject: [PATCH] fix: fix line length --- internal/nwucp/dispatcher.go | 2 +- internal/packet/ngapPacket/build.go | 28 ++++++++++++++++++---------- internal/packet/ngapPacket/packet.go | 3 ++- pkg/ike/handler/handler.go | 5 ++++- pkg/ike/handler/security.go | 12 +++++++++--- pkg/procedure/Procedure.go | 4 +++- 6 files changed, 37 insertions(+), 17 deletions(-) diff --git a/internal/nwucp/dispatcher.go b/internal/nwucp/dispatcher.go index fd51d60..3457239 100644 --- a/internal/nwucp/dispatcher.go +++ b/internal/nwucp/dispatcher.go @@ -36,7 +36,7 @@ func Dispatch(conn net.Conn, nasEnv []byte) { nasMsg, err := n3ue_security.NASDecode( n3ueSelf.RanUeContext, nas.SecurityHeaderTypeIntegrityProtectedAndCiphered, - nasEnv[:len((nasEnv))], + nasEnv[:], ) if err != nil { naslog.Errorf("NAS Decode Fail: %+v", err) diff --git a/internal/packet/ngapPacket/build.go b/internal/packet/ngapPacket/build.go index fa36db3..6e3c0a4 100644 --- a/internal/packet/ngapPacket/build.go +++ b/internal/packet/ngapPacket/build.go @@ -1024,7 +1024,8 @@ func BuildPathSwitchRequest(sourceAmfUeNgapID, ranUeNgapID int64) (pdu ngapType. // PDU Session Resource Failed to Setup Item (in PDU Session Resource Failed to Setup List) pDUSessionResourceFailedToSetupItemPSReq := ngapType.PDUSessionResourceFailedToSetupItemPSReq{} pDUSessionResourceFailedToSetupItemPSReq.PDUSessionID.Value = 11 - pDUSessionResourceFailedToSetupItemPSReq.PathSwitchRequestSetupFailedTransfer = GetPathSwitchRequestSetupFailedTransfer() + pDUSessionResourceFailedToSetupItemPSReq.PathSwitchRequestSetupFailedTransfer = + GetPathSwitchRequestSetupFailedTransfer() pDUSessionResourceFailedToSetupListPSReq.List = append( pDUSessionResourceFailedToSetupListPSReq.List, @@ -1633,7 +1634,8 @@ func BuildPDUSessionResourceSetupResponse( // PDU Session Resource Failed to Setup Item in PDU Sessuin Resource Failed to Setup List pDUSessionResourceFailedToSetupItemSURes := ngapType.PDUSessionResourceFailedToSetupItemSURes{} pDUSessionResourceFailedToSetupItemSURes.PDUSessionID.Value = 10 - pDUSessionResourceFailedToSetupItemSURes.PDUSessionResourceSetupUnsuccessfulTransfer = GetPDUSessionResourceSetupUnsucessfulTransfer() + pDUSessionResourceFailedToSetupItemSURes.PDUSessionResourceSetupUnsuccessfulTransfer = + GetPDUSessionResourceSetupUnsucessfulTransfer() pDUSessionResourceFailedToSetupListSURes.List = append( pDUSessionResourceFailedToSetupListSURes.List, @@ -1779,7 +1781,8 @@ func BuildPDUSessionResourceModifyResponse(amfUeNgapID, ranUeNgapID int64) (pdu pDUSessionResourceModifyResponseItem.PDUSessionID.Value = 10 // transfer := GetPDUSessionResourceModifyResponseTransfer() - pDUSessionResourceModifyResponseItem.PDUSessionResourceModifyResponseTransfer = GetPDUSessionResourceModifyResponseTransfer() + pDUSessionResourceModifyResponseItem.PDUSessionResourceModifyResponseTransfer = + GetPDUSessionResourceModifyResponseTransfer() pDUSessionResourceModifyListModRes.List = append( pDUSessionResourceModifyListModRes.List, @@ -1802,7 +1805,8 @@ func BuildPDUSessionResourceModifyResponse(amfUeNgapID, ranUeNgapID int64) (pdu // PDU Session Resource Failed to Modify Item in PDU Session Resource Failed to Modify List pDUSessionResourceFailedToModifyItem := ngapType.PDUSessionResourceFailedToModifyItemModRes{} pDUSessionResourceFailedToModifyItem.PDUSessionID.Value = 10 - pDUSessionResourceFailedToModifyItem.PDUSessionResourceModifyUnsuccessfulTransfer = GetPDUSessionResourceModifyUnsuccessfulTransfer() + pDUSessionResourceFailedToModifyItem.PDUSessionResourceModifyUnsuccessfulTransfer = + GetPDUSessionResourceModifyUnsuccessfulTransfer() pDUSessionResourceFailedToModifyListModRes.List = append( pDUSessionResourceFailedToModifyListModRes.List, @@ -2006,7 +2010,8 @@ func BuildPDUSessionResourceModifyIndication( // PDU Session Resource Modify Indication Item (in PDU Session Resource Modify Indication List) pDUSessionResourceModifyItemModInd := ngapType.PDUSessionResourceModifyItemModInd{} pDUSessionResourceModifyItemModInd.PDUSessionID.Value = 10 - pDUSessionResourceModifyItemModInd.PDUSessionResourceModifyIndicationTransfer = GetPDUSessionResourceModifyIndicationTransfer() + pDUSessionResourceModifyItemModInd.PDUSessionResourceModifyIndicationTransfer = + GetPDUSessionResourceModifyIndicationTransfer() pDUSessionResourceModifyListModInd.List = append( pDUSessionResourceModifyListModInd.List, @@ -2826,7 +2831,8 @@ func BuildLocationReport() (pdu ngapType.NGAPPDU) { locationReportIEs.List = append(locationReportIEs.List, ie) - // UE Presence in Area of Interest List [optional] // if EventType = ngapType.EventTypePresentUePresenceInAreaOfInterest + // UE Presence in Area of Interest List [optional] + // if EventType = ngapType.EventTypePresentUePresenceInAreaOfInterest ie = ngapType.LocationReportIEs{} ie.Id.Value = ngapType.ProtocolIEIDUEPresenceInAreaOfInterestList ie.Criticality.Value = ngapType.CriticalityPresentIgnore @@ -3004,7 +3010,8 @@ func BuildAMFConfigurationUpdateAcknowledge() (pdu ngapType.NGAPPDU) { // AMF TNL Association Setup Item aMFTNLAssociationSetupItem := ngapType.AMFTNLAssociationSetupItem{} - aMFTNLAssociationSetupItem.AMFTNLAssociationAddress.Present = ngapType.CPTransportLayerInformationPresentEndpointIPAddress + aMFTNLAssociationSetupItem.AMFTNLAssociationAddress.Present = + ngapType.CPTransportLayerInformationPresentEndpointIPAddress aMFTNLAssociationSetupItem.AMFTNLAssociationAddress.EndpointIPAddress = new( ngapType.TransportLayerAddress, ) @@ -4010,9 +4017,10 @@ func BuildPDUSessionResourceSetupResponseForRegistrationTest( pDUSessionResourceSetupItemSURes := ngapType.PDUSessionResourceSetupItemSURes{} pDUSessionResourceSetupItemSURes.PDUSessionID.Value = pduSessionId - pDUSessionResourceSetupItemSURes.PDUSessionResourceSetupResponseTransfer = GetPDUSessionResourceSetupResponseTransfer( - ipv4, - ) + pDUSessionResourceSetupItemSURes.PDUSessionResourceSetupResponseTransfer = + GetPDUSessionResourceSetupResponseTransfer( + ipv4, + ) pDUSessionResourceSetupListSURes.List = append( pDUSessionResourceSetupListSURes.List, diff --git a/internal/packet/ngapPacket/packet.go b/internal/packet/ngapPacket/packet.go index 9d3c667..9700b3f 100644 --- a/internal/packet/ngapPacket/packet.go +++ b/internal/packet/ngapPacket/packet.go @@ -132,7 +132,8 @@ func GetPDUSessionResourceReleaseResponse(amfUeNgapID int64, ranUeNgapID int64) func GetPathSwitchRequest(amfUeNgapID int64, ranUeNgapID int64) ([]byte, error) { message := BuildPathSwitchRequest(amfUeNgapID, ranUeNgapID) - message.InitiatingMessage.Value.PathSwitchRequest.ProtocolIEs.List = message.InitiatingMessage.Value.PathSwitchRequest.ProtocolIEs.List[0:5] + message.InitiatingMessage.Value.PathSwitchRequest.ProtocolIEs.List = + message.InitiatingMessage.Value.PathSwitchRequest.ProtocolIEs.List[0:5] return ngap.Encoder(message) } diff --git a/pkg/ike/handler/handler.go b/pkg/ike/handler/handler.go index e667572..6b18e76 100644 --- a/pkg/ike/handler/handler.go +++ b/pkg/ike/handler/handler.go @@ -598,7 +598,10 @@ func HandleIKEAUTH( // Setup interface for ipsec newXfrmiName := fmt.Sprintf("%s-%d", n3ueSelf.N3ueInfo.XfrmiName, n3ueSelf.N3ueInfo.XfrmiId) - if _, err = xfrm.SetupIPsecXfrmi(newXfrmiName, n3ueSelf.N3ueInfo.IPSecIfaceName, n3ueSelf.N3ueInfo.XfrmiId, n3ueSelf.UEInnerAddr); err != nil { + if _, err = xfrm.SetupIPsecXfrmi(newXfrmiName, + n3ueSelf.N3ueInfo.IPSecIfaceName, + n3ueSelf.N3ueInfo.XfrmiId, + n3ueSelf.UEInnerAddr); err != nil { ikeLog.Errorf("Setup XFRM interface %s fail: %+v", newXfrmiName, err) return } diff --git a/pkg/ike/handler/security.go b/pkg/ike/handler/security.go index 2f8525f..4ff1fc6 100644 --- a/pkg/ike/handler/security.go +++ b/pkg/ike/handler/security.go @@ -35,7 +35,9 @@ func GenerateKeyForIKESA( // Generate IKE SA key as defined in RFC7296 Section 1.3 and Section 1.4 var pseudorandomFunction hash.Hash - if pseudorandomFunction, ok = handler.NewPseudorandomFunction(ikeSecurityAssociation.ConcatenatedNonce, transformPseudorandomFunction.TransformID); !ok { + if pseudorandomFunction, ok = handler. + NewPseudorandomFunction(ikeSecurityAssociation.ConcatenatedNonce, + transformPseudorandomFunction.TransformID); !ok { return errors.New("New pseudorandom function failed") } @@ -54,7 +56,9 @@ func GenerateKeyForIKESA( var keyStream, generatedKeyBlock []byte var index byte for index = 1; len(keyStream) < totalKeyLength; index++ { - if pseudorandomFunction, ok = handler.NewPseudorandomFunction(SKEYSEED, transformPseudorandomFunction.TransformID); !ok { + if pseudorandomFunction, ok = handler. + NewPseudorandomFunction(SKEYSEED, + transformPseudorandomFunction.TransformID); !ok { return errors.New("New pseudorandom function failed") } if _, err := pseudorandomFunction.Write(append(append(generatedKeyBlock, seed...), index)); err != nil { @@ -363,7 +367,9 @@ func GenerateKeyForChildSA( var keyStream, generatedKeyBlock []byte var index byte for index = 1; len(keyStream) < totalKeyLength; index++ { - if pseudorandomFunction, ok = handler.NewPseudorandomFunction(ikeSecurityAssociation.SK_d, transformPseudorandomFunction.TransformID); !ok { + if pseudorandomFunction, ok = handler. + NewPseudorandomFunction(ikeSecurityAssociation.SK_d, + transformPseudorandomFunction.TransformID); !ok { return errors.New("New pseudorandom function failed") } if _, err := pseudorandomFunction.Write(append(append(generatedKeyBlock, seed...), index)); err != nil { diff --git a/pkg/procedure/Procedure.go b/pkg/procedure/Procedure.go index 2b508f0..56c99a3 100644 --- a/pkg/procedure/Procedure.go +++ b/pkg/procedure/Procedure.go @@ -68,7 +68,9 @@ func StartProcedure() { if err := TestConnectivity("8.8.8.8"); err != nil { AppLog.Errorf("ping fail : %+v", err) } else { - logger.NASLog.Infof("ULCount=%x, DLCount=%x", n3ueSelf.RanUeContext.ULCount.Get(), n3ueSelf.RanUeContext.DLCount.Get()) + logger.NASLog.Infof("ULCount=%x, DLCount=%x", + n3ueSelf.RanUeContext.ULCount.Get(), + n3ueSelf.RanUeContext.DLCount.Get()) AppLog.Info("Keep connection with N3IWF until receive SIGINT or SIGTERM") } }