Add check that RemoteAddr() returns nil (#111)

free5gc · Dec 1, 2023 · 6fc612c · 6fc612c
1 parent aebc9fc
commit 6fc612c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/internal/context/context.go b/internal/context/context.go
@@ -354,7 +354,13 @@ func (context *AMFContext) NewAmfRan(conn net.Conn) *AmfRan {
 	ran := AmfRan{}
 	ran.SupportedTAList = make([]SupportedTAI, 0, MaxNumOfTAI*MaxNumOfBroadcastPLMNs)
 	ran.Conn = conn
-	ran.Log = logger.NgapLog.WithField(logger.FieldRanAddr, conn.RemoteAddr().String())
+	addr := conn.RemoteAddr()
+	if addr != nil {
+		ran.Log = logger.NgapLog.WithField(logger.FieldRanAddr, addr.String())
+	} else {
+		ran.Log = logger.NgapLog.WithField(logger.FieldRanAddr, "(nil)")
+	}
+
 	context.AmfRanPool.Store(conn, &ran)
 	return &ran
 }

diff --git a/internal/context/ran_ue.go b/internal/context/ran_ue.go
@@ -124,7 +124,12 @@ func (ranUe *RanUe) SwitchToRan(newRan *AmfRan, ranUeNgapId int64) error {
 
 func (ranUe *RanUe) UpdateLogFields() {
 	if ranUe.Ran != nil && ranUe.Ran.Conn != nil {
-		ranUe.Log = ranUe.Log.WithField(logger.FieldRanAddr, ranUe.Ran.Conn.RemoteAddr().String())
+		addr := ranUe.Ran.Conn.RemoteAddr()
+		if addr != nil {
+			ranUe.Log = ranUe.Log.WithField(logger.FieldRanAddr, addr.String())
+		} else {
+			ranUe.Log = ranUe.Log.WithField(logger.FieldRanAddr, "(nil)")
+		}
 
 		anTypeStr := ""
 		if ranUe.Ran.AnType == models.AccessType__3_GPP_ACCESS {

diff --git a/internal/ngap/dispatcher.go b/internal/ngap/dispatcher.go
@@ -16,7 +16,12 @@ func Dispatch(conn net.Conn, msg []byte) {
 
 	ran, ok := amfSelf.AmfRanFindByConn(conn)
 	if !ok {
-		logger.NgapLog.Infof("Create a new NG connection for: %s", conn.RemoteAddr().String())
+		addr := conn.RemoteAddr()
+		if addr == nil {
+			logger.NgapLog.Warn("Addr of new NG connection is nii")
+			return
+		}
+		logger.NgapLog.Infof("Create a new NG connection for: %s", addr.String())
 		ran = amfSelf.NewAmfRan(conn)
 	}