Skip to content

Commit

Permalink
fix: fix line length
Browse files Browse the repository at this point in the history
  • Loading branch information
a3828162 committed Apr 17, 2024
1 parent 4b7cb43 commit a21563f
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 17 deletions.
2 changes: 1 addition & 1 deletion internal/nwucp/dispatcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
28 changes: 18 additions & 10 deletions internal/packet/ngapPacket/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
)
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion internal/packet/ngapPacket/packet.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
5 changes: 4 additions & 1 deletion pkg/ike/handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
12 changes: 9 additions & 3 deletions pkg/ike/handler/security.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion pkg/procedure/Procedure.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down

0 comments on commit a21563f

Please sign in to comment.