[zarya] hotfix for subscriber roaming check

nickvsnetworking · Jan 6, 2024 · c1776ea · c1776ea
1 parent dc31bd1
commit c1776ea
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/diameter.py b/lib/diameter.py
@@ -1282,14 +1282,16 @@ def Answer_16777251_316(self, packet_vars, avps):
             decodedPlmn = self.DecodePLMN(plmn=plmn)
             mcc = decodedPlmn[0]
             mnc = decodedPlmn[1]
+            subscriberIsRoaming = False
+            subscriberRoamingAllowed = False 
             if str(mcc) != str(self.MCC) and str(mnc) != str(self.MNC):
                 subscriberIsRoaming = True
 
             if subscriberIsRoaming:
-                self.logTool.log(service='HSS', level='debug', message=f"[diameter.py] [Answer_16777251_318] [AIA] Subscriber {imsi} is roaming", redisClient=self.redisMessaging)
+                self.logTool.log(service='HSS', level='debug', message=f"[diameter.py] [Answer_16777251_318] [ULA] Subscriber {imsi} is roaming", redisClient=self.redisMessaging)
                 subscriberRoamingAllowed = self.validateSubscriberRoaming(subscriber=subscriber_details, mcc=mcc, mnc=mnc)
 
-            if not subscriberRoamingAllowed:
+            if not subscriberRoamingAllowed and subscriberIsRoaming:
                 avp = ''
                 session_id = self.get_avp_data(avps, 263)[0]                                                     #Get Session-ID
                 avp += self.generate_avp(263, 40, session_id)                                                    #Session-ID AVP set
@@ -1608,14 +1610,16 @@ def Answer_16777251_318(self, packet_vars, avps):
             decodedPlmn = self.DecodePLMN(plmn=plmn)
             mcc = decodedPlmn[0]
             mnc = decodedPlmn[1]
+            subscriberIsRoaming = False
+            subscriberRoamingAllowed = False
             if str(mcc) != str(self.MCC) and str(mnc) != str(self.MNC):
                 subscriberIsRoaming = True
 
             if subscriberIsRoaming:
                 self.logTool.log(service='HSS', level='debug', message=f"[diameter.py] [Answer_16777251_318] [AIA] Subscriber {imsi} is roaming", redisClient=self.redisMessaging)
                 subscriberRoamingAllowed = self.validateSubscriberRoaming(subscriber=subscriber_details, mcc=mcc, mnc=mnc)
 
-            if not subscriberRoamingAllowed:
+            if not subscriberRoamingAllowed and subscriberIsRoaming:
                 avp = ''
                 session_id = self.get_avp_data(avps, 263)[0]                                                     #Get Session-ID
                 avp += self.generate_avp(263, 40, session_id)                                                    #Session-ID AVP set