corenet: move class dict attr to instance dict attr

P1sec · Feb 23, 2018 · 2788783 · 2788783
1 parent b87e998
commit 2788783
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/pycrate_corenet/HdlrHNB.py b/pycrate_corenet/HdlrHNB.py
@@ -69,12 +69,6 @@ class HNBd(SigStack):
     # All HNBs clients are given the same RNC-ID (uint16)
     RNC_ID = 0x0010
 
-    # dict to link context-id -> UEd instance
-    # should be the same context-id for HNBAP, IuCS and IuPS
-    UE_HNBAP = {}
-    UE_IuCS  = {}
-    UE_IuPS  = {}
-
     #--------------------------------------------------------------------------#
     # UERegistration policy
     #--------------------------------------------------------------------------#
@@ -98,7 +92,12 @@ def __init__(self, server, sk):
         self.connect(server, sk)
         #
         # init HNB config dict
-        self.Config = {}
+        self.Config = {}    
+        # dict to link context-id -> UEd instance
+        # should be the same context-id for HNBAP, IuCS and IuPS
+        UE_HNBAP = {}
+        UE_IuCS  = {}
+        UE_IuPS  = {}
         #
         # dict of ongoing resquest-response CN-initiated RAN procedures 
         # indexed by their procedure code

diff --git a/pycrate_corenet/HdlrUE.py b/pycrate_corenet/HdlrUE.py
@@ -68,10 +68,6 @@ class UEd(SigStack):
     IMSI   = None
     IMEI   = None
     IMEISV = None
-    # capabilities
-    Cap    = {}
-    # security capabilities
-    SecCap = {RAT_GERA: set(), RAT_UTRA: set(), RAT_EUTRA: set()} 
     # temporary identities (TMSI / PTMSI are uint32)
     TMSI   = None
     PTMSI  = None
@@ -120,6 +116,9 @@ def __init__(self, server, imsi, **kw):
         elif 'mtmsi' in kw:
             self.MTMSI = kw['mtmsi']
         #
+        # init capabilities
+        self.Cap = {}
+        #
         # set handler for IuCS, IuPS and S1 links
         self.IuCS = UEIuCSd(self)
         self.IuPS = UEIuPSd(self)