Fix: add CGF ping server and relogin

free5gc · Mar 1, 2024 · 4a95f65 · 4a95f65
1 parent 1e8270d
commit 4a95f65
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/internal/cgf/cgf.go b/internal/cgf/cgf.go
@@ -132,14 +132,25 @@ func Login() error {
 }
 
 func SendCDR(supi string) error {
+	logger.CfgLog.Debugln("SendCDR:", supi)
 	if cgf.conn == nil {
 		err := Login()
 
 		if err != nil {
 			return err
 		}
 		logger.CgfLog.Infof("FTP Re-Login Success")
+	}
+
+	ping_err := cgf.conn.NoOp()
+	if ping_err != nil {
+		logger.CgfLog.Infof("Faile to ping FTP server, relogin...")
+		err := Login()
 
+		if err != nil {
+			return err
+		}
+		logger.CgfLog.Infof("FTP Re-Login Success")
 	}
 
 	fileName := supi + ".cdr"

diff --git a/internal/sbi/producer/converged_charging.go b/internal/sbi/producer/converged_charging.go
@@ -235,7 +235,7 @@ func ChargingDataUpdate(
 	defer ue.CULock.Unlock()
 
 	// Online charging: Rate, Account, Reservation
-	responseBody, partialRecord := BuildOnlineChargingDataUpdateResopone(chargingData)
+	responseBody, partialRecord := BuildConvergedChargingDataUpdateResopone(chargingData)
 
 	cdr := ue.Cdr[chargingSessionId]
 	err := UpdateCDR(cdr, chargingData)
@@ -353,12 +353,12 @@ func BuildOnlineChargingDataCreateResopone(
 	return responseBody
 }
 
-func BuildOnlineChargingDataUpdateResopone(
+func BuildConvergedChargingDataUpdateResopone(
 	chargingData models.ChargingDataRequest,
 ) (models.ChargingDataResponse, bool) {
 	var partialRecord bool
 
-	logger.ChargingdataPostLog.Info("In BuildOnlineChargingDataUpdateResopone ")
+	logger.ChargingdataPostLog.Info("In BuildConvergedChargingDataUpdateResopone")
 
 	multipleUnitInformation, partialRecord := sessionChargingReservation(chargingData)
 

diff --git a/pkg/abmf/abmf.go b/pkg/abmf/abmf.go
@@ -104,6 +104,7 @@ func printErrors(ec <-chan *diam.ErrorReport) {
 // 	return diam.ListenAndServe(addr, handler, nil)
 // }
 
+// Diameter Credit-Control-Request
 func handleCCR() diam.HandlerFunc {
 	return func(c diam.Conn, m *diam.Message) {
 		var ccr charging_datatype.AccountDebitRequest