Skip to content

Commit

Permalink
remove unnecessary code
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog-spb committed Sep 5, 2024
1 parent f3e8179 commit c04d755
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 200 deletions.
2 changes: 0 additions & 2 deletions cmd/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ type UpfConfig struct {
PfcpAddress string `mapstructure:"pfcp_address" validate:"hostname_port" json:"pfcp_address"`
PfcpNodeId string `mapstructure:"pfcp_node_id" validate:"hostname|ip" json:"pfcp_node_id"`
PfcpRemoteNode []string `mapstructure:"pfcp_remote_node" validate:"omitempty,dive,hostname|ip" json:"pfcp_node"`
SxaRemoteNode []string `mapstructure:"sxa_remote_node" validate:"omitempty,dive,hostname|ip" json:"sxa_node"`
SxbRemoteNode []string `mapstructure:"sxb_remote_node" validate:"omitempty,dive,hostname|ip" json:"sxb_node"`
AssociationSetupTimeout uint32 `mapstructure:"association_setup_timeout" json:"association_setup_timeout"`
MetricsAddress string `mapstructure:"metrics_address" validate:"hostname_port" json:"metrics_address"`
N3Address string `mapstructure:"n3_address" validate:"ipv4" json:"n3_address"`
Expand Down
192 changes: 0 additions & 192 deletions cmd/core/pfcp_connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,195 +254,3 @@ func (connector *DefaultAssociationConnector) sendAssociationSetupRequest(connec
log.Info().Msgf("Failed to send Association Setup Request: %s\n", err.Error())
}
}

type SxaAssociationConnector struct {
address string
}

func NewSxaAssociationConnector(address string) *SxaAssociationConnector {
return &SxaAssociationConnector{
address: address,
}
}

func (connector *SxaAssociationConnector) getAddress() string {
return connector.address
}

func (connector *SxaAssociationConnector) sendAssociationSetupRequest(connection *PfcpConnection) {

featuresOctets := []uint8{0, 0}
featuresOctets[0] = setBit(featuresOctets[0], 1)
featuresOctets[0] = setBit(featuresOctets[0], 2)
featuresOctets[0] = setBit(featuresOctets[0], 6)
featuresOctets[0] = setBit(featuresOctets[0], 7)

associationAddr := connector.getAddress()
AssociationSetupRequest := message.NewAssociationSetupRequest(0,
newIeNodeIDHuawei(connection.nodeId),
ie.NewRecoveryTimeStamp(connection.RecoveryTimestamp),
ie.NewUPFunctionFeatures(featuresOctets[:]...),
//CHOICE
// ipsuit-info
// enterprise-id: ---- 0x7db(2011)
// s11uIpv4Valid: ---- 0x1(1)
// s11uIpv6Valid: ---- 0x0(0)
// s1uIpv4Valid: ---- 0x1(1)
// s1uIpv6Valid: ---- 0x0(0)
// s5S8Ipv4Valid: ---- 0x1(1)
// s5S8Ipv6Valid: ---- 0x0(0)
// paIpv4Valid: ---- 0x0(0)
// paIpv6Valid: ---- 0x0(0)
// lock-flag: ---- 0x0(0)
// ipsuit-name: ---- 0001dgw1
// s1u-ip-address
// ipv4-address
// uladdr1: ---- 0xa(10)
// uladdr2: ---- 0xa9(169)
// uladdr3: ---- 0x70(112)
// uladdr4: ---- 0x80(128)
// s5s8s-ip-address
// ipv4-address
// uladdr1: ---- 0xa(10)
// uladdr2: ---- 0xa9(169)
// uladdr3: ---- 0x70(112)
// uladdr4: ---- 0x91(145)
// s11u-ip-address
// ipv4-address
// uladdr1: ---- 0xa(10)
// uladdr2: ---- 0xa9(169)
// uladdr3: ---- 0x70(112)
// uladdr4: ---- 0x8a(138)
ie.NewVendorSpecificIE(32787, 2011, []byte{
0xA8, 0x00,
0x08, 0x30, 0x30, 0x30, 0x34, 0x64, 0x67, 0x77, 0x34,
connection.n3Address.To4()[0], connection.n3Address.To4()[1], connection.n3Address.To4()[2], connection.n3Address.To4()[3],
connection.n3Address.To4()[0], connection.n3Address.To4()[1], connection.n3Address.To4()[2], connection.n3Address.To4()[3],
connection.n3Address.To4()[0], connection.n3Address.To4()[1], connection.n3Address.To4()[2], connection.n3Address.To4()[3]}),
//CHOICE
// user-plane-element-weight
// enterprise-id: ---- 0x7db(2011)
// weight-value: ---- 0x1(1)
ie.NewVendorSpecificIE(32803, 2011, []byte{1}),
//CHOICE
// lock-information
// enterprise-id: ---- 0x7db(2011)
// lock-information-value: ---- 0x0(0)
ie.NewVendorSpecificIE(32806, 2011, []byte{0}),
//CHOICE
// apn-support-mode
// enterprise-id: ---- 0x7db(2011)
// apn-support-mode-value: ---- 0x0(0)
ie.NewVendorSpecificIE(32857, 2011, []byte{0}),
//CHOICE
// sx-uf-flag
// enterprise-id: ---- 0x7db(2011)
// spare: ---- 0x0(0)
// nb-iot-value: ---- 0x1(1)
// dual-connectivity-with-nr-value: ---- 0x1(1)
ie.NewVendorSpecificIE(32900, 2011, []byte{3}),
//CHOICE
// high-bandwidth
// enterprise-id: ---- 0x7db(2011)
// high-bandwidth-value: ---- 0x1(1)
ie.NewVendorSpecificIE(32901, 2011, []byte{1}),
)
log.Info().Msgf("Sent Association Setup Request to: %s", associationAddr)

udpAddr, err := net.ResolveUDPAddr("udp", associationAddr+":8805")
if err != nil {
log.Error().Msgf("Failed to resolve udp address from PFCP peer address %s. Error: %s\n", associationAddr, err.Error())
return
}
if err := connection.SendMessage(AssociationSetupRequest, udpAddr); err != nil {
log.Info().Msgf("Failed to send Association Setup Request: %s\n", err.Error())
}
}

type SxbAssociationConnector struct {
address string
}

func NewSxbAssociationConnector(address string) *SxbAssociationConnector {
return &SxbAssociationConnector{
address: address,
}
}

func (connector *SxbAssociationConnector) getAddress() string {
return connector.address
}

func (connector *SxbAssociationConnector) sendAssociationSetupRequest(connection *PfcpConnection) {

featuresOctets := []uint8{0, 0}
featuresOctets[0] = setBit(featuresOctets[0], 1)
featuresOctets[0] = setBit(featuresOctets[0], 2)
featuresOctets[0] = setBit(featuresOctets[0], 6)
featuresOctets[0] = setBit(featuresOctets[0], 7)

associationAddr := connector.getAddress()
AssociationSetupRequest := message.NewAssociationSetupRequest(0,
newIeNodeIDHuawei(connection.nodeId),
ie.NewRecoveryTimeStamp(connection.RecoveryTimestamp),
//ie.NewUPFunctionFeatures(connection.featuresOctets[:]...),
ie.NewUPFunctionFeatures(featuresOctets[:]...),
//CHOICE
// ipsuit-info
// enterprise-id: ---- 0x7db(2011)
// s11uIpv4Valid: ---- 0x0(0)
// s11uIpv6Valid: ---- 0x0(0)
// s1uIpv4Valid: ---- 0x0(0)
// s1uIpv6Valid: ---- 0x0(0)
// s5S8Ipv4Valid: ---- 0x0(0)
// s5S8Ipv6Valid: ---- 0x0(0)
// paIpv4Valid: ---- 0x1(1)
// paIpv6Valid: ---- 0x0(0)
// lock-flag: ---- 0x0(0)
// ipsuit-name: ---- 0001dgw1
// pa-ip-address
// ipv4-address
// uladdr1: ---- 0xa(10)
// uladdr2: ---- 0xa9(169)
// uladdr3: ---- 0x70(112)
// uladdr4: ---- 0x83(131)
ie.NewVendorSpecificIE(32787, 2011, []byte{0x02, 0x00, 0x08, 0x30, 0x30, 0x30, 0x34, 0x64, 0x67, 0x77, 0x34, connection.n3Address.To4()[0], connection.n3Address.To4()[1], connection.n3Address.To4()[2], connection.n3Address.To4()[3]}),
//CHOICE
// user-plane-element-weight
// enterprise-id: ---- 0x7db(2011)
// weight-value: ---- 0x1(1)
ie.NewVendorSpecificIE(32803, 2011, []byte{1}),
//CHOICE
// lock-information
// enterprise-id: ---- 0x7db(2011)
// lock-information-value: ---- 0x0(0)
ie.NewVendorSpecificIE(32806, 2011, []byte{0}),
//CHOICE
// apn-support-mode
// enterprise-id: ---- 0x7db(2011)
// apn-support-mode-value: ---- 0x0(0)
ie.NewVendorSpecificIE(32857, 2011, []byte{0}),
//CHOICE
// sx-uf-flag
// enterprise-id: ---- 0x7db(2011)
// spare: ---- 0x0(0)
// nb-iot-value: ---- 0x1(1)
// dual-connectivity-with-nr-value: ---- 0x1(1)
ie.NewVendorSpecificIE(32900, 2011, []byte{3}),
//CHOICE
// high-bandwidth
// enterprise-id: ---- 0x7db(2011)
// high-bandwidth-value: ---- 0x1(1)
ie.NewVendorSpecificIE(32901, 2011, []byte{1}),
)
log.Info().Msgf("Sent Association Setup Request to: %s", associationAddr)

udpAddr, err := net.ResolveUDPAddr("udp", associationAddr+":8805")
if err != nil {
log.Error().Msgf("Failed to resolve udp address from PFCP peer address %s. Error: %s\n", associationAddr, err.Error())
return
}
if err := connection.SendMessage(AssociationSetupRequest, udpAddr); err != nil {
log.Info().Msgf("Failed to send Association Setup Request: %s\n", err.Error())
}
}
6 changes: 0 additions & 6 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,6 @@ func main() {
for _, remoteNode := range config.Conf.PfcpRemoteNode {
remoteNodes = append(remoteNodes, core.NewDefaultAssociationConnector(remoteNode))
}
for _, remoteNode := range config.Conf.SxaRemoteNode {
remoteNodes = append(remoteNodes, core.NewSxaAssociationConnector(remoteNode))
}
for _, remoteNode := range config.Conf.SxbRemoteNode {
remoteNodes = append(remoteNodes, core.NewSxbAssociationConnector(remoteNode))
}
pfcpConn.SetRemoteNodes(remoteNodes)
go pfcpConn.Run()
defer pfcpConn.Close()
Expand Down

0 comments on commit c04d755

Please sign in to comment.